X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=43b1f657af2ff8a51bcc3161538ce4e5b1e6da1d;hb=328d192ae37f91d3e19c22eb8f97bf830bfc3933;hp=0c205c00ff838e8cb4d16a290dd2faefef354909;hpb=9225e01a984f730e6b2755a37e83c7ca4ee601cb;p=catta diff --git a/configure.ac b/configure.ac index 0c205c0..43b1f65 100644 --- a/configure.ac +++ b/configure.ac @@ -21,20 +21,21 @@ # USA. AC_PREREQ(2.57) -AC_INIT([avahi],[0.6.20],[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 @@ -422,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 # @@ -441,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 @@ -466,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 @@ -489,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) @@ -507,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=