X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=7c4f8691431432ae4fdf6e4ba4b5e7b911592c4f;hb=669c4118ae5a01b7ce76dcd56e40e2dec7eaaaca;hp=b6fabfb98f80f0cfb6af5d20edc68f62d736cbd7;hpb=56b987d1cdbccbd803cf5cca9211ffbbcb2b3672;p=catta diff --git a/configure.ac b/configure.ac index b6fabfb..7c4f869 100644 --- a/configure.ac +++ b/configure.ac @@ -129,9 +129,9 @@ fi with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' ` case $with_distro in - debian|gentoo|archlinux|suse|fedora|darwin|none) + debian|gentoo|archlinux|suse|fedora|darwin|freebsd|none) ;; - netbsd|freebsd) + netbsd) AC_MSG_WARN([Your distribution (${with_distro}) is supported but no init script exist yet! (patches welcome)]) ;; linux) @@ -352,9 +352,13 @@ AC_ARG_ENABLE(dbus, AC_ARG_WITH(dbus-sys, AS_HELP_STRING([--with-dbus-sys=], [where D-BUS system.d directory is])) AC_ARG_WITH(dbus-system-socket, AS_HELP_STRING([--with-dbus-system-address=
], [where the dbus system socket is, you probably want to put unix:path= at the start])) +DBUS_VERSION="Disabled" +DBUS_SYS_DIR="Disabled" +DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="Disabled" if test "x$HAVE_DBUS" = "xyes" ; then AC_DEFINE(HAVE_DBUS, 1, [Whether we have D-BUS or not]) + DBUS_VERSION=`$PKG_CONFIG dbus-1 --modversion` PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 0.34 ]) DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_API_SUBJECT_TO_CHANGE" AC_SUBST(DBUS_CFLAGS) @@ -482,21 +486,23 @@ if test "x$HAVE_PYTHON" = "xyes" ; then fi - AC_ARG_ENABLE(python-dbus, - AS_HELP_STRING([--disable-python-dbus],[Disable use of D-BUS in Python]), - [case "${enableval}" in - yes) HAVE_PYTHON_DBUS=yes ;; - no) HAVE_PYTHON_DBUS=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-python-dbus) ;; - esac], - [HAVE_PYTHON_DBUS=yes]) + if test "x$HAVE_DBUS" = "xyes" ; then + AC_ARG_ENABLE(python-dbus, + AS_HELP_STRING([--disable-python-dbus],[Disable use of D-BUS in Python]), + [case "${enableval}" in + yes) HAVE_PYTHON_DBUS=yes ;; + no) HAVE_PYTHON_DBUS=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-python-dbus) ;; + esac], + [HAVE_PYTHON_DBUS=yes]) - if test "x$HAVE_PYTHON_DBUS" = "xyes"; then - AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find Python module dbus)]) - fi + if test "x$HAVE_PYTHON_DBUS" = "xyes"; then + AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find Python module dbus)]) + fi - AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)]) - AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)]) + AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)]) + AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)]) + fi fi AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = "xyes" ]) AM_CONDITIONAL(HAVE_PYGTK, test "x$HAVE_PYGTK" = "xyes") @@ -505,43 +511,47 @@ AM_CONDITIONAL(HAVE_PYTHON_DBUS, test "x$HAVE_PYTHON_DBUS" = "xyes") # # Check for mono stuff # -AC_ARG_ENABLE(mono, - AS_HELP_STRING([--disable-mono],[Disable mono bindings]), - [case "${enableval}" in - yes) HAVE_MONO=yes ;; - no) HAVE_MONO=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-mono) ;; - esac], - [HAVE_MONO=yes]) - -AC_ARG_ENABLE(monodoc, - AS_HELP_STRING([--disable-monodoc],[Disable documentation for mono bindings]), - [case "${enableval}" in - yes) HAVE_MONODOC=yes ;; - no) HAVE_MONODOC=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-monodoc) ;; - esac], - [HAVE_MONODOC=yes]) - -if test "x$HAVE_MONO" = "xyes" ; then +HAVE_MONO=no +if test "x$HAVE_DBUS" = "xyes" ; then + AC_ARG_ENABLE(mono, + AS_HELP_STRING([--disable-mono],[Disable mono bindings]), + [case "${enableval}" in + yes) HAVE_MONO=yes ;; + no) HAVE_MONO=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-mono) ;; + esac], + [HAVE_MONO=yes]) + + if test "x$HAVE_MONO" = "xyes" ; then AC_PATH_PROG(MCS, mcs) if test "x$MCS" = "x" ; then - AC_MSG_ERROR([Can not find "mcs" in your PATH]) + AC_MSG_ERROR([Can not find "mcs" in your PATH]) fi AC_PATH_PROG(GACUTIL, gacutil) if test "x$GACUTIL" = "x" ; then - AC_MSG_ERROR([Can not find "gacutil" in your PATH]) + AC_MSG_ERROR([Can not find "gacutil" in your PATH]) fi AC_SUBST(MCS) AC_SUBST(GACUTIL) + fi fi AM_CONDITIONAL(HAVE_MONO, test "x$HAVE_MONO" = "xyes") # # Check for monodoc stuff # +HAVE_MONODOC=no +AC_ARG_ENABLE(monodoc, + AS_HELP_STRING([--disable-monodoc],[Disable documentation for mono bindings]), + [case "${enableval}" in + yes) HAVE_MONODOC=yes ;; + no) HAVE_MONODOC=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-monodoc) ;; + esac], + [HAVE_MONODOC=yes]) + if test "x$HAVE_MONODOC" = "xyes" ; then PKG_CHECK_MODULES(MONODOC, [monodoc >= 1.1.8]) MONODOC_DIR=`$PKG_CONFIG --variable=sourcesdir monodoc` @@ -705,6 +715,7 @@ initscript/archlinux/Makefile initscript/suse/Makefile initscript/fedora/Makefile initscript/darwin/Makefile +initscript/freebsd/Makefile avahi-dnsconfd/Makefile avahi-utils/Makefile avahi-python/Makefile @@ -730,7 +741,7 @@ echo " localstatedir: ${localstatedir} avahi socket: ${avahi_socket} dbus-1 system.d dir: ${DBUS_SYS_DIR} - dbus-1 version: `pkg-config dbus-1 --modversion` + dbus-1 version: ${DBUS_VERSION} dbus-1 system socket ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} compiler: ${CC} cflags: ${CFLAGS} @@ -746,45 +757,47 @@ echo " Enable QT3: ${HAVE_QT3} Enable QT4: ${HAVE_QT4} Enable Mono: ${HAVE_MONO} + Enable Monodoc: ${HAVE_MONODOC} Distribution/OS: ${with_distro} User for Avahi: ${AVAHI_USER} Group for Avahi: ${AVAHI_GROUP} Enable chroot(): ${enable_chroot} " -BUILD_DAEMON="no (!)" +BUILD_DAEMON="no (You need libdaemon and expat!)" if test "x$HAVE_EXPAT" = "xyes" -a "x$HAVE_LIBDAEMON" = "xyes" ; then BUILD_DAEMON=yes fi -BUILD_UTILS="no (!)" +BUILD_PYTHON="no (You need python, pygtk and python-dbus!)" if test "x$BUILD_DAEMON" = "xyes" -a "x$HAVE_DBUS" = "xyes" -a "x$HAVE_PYTHON" = "xyes" -a "x$HAVE_PYTHON_DBUS" = "xyes" -a "x$HAVE_PYGTK" = "xyes" ; then - BUILD_UTILS=yes + BUILD_PYTHON=yes fi -BUILD_CLIENT="no (!)" +BUILD_CLIENT="no (You need avahi-daemon and dbus!)" if test "x$BUILD_DAEMON" = "xyes" -a "x$HAVE_DBUS" = "xyes" ; then BUILD_CLIENT=yes fi if test "x$ENABLE_COMPAT_LIBDNS_SD" = "xyes" -a "x$BUILD_CLIENT" != "xyes" ; then - AC_MSG_ERROR([building avahi-compat-libdns_sd without building libavahi-client doesn't work]) + ENABLE_COMPAT_LIBDNS_SD="no (You need libavahi-client!)" fi if test "x$ENABLE_COMPAT_HOWL" = "xyes" -a "x$BUILD_CLIENT" != "xyes" ; then - AC_MSG_ERROR([building avahi-compat-howl without building libavahi-client doesn't work]) + ENABLE_COMPAT_HOWL="no (You need libavahi-client!)" fi -echo " +echo "\ Building libavahi-core yes Building avahi-daemon: ${BUILD_DAEMON} Building avahi-dnsconfd: ${BUILD_DAEMON} - Building avahi-utils: ${BUILD_UTILS} - Building libavahi-glib: ${HAVE_GLIB} Building libavahi-client: ${BUILD_CLIENT} + Building avahi-utils: ${BUILD_CLIENT} + Building avahi-python: ${BUILD_PYTHON} + Building libavahi-glib: ${HAVE_GLIB} Building avahi-discover-standalone: ${HAVE_GTK} Building libavahi-qt3: ${HAVE_QT3} Building libavahi-qt4: ${HAVE_QT4}