X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=57d77b8748a92a36d77787d5f58b16b8537442d1;hb=d58a7d27ad23a83ffc24efd84b2627bce2723512;hp=88ab3a506a62eb222f522d9d7b273e1853e3daac;hpb=d186f90959b986ecc81f975501bee2e790f06996;p=catta diff --git a/configure.ac b/configure.ac index 88ab3a5..57d77b8 100644 --- a/configure.ac +++ b/configure.ac @@ -21,19 +21,19 @@ # USA. AC_PREREQ(2.57) -AC_INIT([avahi],[0.6],[avahi (at) lists (dot) freedesktop (dot) org]) +AC_INIT([avahi],[0.6.4],[avahi (at) lists (dot) freedesktop (dot) org]) AC_CONFIG_SRCDIR([avahi-core/server.c]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) -AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/Software/Avahi]) +AC_SUBST(PACKAGE_URL, [http://avahi.org/]) -AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [2:0:2]) -AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [2:0:1]) -AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [2:0:1]) -AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [0:1:0]) -AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [0:0:0]) -AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [0:0:0]) +AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [5:0:2]) +AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [3:3:0]) +AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [3:2:0]) +AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1:0:0]) +AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:0:0]) +AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:0:0]) AC_SUBST(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO, [1:0:0]) AC_SUBST(LIBAVAHI_COMPAT_HOWL_VERSION_INFO, [0:0:0]) AC_SUBST(HOWL_COMPAT_VERSION, [0.9.8]) @@ -115,34 +115,41 @@ AC_TRY_COMPILE([#include ], [ # # Detecting the linux distribution for specific things like init scripts. # -AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the Linux distribution to target: One of debian, gentoo, archlinux or none])) +AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of debian, gentoo, archlinux, fedora, darwin, netbsd, freebsd or none])) if test "z$with_distro" = "z"; then AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse") AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo") AC_CHECK_FILE(/etc/arch-release,with_distro="archlinux") AC_CHECK_FILE(/etc/debian_version,with_distro="debian") AC_CHECK_FILE(/etc/redhat-release,with_distro="fedora") + if test "z$with_distro" = "z"; then + with_distro=`uname -s` + fi fi with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' ` -if test "z$with_distro" = "z"; then - AC_MSG_ERROR([Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO, set DISTRO to none if your distribution is not supported.]) - exit 1 -else case $with_distro in - debian|gentoo|archlinux|suse|fedora|none) + debian|gentoo|archlinux|suse|fedora|darwin|freebsd|none) + ;; + netbsd) + AC_MSG_WARN([Your distribution (${with_distro}) is supported but no init script exist yet! (patches welcome)]) + ;; + linux) + AC_MSG_ERROR([Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO, set DISTRO to none if your distribution is not supported.]) ;; *) AC_MSG_ERROR([Your distribution (${with_distro}) is not yet supported, init scripts and dbus configuration will not be installed! (patches welcome), you can specify --with-distro=none to skip this check]) ;; esac -fi AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse) AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo) AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian) AM_CONDITIONAL(TARGET_ARCHLINUX, test x"$with_distro" = xarchlinux) AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora) +AM_CONDITIONAL(TARGET_DARWIN, test x"$with_distro" = xdarwin) +AM_CONDITIONAL(TARGET_NETBSD, test x"$with_distro" = xnetbsd) +AM_CONDITIONAL(TARGET_FREEBSD, test x"$with_distro" = xfreebsd) test_gcc_flag() { AC_LANG_CONFTEST([int main() {}]) @@ -206,7 +213,7 @@ AC_FUNC_MEMCMP AC_FUNC_SELECT_ARGTYPES AC_FUNC_MALLOC AC_FUNC_REALLOC -AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid setresgid setregid strcasecmp gettimeofday putenv strncasecmp strlcpy gethostbyname seteuid setegid setproctitle]) +AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid setresgid setregid strcasecmp gettimeofday putenv strncasecmp strlcpy gethostbyname seteuid setegid setproctitle getprogname]) AC_FUNC_CHOWN AC_FUNC_STAT @@ -345,10 +352,44 @@ 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 + PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 0.34 ]) + AC_DEFINE(HAVE_DBUS, 1, [Whether we have D-BUS or not]) - PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 0.34 ]) + DBUS_VERSION=`$PKG_CONFIG dbus-1 --modversion` + DBUS_VERSION_MAJOR=`echo $DBUS_VERSION | awk -F. '{print $1}'` + DBUS_VERSION_MINOR=`echo $DBUS_VERSION | awk -F. '{print $2}'` + DBUS_VERSION_MICRO=`echo $DBUS_VERSION | awk -F. '{print $3}'` + if test "z$DBUS_VERSION_MAJOR" = "z"; then + DBUS_VERSION_MAJOR="0" + fi + if test "z$DBUS_VERSION_MINOR" = "z"; then + DBUS_VERSION_MINOR="0" + fi + if test "z$DBUS_VERSION_MICRO" = "z"; then + DBUS_VERSION_MICRO="0" + fi + + if test "z$DBUS_VERSION_MAJOR" = "z0" -a "z$DBUS_VERSION_MINOR" = "z0" -a "z$DBUS_VERSION_MICRO" = "z0"; then + echo "Error: Couldn't determine the version of your DBUS package." + echo " This is probably an error in this script, please report it" + echo " along with the following information:" + echo " Base DBUS version ='$DBUS_VERSION'" + echo " DBUS_VERSION_MAJOR='$DBUS_VERSION_MAJOR'" + echo " DBUS_VERSION_MINOR='$DBUS_VERSION_MINOR'" + echo " DBUS_VERSION_MICRO='$DBUS_VERSION_MICRO'" + exit 1 + else + echo "Your dbus version is $DBUS_VERSION_MAJOR,$DBUS_VERSION_MINOR,$DBUS_VERSION_MICRO." + DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MAJOR=$DBUS_VERSION_MAJOR" + DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MINOR=$DBUS_VERSION_MINOR" + DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MICRO=$DBUS_VERSION_MICRO" + fi + DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_API_SUBJECT_TO_CHANGE" AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) @@ -475,21 +516,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") @@ -498,43 +541,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` @@ -697,9 +744,12 @@ initscript/gentoo/Makefile initscript/archlinux/Makefile initscript/suse/Makefile initscript/fedora/Makefile +initscript/darwin/Makefile +initscript/freebsd/Makefile avahi-dnsconfd/Makefile avahi-utils/Makefile -avahi-utils/avahi/Makefile +avahi-python/Makefile +avahi-python/avahi/Makefile examples/Makefile common/Makefile man/Makefile @@ -721,7 +771,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} @@ -737,45 +787,47 @@ echo " Enable QT3: ${HAVE_QT3} Enable QT4: ${HAVE_QT4} Enable Mono: ${HAVE_MONO} - Linux Distro: ${with_distro} + 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}