X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=bbb8545b2a7dd3f7feaa0c890770061b4b9613d3;hb=a09232b36c2b00cce61f4777df223dac36176932;hp=e412a2f95fb63d41302833781f43167230d4d745;hpb=8835db5cfb321e810c316ad263884eee3c76a879;p=catta

diff --git a/configure.ac b/configure.ac
index e412a2f..bbb8545 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.9],[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_COMMON_VERSION_INFO, [6:0:3])
+AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [4:1:0])
+AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [4:1:1])
 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_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])
@@ -115,7 +115,7 @@ AC_TRY_COMPILE([#include <netinet/in.h>], [
 #
 # 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 +123,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 +131,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)])
@@ -152,6 +153,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() {}])
@@ -235,6 +237,12 @@ if test "x$enable_chroot" = "xyes" ; then
    AC_DEFINE([ENABLE_CHROOT], 1, [Enable chroot() usage])
 fi
 
+AC_CHECK_LIB(dl, dlopen, [ AC_CHECK_HEADERS(dlfcn.h, HAVE_DLOPEN=yes, HAVE_DLOPEN=no) ], HAVE_DLOPEN=no)
+if test "x$HAVE_DLOPEN" = "xyes" ; then
+    AC_DEFINE([HAVE_DLOPEN],1,[Have dlopen()])
+fi
+AM_CONDITIONAL(HAVE_DLOPEN, test "x$HAVE_DLOPEN" = "xyes")
+
 # 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)
@@ -749,6 +757,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