X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=7cf15b29c6c78a201861703bd0626306ebfd8633;hb=287f9866c923e6afe8ffbbc03b90be64acf395e1;hp=efa0d5ed320eecf481fab1b02adb5fa859acdcbc;hpb=e614891d38cae63957d0bfc00d34ecdbad4f8322;p=catta diff --git a/configure.ac b/configure.ac index efa0d5e..7cf15b2 100644 --- a/configure.ac +++ b/configure.ac @@ -21,19 +21,19 @@ # USA. AC_PREREQ(2.57) -AC_INIT([avahi],[0.6.4],[avahi (at) lists (dot) freedesktop (dot) org]) +AC_INIT([avahi],[0.6.13],[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://avahi.org/]) -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_COMMON_VERSION_INFO, [7:2:4]) +AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [4:4:0]) +AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [5:0:2]) +AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1:1:0]) +AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:1:0]) +AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:1: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]) @@ -84,6 +84,30 @@ AC_DEFINE([HAVE_PF_ROUTE],[],[Support for PF_ROUTE]) AM_CONDITIONAL(HAVE_PF_ROUTE, [ test x"$HAVE_PF_ROUTE" = xyes ]) +# +# Check for sys/filio.h; needed for FIONREAD on Solaris +# +AC_CHECK_HEADER(sys/filio.h, +HAVE_SYS_FILIO_H=yes +AC_DEFINE([HAVE_SYS_FILIO_H],[],[Support for sys/filio.h]) +, [], [ +]) + +AM_CONDITIONAL(HAVE_SYS_FILIO_H, [ test x"$HAVE_SYS_FILIO_H" = xyes ]) + +# +# Check for sys/sysctl.h; not present on Solaris +# +AC_CHECK_HEADER(sys/sysctl.h, +HAVE_SYS_SYSCTL=yes +AC_DEFINE([HAVE_SYS_SYSCTL_H],[],[Support for sys/sysctl.h]) +, [], [ +#include +#include +]) + +AM_CONDITIONAL(HAVE_SYS_SYSCTL_H, [ test x"$HAVE_SYS_SYSCTL_H" = xyes ]) + # # Check for struct ip_mreqn # @@ -115,7 +139,7 @@ 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 distribution to target: One of debian, gentoo, archlinux, fedora, mandriva, darwin, netbsd, freebsd or none])) +AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of debian, gentoo, archlinux, fedora, mandriva, darwin, netbsd, freebsd, slackware 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") @@ -123,6 +147,7 @@ if test "z$with_distro" = "z"; then AC_CHECK_FILE(/etc/debian_version,with_distro="debian") AC_CHECK_FILE(/etc/redhat-release,with_distro="fedora") AC_CHECK_FILE(/etc/mandriva-release,with_distro="mandriva") + AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware") if test "z$with_distro" = "z"; then with_distro=`uname -s` fi @@ -130,7 +155,7 @@ fi with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' ` case $with_distro in - debian|gentoo|archlinux|suse|fedora|mandriva|darwin|freebsd|none) + debian|gentoo|archlinux|suse|fedora|mandriva|darwin|freebsd|slackware|none) ;; netbsd) AC_MSG_WARN([Your distribution (${with_distro}) is supported but no init script exist yet! (patches welcome)]) @@ -139,7 +164,7 @@ case $with_distro in 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]) + AC_MSG_ERROR([Your distribution (${with_distro}) is not yet supported, init scripts and D-Bus configuration will not be installed! (patches welcome), you can specify --with-distro=none to skip this check]) ;; esac @@ -152,6 +177,7 @@ AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva) 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) +AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) test_gcc_flag() { AC_LANG_CONFTEST([int main() {}]) @@ -346,10 +372,10 @@ fi AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes") # -# D-BUS +# D-Bus # AC_ARG_ENABLE(dbus, - AS_HELP_STRING([--disable-dbus],[Disable use of D-BUS]), + AS_HELP_STRING([--disable-dbus],[Disable use of D-Bus]), [case "${enableval}" in yes) HAVE_DBUS=yes ;; no) HAVE_DBUS=no ;; @@ -357,8 +383,8 @@ AC_ARG_ENABLE(dbus, esac], [HAVE_DBUS=yes]) -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])) +AC_ARG_WITH(dbus-sys, AS_HELP_STRING([--with-dbus-sys=], [Path to D-Bus system.d directory])) +AC_ARG_WITH(dbus-system-socket, AS_HELP_STRING([--with-dbus-system-address=
], [Path to the D-Bus system socket, you probably want to put unix:path= at the start. Only needed for very old D-Bus releases])) DBUS_VERSION="Disabled" DBUS_SYS_DIR="Disabled" @@ -366,7 +392,7 @@ 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]) + AC_DEFINE(HAVE_DBUS, 1, [Whether we have D-Bus or not]) DBUS_VERSION=`$PKG_CONFIG dbus-1 --modversion` DBUS_VERSION_MAJOR=`echo $DBUS_VERSION | awk -F. '{print $1}'` @@ -383,16 +409,16 @@ if test "x$HAVE_DBUS" = "xyes" ; then 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 "Error: Couldn't determine the version of your D-Bus 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 " Base D-Buss 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." + echo "Your D-Bus 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" @@ -412,11 +438,11 @@ if test "x$HAVE_DBUS" = "xyes" ; then if ! test -z "$with_dbus_system_address" ; then DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="$with_dbus_system_address" else - # This is ugly, but D-BUS doesn't export this address for us + # This is ugly, but D-Bus doesn't export this address for us # so we have to guess, pretty much all setups i've seen have # it in /var/lib/dbus or /var/run/dbus, and its defaulted to # /var/run upstream so we will try guess first then default - # to /var/run/dbus + # to /var/run/dbus. DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="unix:path=/var/run/dbus/system_bus_socket" TRY_SOCKETS="/var/lib/dbus/system_bus_socket /var/run/dbus/system_bus_socket ${localstatedir}/run/dbus/system_bus_socket ${prefix}/var/run/dbus/system_bus_socket" @@ -428,6 +454,10 @@ if test "x$HAVE_DBUS" = "xyes" ; then fi AC_SUBST(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS) + SAVED_LIBS="$LIBS" + LIBS="$LIBS $DBUS_LIBS" + AC_CHECK_FUNCS([dbus_connection_close dbus_bus_get_private]) + LIBS="$SAVED_LIBS" fi AM_CONDITIONAL(HAVE_DBUS, test "x$HAVE_DBUS" = "xyes") @@ -455,24 +485,49 @@ AM_CONDITIONAL(HAVE_EXPAT, test "x$HAVE_EXPAT" = "xyes") # # GDBM # +# +# Check for dbm +# +AC_ARG_ENABLE(dbm, + AS_HELP_STRING([--enable-dbm],[Enable use of DBM]), + [case "${enableval}" in + yes) HAVE_DBM=yes ;; + no) HAVE_DBM=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-dbm) ;; + esac], + [HAVE_DBM=no]) + AC_ARG_ENABLE(gdbm, AS_HELP_STRING([--disable-gdbm],[Disable use of GDBM]), [case "${enableval}" in yes) HAVE_GDBM=yes ;; no) HAVE_GDBM=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-gdbm) ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-gdbm) ;; esac], [HAVE_GDBM=yes]) if test "x$HAVE_GDBM" = "xyes" ; then + if test "x$HAVE_DBM" = "xyes" ; then + AC_MSG_ERROR([*** --enable-gdbm and --enable-dbm both specified ***]) + fi AC_CHECK_LIB(gdbm, gdbm_open, [ AC_CHECK_HEADERS(gdbm.h, have_gdbm=true, have_gdbm=false) ], have_gdbm=false) if ! $have_gdbm ; then AC_MSG_ERROR([*** libgdbm not found ***]) fi AC_DEFINE([HAVE_GDBM],[],[Support for GDBM]) +else + if test "x$HAVE_DBM" = "xyes" ; then + AC_CHECK_HEADERS(ndbm.h, have_dbm=true, have_dbm=false) + + if ! $have_dbm ; then + AC_MSG_ERROR([*** dbm not found ***]) + fi + AC_DEFINE([HAVE_DBM],[],[Support for DBM]) + fi fi AM_CONDITIONAL(HAVE_GDBM, test "x$HAVE_GDBM" = "xyes") +AM_CONDITIONAL(HAVE_DBM, test "x$HAVE_DBM" = "xyes") # # libdaemon @@ -526,7 +581,7 @@ if test "x$HAVE_PYTHON" = "xyes" ; then 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]), + 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 ;; @@ -539,7 +594,12 @@ if test "x$HAVE_PYTHON" = "xyes" ; then 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)]) + if test "x$HAVE_GDBM" = "xyes"; then + AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)]) + fi + if test "x$HAVE_DBM" = "xyes"; then + AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)]) + fi fi fi AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = "xyes" ]) @@ -563,7 +623,7 @@ if test "x$HAVE_DBUS" = "xyes" ; then 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" - The Mono C-Sharp Compiler) in your PATH]) fi AC_PATH_PROG(GACUTIL, gacutil) @@ -604,9 +664,23 @@ fi AM_CONDITIONAL(HAVE_MONODOC, test "x$HAVE_MONODOC" = "xyes") # -# Defining Avahi User and Group. +# Build autoipd? # -AC_ARG_WITH(avahi_user, AS_HELP_STRING([--with-avahi-user=],[User for running the Avahi daemon (avahi)])) +AC_ARG_ENABLE(autoipd, + AS_HELP_STRING([--disable-autoipd],[Disable building of avahi-autoipd]), + [case "${enableval}" in + yes) ENABLE_AUTOIPD=yes ;; + no) ENABLE_AUTOIPD=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-autoipd) ;; + esac], + [ENABLE_AUTOIPD=yes]) + +AM_CONDITIONAL(ENABLE_AUTOIPD, test "x$ENABLE_AUTOIPD" = "xyes") + +# +# Defining users and groups +# +AC_ARG_WITH(avahi_user, AS_HELP_STRING([--with-avahi-user=],[User for running avahi-daemon (avahi)])) if test -z "$with_avahi_user" ; then AVAHI_USER=avahi else @@ -615,7 +689,7 @@ fi AC_SUBST(AVAHI_USER) AC_DEFINE_UNQUOTED(AVAHI_USER,"$AVAHI_USER", [User for running the Avahi daemon]) -AC_ARG_WITH(avahi_group,AS_HELP_STRING([--with-avahi-group=],[Group for Avahi (avahi)])) +AC_ARG_WITH(avahi_group,AS_HELP_STRING([--with-avahi-group=],[Group for running avahi-daemon (avahi)])) if test -z "$with_avahi_group" ; then AVAHI_GROUP=avahi else @@ -624,6 +698,33 @@ fi AC_SUBST(AVAHI_GROUP) AC_DEFINE_UNQUOTED(AVAHI_GROUP,"$AVAHI_GROUP", [Group for Avahi]) +AC_ARG_WITH(avahi_priv_access_group,AS_HELP_STRING([--with-avahi-priv-access-group=],[Priviliged access group for Avahi clients (netdev)])) +if test -z "$with_priv_access_group" ; then + AVAHI_PRIV_ACCESS_GROUP=netdev +else + AVAHI_PRIV_ACCESS_GROUP=$with_priv_access_group +fi +AC_SUBST(AVAHI_PRIV_ACCESS_GROUP) +AC_DEFINE_UNQUOTED(AVAHI_PRIV_ACCESS_GROUP,"$AVAHI_PRIV_ACCESS_GROUP", [Privileged access group for Avahi clients]) + +AC_ARG_WITH(autoipd_user, AS_HELP_STRING([--with-autipd-user=],[User for running the avahi-autoipd daemon (avahi-autoipd)])) +if test -z "$with_autoipd_user" ; then + AVAHI_AUTOIPD_USER=avahi-autoipd +else + AVAHI_AUTOIPD_USER=$with_autoipd_user +fi +AC_SUBST(AVAHI_AUTOIPD_USER) +AC_DEFINE_UNQUOTED(AVAHI_AUTOIPD_USER,"$AVAHI_AUTOIPD_USER", [User for running the avahi-autoipd daemon]) + +AC_ARG_WITH(autoipd_group,AS_HELP_STRING([--with-autoipd-group=],[Group for running the avahi-autoipd daemon (avahi-autoipd)])) +if test -z "$with_autoipd_group" ; then + AVAHI_AUTOIPD_GROUP=avahi-autoipd +else + AVAHI_AUTOIPD_GROUP=$with_autoipd_group +fi +AC_SUBST(AVAHI_AUTOIPD_GROUP) +AC_DEFINE_UNQUOTED(AVAHI_AUTOIPD_GROUP,"$AVAHI_AUTOIPD_GROUP", [Group for running the avahi-autoipd daemon]) + # # Avahi runtime dir # @@ -653,6 +754,16 @@ DX_PDF_FEATURE(OFF) DX_PS_FEATURE(OFF) DX_INIT_DOXYGEN(avahi, doxygen.cfg, doxygen) +AC_ARG_ENABLE(core-docs, + AS_HELP_STRING([--enable-core-docs],[Enable building of documentation for avahi-core]), +[case "${enableval}" in + yes) ENABLE_CORE_DOCS=yes ;; + no) ENABLE_CORE_DOCS=no ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-core-docs]) ;; +esac],[ENABLE_CORE_DOCS=no]) + +AM_CONDITIONAL([ENABLE_CORE_DOCS], [test "x$ENABLE_CORE_DOCS" = xyes]) + # # Build and Install man pages # @@ -755,6 +866,7 @@ initscript/fedora/Makefile initscript/mandriva/Makefile initscript/darwin/Makefile initscript/freebsd/Makefile +initscript/slackware/Makefile avahi-dnsconfd/Makefile avahi-utils/Makefile avahi-python/Makefile @@ -768,6 +880,7 @@ avahi-sharp/Makefile avahi-compat-libdns_sd/Makefile avahi-compat-howl/Makefile avahi-compat-howl/samples/Makefile +avahi-autoipd/Makefile ]) AC_OUTPUT @@ -775,32 +888,36 @@ AC_OUTPUT echo " ---{ $PACKAGE_NAME $VERSION }--- - prefix: ${prefix} - sysconfdir: ${sysconfdir} - localstatedir: ${localstatedir} - avahi socket: ${avahi_socket} - dbus-1 system.d dir: ${DBUS_SYS_DIR} - dbus-1 version: ${DBUS_VERSION} - dbus-1 system socket ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} - compiler: ${CC} - cflags: ${CFLAGS} - Enable GLIB: ${HAVE_GLIB} - Enable GTK: ${HAVE_GTK} - Enable D-BUS: ${HAVE_DBUS} - Enable Expat: ${HAVE_EXPAT} - Enable GDBM: ${HAVE_GDBM} - Enable libdaemon: ${HAVE_LIBDAEMON} - Enable Python: ${HAVE_PYTHON} - Enable pygtk: ${HAVE_PYGTK} - Enable python-dbus: ${HAVE_PYTHON_DBUS} - 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} + prefix: ${prefix} + sysconfdir: ${sysconfdir} + localstatedir: ${localstatedir} + avahi socket: ${avahi_socket} + dbus-1 system.d dir: ${DBUS_SYS_DIR} + dbus-1 version: ${DBUS_VERSION} + dbus-1 system socket: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} + C Compiler: ${CC} + CFLAGS: ${CFLAGS} + Enable GLIB: ${HAVE_GLIB} + Enable GTK: ${HAVE_GTK} + Enable D-Bus: ${HAVE_DBUS} + Enable Expat: ${HAVE_EXPAT} + Enable GDBM: ${HAVE_GDBM} + Enable DBM: ${HAVE_DBM} + Enable libdaemon: ${HAVE_LIBDAEMON} + Enable Python: ${HAVE_PYTHON} + Enable pygtk: ${HAVE_PYGTK} + Enable python-dbus: ${HAVE_PYTHON_DBUS} + Enable QT3: ${HAVE_QT3} + Enable QT4: ${HAVE_QT4} + Enable Mono: ${HAVE_MONO} + Enable Monodoc: ${HAVE_MONODOC} + Distribution/OS: ${with_distro} + User for avahi-daemon: ${AVAHI_USER} + Group for avahi-daemon: ${AVAHI_GROUP} + Priviliged access group for Avahi clients: ${AVAHI_PRIV_ACCESS_GROUP} + User for avahi-autopid: ${AVAHI_AUTOIPD_USER} + Group for avahi-autoipd: ${AVAHI_AUTOIPD_GROUP} + Enable chroot(): ${enable_chroot} " BUILD_DAEMON="no (You need libdaemon and expat!)" @@ -815,7 +932,7 @@ if test "x$BUILD_DAEMON" = "xyes" -a "x$HAVE_DBUS" = "xyes" -a "x$HAVE_PYTHON" = BUILD_PYTHON=yes fi -BUILD_CLIENT="no (You need avahi-daemon and dbus!)" +BUILD_CLIENT="no (You need avahi-daemon and D-Bus!)" if test "x$BUILD_DAEMON" = "xyes" -a "x$HAVE_DBUS" = "xyes" ; then BUILD_CLIENT=yes @@ -844,4 +961,6 @@ echo "\ Building avahi-compat-libdns_sd: ${ENABLE_COMPAT_LIBDNS_SD} Building avahi-compat-howl: ${ENABLE_COMPAT_HOWL} Building tests: ${ENABLE_TESTS} + Building avahi-core documentation: ${ENABLE_CORE_DOCS} + Building avahi-autoipd: ${ENABLE_AUTOIPD} "