update docs

[catta] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6b83eed705add4fc6e78a51a96e7e7dc2a38f5c8..b6fabfb98f80f0cfb6af5d20edc68f62d736cbd7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,12 +28,12 @@ AM_INIT_AUTOMAKE([foreign 1.9 -Wall])
 
 AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/Software/Avahi])
 
-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_COMMON_VERSION_INFO, [3:0:0])
+AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [3:0:0])
+AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [3:0: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_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,34 +115,41 @@ 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 Linux distribution to target: One of debian, gentoo, archlinux or none]))
+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of debian, gentoo, archlinux, fedora, darwin, netbsd, freebsd 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")
     AC_CHECK_FILE(/etc/arch-release,with_distro="archlinux")
     AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
     AC_CHECK_FILE(/etc/redhat-release,with_distro="fedora")
+    if test "z$with_distro" = "z"; then
+        with_distro=`uname -s`
+    fi
 fi
 with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' `
 
-if test "z$with_distro" = "z"; then
-    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.])
-    exit 1
-else
 case $with_distro in
-    debian|gentoo|archlinux|suse|fedora|none)
+    debian|gentoo|archlinux|suse|fedora|darwin|none)
+     ;;
+    netbsd|freebsd)
+     AC_MSG_WARN([Your distribution (${with_distro}) is supported but no init script exist yet! (patches welcome)])
+     ;;
+    linux)
+     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])
      ;;
 esac
-fi
 
 AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
 AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
 AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
 AM_CONDITIONAL(TARGET_ARCHLINUX, test x"$with_distro" = xarchlinux)
 AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora)
+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)
 
 test_gcc_flag() {
     AC_LANG_CONFTEST([int main() {}])
@@ -697,9 +704,11 @@ initscript/gentoo/Makefile
 initscript/archlinux/Makefile
 initscript/suse/Makefile
 initscript/fedora/Makefile
+initscript/darwin/Makefile
 avahi-dnsconfd/Makefile
 avahi-utils/Makefile
-avahi-utils/avahi/Makefile
+avahi-python/Makefile
+avahi-python/avahi/Makefile
 examples/Makefile
 common/Makefile
 man/Makefile
@@ -737,7 +746,7 @@ echo "
     Enable QT3:             ${HAVE_QT3}
     Enable QT4:             ${HAVE_QT4}
     Enable Mono:            ${HAVE_MONO}
-    Linux Distro:           ${with_distro}
+    Distribution/OS:        ${with_distro}
     User for Avahi:         ${AVAHI_USER}
     Group for Avahi:        ${AVAHI_GROUP}
     Enable chroot():        ${enable_chroot}