X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=43b1f657af2ff8a51bcc3161538ce4e5b1e6da1d;hb=722f8d557252486cebc9a4efdd523321f31a9378;hp=7632b37c448f348cfb3cb4f60e08f62b84e2ca7e;hpb=09ef82e2d020166c6291b4fed38adcc79fe7657e;p=catta diff --git a/configure.ac b/configure.ac index 7632b37..43b1f65 100644 --- a/configure.ac +++ b/configure.ac @@ -21,20 +21,21 @@ # USA. AC_PREREQ(2.57) -AC_INIT([avahi],[0.6.19],[avahi (at) lists (dot) freedesktop (dot) org]) +AC_INIT([avahi],[0.6.21],[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, [7:4:4]) -AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [5:2:0]) -AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [5:2:2]) +AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [7:5:4]) +AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [5:3:0]) +AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [5:3:2]) AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1:1:0]) +AC_SUBST(LIBAVAHI_GOBJECT_VERSION_INFO, [0:0:0]) AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:1:0]) AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:1:0]) -AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [0:1:0]) +AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [0:2:0]) # Do not touch these, since they we took this version-info from upstream HOWL/Bonjour AC_SUBST(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO, [1:0:0]) @@ -56,6 +57,8 @@ AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_GCC_TRADITIONAL +AM_PROG_CC_C_O + # -fstack-protector AC_ARG_ENABLE([stack-protector], [AS_HELP_STRING([--disable-stack-protector], @@ -147,7 +150,7 @@ ACX_PTHREAD(,AC_MSG_ERROR([Missing POSIX Threads support])) # # Check for netlink.h # -AC_CHECK_HEADER(linux/netlink.h, +AC_CHECK_HEADER(linux/netlink.h, HAVE_NETLINK=yes AC_DEFINE([HAVE_NETLINK],[],[Support for Linux netlink]) , [], [ @@ -160,7 +163,7 @@ AM_CONDITIONAL(HAVE_NETLINK, [ test x"$HAVE_NETLINK" = xyes ]) # # Check for net/route.h # -AC_CHECK_HEADER(net/route.h, +AC_CHECK_HEADER(net/route.h, HAVE_PF_ROUTE=yes AC_DEFINE([HAVE_PF_ROUTE],[],[Support for PF_ROUTE]) , [], [ @@ -173,7 +176,7 @@ 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, +AC_CHECK_HEADER(sys/filio.h, HAVE_SYS_FILIO_H=yes AC_DEFINE([HAVE_SYS_FILIO_H],[],[Support for sys/filio.h]) , [], [ @@ -184,7 +187,7 @@ 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, +AC_CHECK_HEADER(sys/sysctl.h, HAVE_SYS_SYSCTL=yes AC_DEFINE([HAVE_SYS_SYSCTL_H],[],[Support for sys/sysctl.h]) , [], [ @@ -318,13 +321,13 @@ if test "x$GCC" = "xyes" ; then for flag in $DESIRED_FLAGS ; do AC_MSG_CHECKING([whether $CC accepts $flag]) - if test_gcc_flag $flag ; then + if test_gcc_flag $flag ; then CFLAGS="$CFLAGS $flag" AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) fi - done + done fi # Checks for header files. @@ -338,10 +341,10 @@ AC_TYPE_SIZE_T AC_HEADER_TIME AC_HEADER_SYS_WAIT - # Solaris stuff - AC_SEARCH_LIBS([inet_ntop],[nsl]) - AC_SEARCH_LIBS([recv],[socket]) - AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -D__EXTENSIONS__") + # Solaris stuff + AC_SEARCH_LIBS([inet_ntop],[nsl]) + AC_SEARCH_LIBS([recv],[socket]) + AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__") # Checks for library functions. AC_FUNC_MEMCMP @@ -384,6 +387,15 @@ if test "x$have_inotify" = "xyes" ; then AC_DEFINE([HAVE_INOTIFY], 1, [Enable Linux inotify() usage]) fi +have_kqueue=yes +AC_CHECK_FUNCS([kqueue],,have_kqueue=no) + +AM_CONDITIONAL(HAVE_KQUEUE, test "x$have_kqueue" = "xyes") + +if test "x$have_kqueue" = "xyes" ; then + AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage]) +fi + # 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) @@ -413,6 +425,25 @@ if test "x$HAVE_GLIB" = "xyes" ; then fi AM_CONDITIONAL(HAVE_GLIB, test "x$HAVE_GLIB" = "xyes") +# +# Check for GLIB's gobject 2.0 +# +AC_ARG_ENABLE(gobject, + AS_HELP_STRING([--disable-gobject],[Disable use of GLib GObject]), + [case "${enableval}" in + yes) HAVE_GOBJECT=yes ;; + no) HAVE_GOBJECT=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-gobject) ;; + esac], + [HAVE_GOBJECT=yes]) + +if test "x$HAVE_GOBJECT" = "xyes" ; then + PKG_CHECK_MODULES(GOBJECT, [ glib-2.0 >= 2.4.0 gobject-2.0 ]) + AC_SUBST(GOBJECT_CFLAGS) + AC_SUBST(GOBJECT_LIBS) +fi +AM_CONDITIONAL(HAVE_GOBJECT, test "x$HAVE_GOBJECT" = "xyes") + # # Check for Qt 3 # @@ -432,7 +463,7 @@ if test "x$HAVE_QT3" = "xyes" ; then QT3_PREFIX="`$PKG_CONFIG --variable=prefix qt-mt`/bin" MOC_QT3="no" AC_CHECK_FILE( "$QT3_PREFIX/moc-qt3", [ MOC_QT3=$QT3_PREFIX/moc-qt3 ], [ - AC_CHECK_FILE("$QT3_PREFIX/moc", [ MOC_QT3=$QT3_PREFIX/moc ], [ + AC_CHECK_FILE("$QT3_PREFIX/moc", [ MOC_QT3=$QT3_PREFIX/moc ], [ AC_MSG_ERROR([Couldn't find QT3 moc])])]) AC_SUBST(MOC_QT3) fi @@ -457,7 +488,7 @@ if test "x$HAVE_QT4" = "xyes" ; then QT4_PREFIX="`$PKG_CONFIG --variable=prefix QtCore`/bin" MOC_QT4="no" AC_CHECK_FILE( "$QT4_PREFIX/moc-qt4", [ MOC_QT4=$QT4_PREFIX/moc-qt4 ], [ - AC_CHECK_FILE("$QT4_PREFIX/moc", [ MOC_QT4=$QT4_PREFIX/moc ], [ + AC_CHECK_FILE("$QT4_PREFIX/moc", [ MOC_QT4=$QT4_PREFIX/moc ], [ AC_MSG_ERROR([Couldn't find QT4 moc])])]) AC_SUBST(MOC_QT4) fi @@ -480,7 +511,7 @@ if test "x$HAVE_GTK" = "xyes" ; then PKG_CHECK_MODULES(GTK20, [ gtk+-2.0 >= 2.4.0 ]) AC_SUBST(GTK20_CFLAGS) AC_SUBST(GTK20_LIBS) - + # Check for GLADE 2.0 PKG_CHECK_MODULES(GLADE20, [ libglade-2.0 >= 2.4.0 ]) AC_SUBST(GLADE20_CFLAGS) @@ -498,7 +529,7 @@ AC_ARG_ENABLE(dbus, no) HAVE_DBUS=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-dbus) ;; esac], - [HAVE_DBUS=yes]) + [HAVE_DBUS=yes]) 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])) @@ -556,7 +587,7 @@ if test "x$HAVE_DBUS" = "xyes" ; then DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="$with_dbus_system_address" else # 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 + # 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. @@ -570,7 +601,7 @@ if test "x$HAVE_DBUS" = "xyes" ; then done 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]) @@ -588,7 +619,7 @@ AC_ARG_ENABLE(expat, no) HAVE_EXPAT=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-expat) ;; esac], - [HAVE_EXPAT=yes]) + [HAVE_EXPAT=yes]) if test "x$HAVE_EXPAT" = "xyes" ; then AC_CHECK_LIB(expat, XML_ParserCreate, [ AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false) ], have_expat=false) @@ -612,7 +643,7 @@ AC_ARG_ENABLE(dbm, no) HAVE_DBM=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-dbm) ;; esac], - [HAVE_DBM=no]) + [HAVE_DBM=no]) AC_ARG_ENABLE(gdbm, AS_HELP_STRING([--disable-gdbm],[Disable use of GDBM]), @@ -621,7 +652,7 @@ AC_ARG_ENABLE(gdbm, no) HAVE_GDBM=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --disable-gdbm) ;; esac], - [HAVE_GDBM=yes]) + [HAVE_GDBM=yes]) if test "x$HAVE_GDBM" = "xyes" ; then if test "x$HAVE_DBM" = "xyes" ; then @@ -656,10 +687,10 @@ AC_ARG_ENABLE(libdaemon, no) HAVE_LIBDAEMON=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-libdaemon) ;; esac], - [HAVE_LIBDAEMON=yes]) + [HAVE_LIBDAEMON=yes]) if test "x$HAVE_LIBDAEMON" = "xyes" ; then - PKG_CHECK_MODULES(LIBDAEMON, [ libdaemon >= 0.5 ]) + PKG_CHECK_MODULES(LIBDAEMON, [ libdaemon >= 0.11 ]) AC_SUBST(LIBDAEMON_CFLAGS) AC_SUBST(LIBDAEMON_LIBS) fi @@ -690,7 +721,7 @@ if test "x$HAVE_PYTHON" = "xyes" ; then *) AC_MSG_ERROR(bad value ${enableval} for --enable-pygtk) ;; esac], [HAVE_PYGTK=yes]) - + if test "x$HAVE_PYGTK" = "xyes" ; then AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module gtk)]) fi @@ -705,7 +736,7 @@ if test "x$HAVE_PYTHON" = "xyes" ; then *) 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 @@ -769,7 +800,7 @@ AC_ARG_ENABLE(monodoc, if test "x$HAVE_MONO" = "xyes" && test "x$HAVE_MONODOC" = "xyes" ; then PKG_CHECK_MODULES(MONODOC, [monodoc >= 1.1.8]) - MONODOC_DIR=`$PKG_CONFIG --variable=sourcesdir monodoc` + MONODOC_DIR=`$PKG_CONFIG --variable=sourcesdir monodoc` AC_PATH_PROG(MONODOCER, monodocer) AC_PATH_PROG(MDASSEMBLER, mdassembler) @@ -866,7 +897,7 @@ DX_CHM_FEATURE(OFF) DX_CHI_FEATURE(OFF) DX_MAN_FEATURE(OFF) DX_RTF_FEATURE(OFF) -DX_XML_FEATURE(OFF) +DX_XML_FEATURE(ON) DX_PDF_FEATURE(OFF) DX_PS_FEATURE(OFF) DX_INIT_DOXYGEN(avahi, doxygen.cfg, doxygen) @@ -903,7 +934,7 @@ if test x$manpages = xyes ; then 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 @@ -965,16 +996,17 @@ AM_CONDITIONAL([ENABLE_COMPAT_HOWL], [test "x$ENABLE_COMPAT_HOWL" = "xyes"]) # ========================================================================== AC_CONFIG_FILES([ -Makefile -avahi-common/Makefile -avahi-core/Makefile -avahi-glib/Makefile +Makefile +avahi-common/Makefile +avahi-core/Makefile +avahi-glib/Makefile +avahi-gobject/Makefile avahi-qt/Makefile -avahi-daemon/Makefile +avahi-daemon/Makefile avahi-daemon/avahi-dbus.conf -avahi-discover-standalone/Makefile -avahi-client/Makefile -initscript/Makefile +avahi-discover-standalone/Makefile +avahi-client/Makefile +initscript/Makefile initscript/debian/Makefile initscript/gentoo/Makefile initscript/archlinux/Makefile @@ -988,6 +1020,7 @@ avahi-dnsconfd/Makefile avahi-utils/Makefile avahi-python/Makefile avahi-python/avahi/Makefile +avahi-python/avahi-discover/Makefile examples/Makefile common/Makefile man/Makefile @@ -1017,6 +1050,7 @@ echo " C Compiler: ${CC} CFLAGS: ${CFLAGS} Enable GLIB: ${HAVE_GLIB} + Enable GLIB GObject: ${HAVE_GOBJECT} Enable GTK: ${HAVE_GTK} Enable D-Bus: ${HAVE_DBUS} Enable Expat: ${HAVE_EXPAT} @@ -1082,6 +1116,7 @@ echo "\ Building avahi-utils: ${BUILD_CLIENT} Building avahi-python: ${BUILD_PYTHON} Building libavahi-glib: ${HAVE_GLIB} + Building libavahi-gobject: ${HAVE_GOBJECT} Building avahi-discover-standalone: ${HAVE_GTK} Building libavahi-qt3: ${HAVE_QT3} Building libavahi-qt4: ${HAVE_QT4}