X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=17f2f94c04cd5c537d44c3cb1b2d2323815f4d80;hb=a26b065238debb81e25106b573addb323e529bce;hp=7953dda81741c3eb3c1cb9366bde279aa4cf47dc;hpb=bdef5923b07c9f8299d212262739ad58401837c9;p=catta diff --git a/configure.ac b/configure.ac index 7953dda..17f2f94 100644 --- a/configure.ac +++ b/configure.ac @@ -21,19 +21,22 @@ # USA. AC_PREREQ(2.57) -AC_INIT([avahi],[0.5],[avahi (at) lists (dot) freedesktop (dot) org]) +AC_INIT([avahi],[0.6],[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(LIBAVAHI_COMMON_VERSION_INFO, [1:1:1]) -AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [1:0:0]) -AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [1:1:0]) +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_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]) if type -p stow > /dev/null && test -d /usr/local/stow ; then AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***]) @@ -53,6 +56,62 @@ AC_PROG_GCC_TRADITIONAL # libtool stuff AC_PROG_LIBTOOL +ACX_PTHREAD(,AC_MSG_ERROR([Missing POSIX Threads support])) + +# +# Check for netlink.h +# +AC_CHECK_HEADER(linux/netlink.h, +HAVE_NETLINK=yes +AC_DEFINE([HAVE_NETLINK],[],[Support for Linux netlink]) +, [], [ +#include +#include +]) + +AM_CONDITIONAL(HAVE_NETLINK, [ test x"$HAVE_NETLINK" = xyes ]) + +# +# Check for net/route.h +# +AC_CHECK_HEADER(net/route.h, +HAVE_PF_ROUTE=yes +AC_DEFINE([HAVE_PF_ROUTE],[],[Support for PF_ROUTE]) +, [], [ +#include +#include +]) + +AM_CONDITIONAL(HAVE_PF_ROUTE, [ test x"$HAVE_PF_ROUTE" = xyes ]) + +# +# Check for struct ip_mreqn +# +AC_MSG_CHECKING(for struct ip_mreqn) +AC_TRY_COMPILE([#include ], [ + struct ip_mreqn mreq; + mreq.imr_address.s_addr = 0; +], [ + # Yes, we have it... + AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_STRUCT_IP_MREQN],[],[Support for struct ip_mreqn]) +], [ + # We'll just have to try and use struct ip_mreq + AC_MSG_RESULT(no) + AC_MSG_CHECKING(for struct ip_mreq) + AC_TRY_COMPILE([#include ], [ + struct ip_mreq mreq; + mreq.imr_interface.s_addr = 0; + ], [ + # Yes, we have it... + AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_STRUCT_IP_MREQ],[],[Support for struct ip_mreq]) + ], [ + # No multicast support + AC_MSG_RESULT(no) + ]) +]) + # # Detecting the linux distribution for specific things like init scripts. # @@ -127,7 +186,8 @@ fi # Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h]) +AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h netdb.h syslog.h]) +AC_HEADER_STDBOOL # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -140,13 +200,15 @@ 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 strcasecmp gettimeofday putenv strncasecmp]) +AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid strcasecmp gettimeofday putenv strncasecmp strlcpy gethostbyname]) AC_FUNC_CHOWN AC_FUNC_STAT AC_TYPE_MODE_T AC_TYPE_PID_T +AC_CHECK_DECLS(environ) + # Check for pkg-config manually first, as if its not installed the # PKG_PROG_PKG_CONFIG macro won't be defined. AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no) @@ -251,8 +313,6 @@ if test "x$HAVE_GTK" = "xyes" ; then fi AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes") - - # # D-BUS # @@ -286,9 +346,19 @@ 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 - # Note this default path is hardcoded in D-BUS and should - # not use $localstatedir + # 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 + 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" + for sock in $TRY_SOCKETS; do + if test -S $sock; then + DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="unix:path=$sock" + fi + done fi AC_SUBST(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS) @@ -398,6 +468,15 @@ AC_ARG_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 AC_PATH_PROG(MCS, mcs) if test "x$MCS" = "x" ; then @@ -406,7 +485,7 @@ if test "x$HAVE_MONO" = "xyes" ; then 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) @@ -414,6 +493,22 @@ if test "x$HAVE_MONO" = "xyes" ; then fi AM_CONDITIONAL(HAVE_MONO, test "x$HAVE_MONO" = "xyes") +# +# Check for monodoc stuff +# +if test "x$HAVE_MONODOC" = "xyes" ; then + PKG_CHECK_MODULES(MONODOC, [monodoc >= 1.1.8]) + MONODOC_DIR=`$PKG_CONFIG --variable=sourcesdir monodoc` + + AC_PATH_PROG(MONODOCER, monodocer) + AC_PATH_PROG(MDASSEMBLER, mdassembler) + + AC_SUBST(MONODOC_DIR) + AC_SUBST(MONODOCER) + AC_SUBST(MDASSEMBLER) +fi +AM_CONDITIONAL(HAVE_MONODOC, test "x$HAVE_MONODOC" = "xyes") + # # Defining Avahi User and Group. # @@ -443,7 +538,6 @@ avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket" AC_SUBST(avahi_runtime_dir) AC_SUBST(avahi_socket) - # # Avahi interfaces dir # @@ -452,7 +546,6 @@ if test "x$HAVE_PYTHON_DBUS" = "xyes" -o "x$HAVE_GTK" = "xyes"; then AC_SUBST(interfacesdir) fi - # # Doxygen # @@ -467,30 +560,86 @@ DX_PS_FEATURE(OFF) DX_INIT_DOXYGEN(avahi, doxygen.cfg, doxygen) # -# XMLTOMAN manpage generation +# Build and Install man pages # -AC_ARG_ENABLE(xmltoman, - AS_HELP_STRING([--disable-xmltoman],[Disable rebuilding of man pages with xmltoman]), +AC_ARG_ENABLE(manpages, + AS_HELP_STRING([--disable-manpages],[Disable building and installation of man pages]), [case "${enableval}" in - yes) xmltoman=yes ;; - no) xmltoman=no ;; - *) AC_MSG_ERROR([bad value ${enableval} for --disable-xmltoman]) ;; -esac],[xmltoman=yes]) - -if test x$xmltoman = xyes ; then - AC_CHECK_PROG(have_xmltoman, xmltoman, yes, no) - - if test x$have_xmltoman = xno ; then + yes) manpages=yes ;; + no) manpages=no ;; + *) AC_MSG_ERROR([bad value ${enableval} for --disable-manpages]) ;; +esac],[manpages=yes]) + +if test x$manpages = xyes ; then + # + # XMLTOMAN manpage generation + # + AC_ARG_ENABLE(xmltoman, + AS_HELP_STRING([--disable-xmltoman],[Disable rebuilding of man pages with xmltoman]), + [case "${enableval}" in + yes) xmltoman=yes ;; + no) xmltoman=no ;; + *) AC_MSG_ERROR([bad value ${enableval} for --disable-xmltoman]) ;; + esac],[xmltoman=yes]) + + if test x$xmltoman = xyes ; then + AC_CHECK_PROG(have_xmltoman, xmltoman, yes, no) + fi + + if test x$have_xmltoman = xno -o x$xmltoman = xno; then if ! test -e man/avahi-daemon.8 ; then - AC_MSG_ERROR([*** xmltoman was not found, it is required to build the manpages and they have not been pre-built]) + AC_MSG_ERROR([*** xmltoman was not found or was disabled, it is required to build the manpages as they have not been pre-built, install xmltoman, pass --disable-manpages or dont pass --disable-xmltoman]) exit 1 fi AC_MSG_WARN([*** Not rebuilding man pages as xmltoman is not found ***]) xmltoman=no fi fi - AM_CONDITIONAL([USE_XMLTOMAN], [test "x$xmltoman" = xyes]) +AM_CONDITIONAL([BUILD_MANPAGES], [test "x$manpages" = xyes]) + +# +# Conditionally compile test and example programs +# +AC_ARG_ENABLE(tests, + AS_HELP_STRING([--enable-tests],[Enable building of tests and examples]), + [case "${enableval}" in + yes) ENABLE_TESTS=yes ;; + no) ENABLE_TESTS=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-tests) ;; + esac], + [ENABLE_TESTS=no]) + +AM_CONDITIONAL([ENABLE_TESTS], [test "x$ENABLE_TESTS" = "xyes"]) + +# +# Optionally enable libdns_sd compatibility support +# +AC_ARG_ENABLE(compat-libdns_sd, + AS_HELP_STRING([--enable-compat-libdns_sd],[Enable compatibility layer for libdns_sd]), + [case "${enableval}" in + yes) ENABLE_COMPAT_LIBDNS_SD=yes ;; + no) ENABLE_COMPAT_LIBDNS_SD=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-compat-libdns_sd) ;; + esac], + [ENABLE_COMPAT_LIBDNS_SD=no]) + +AM_CONDITIONAL([ENABLE_COMPAT_LIBDNS_SD], [test "x$ENABLE_COMPAT_LIBDNS_SD" = "xyes"]) + +# +# Optionally enable HOWL compatibility support +# +AC_ARG_ENABLE(compat-howl, + AS_HELP_STRING([--enable-compat-howl],[Enable compatibility layer for HOWL]), + [case "${enableval}" in + yes) ENABLE_COMPAT_HOWL=yes ;; + no) ENABLE_COMPAT_HOWL=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-compat-howl) ;; + esac], + [ENABLE_COMPAT_HOWL=no]) + +AM_CONDITIONAL([ENABLE_COMPAT_HOWL], [test "x$ENABLE_COMPAT_HOWL" = "xyes"]) + # ========================================================================== AC_CONFIG_FILES([ @@ -517,6 +666,9 @@ man/Makefile tests/Makefile service-type-database/Makefile avahi-sharp/Makefile +avahi-compat-libdns_sd/Makefile +avahi-compat-howl/Makefile +avahi-compat-howl/samples/Makefile ]) AC_OUTPUT @@ -567,6 +719,14 @@ 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]) +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]) +fi + + echo " Building libavahi-core yes Building avahi-daemon: ${BUILD_DAEMON} @@ -578,4 +738,7 @@ echo " Building libavahi-qt3: ${HAVE_QT3} Building libavahi-qt4: ${HAVE_QT4} Building avahi-sharp: ${HAVE_MONO} + Building avahi-compat-libdns_sd: ${ENABLE_COMPAT_LIBDNS_SD} + Building avahi-compat-howl: ${ENABLE_COMPAT_HOWL} + Building tests: ${ENABLE_TESTS} "