* add support for other os in --with-distro (darwin/netbsd/freebsd), we can now make...

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@962 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/bootstrap.sh b/bootstrap.sh
index 71675319fd21d4acb80c13264aff0c183f6be5a9..51466f4ce8a9a1b6375d7374d130eb47ac2a1741 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -28,7 +28,7 @@ case `uname -s` in
     export CFLAGS="-I/opt/local/include"
     export LDFLAGS="-L/opt/local/lib"
     export PKG_CONFIG_PATH="/opt/local/lib/pkgconfig"
-    FLAGS="$FLAGS --disable-monodoc --disable-mono --disable-qt3 --disable-qt4 --disable-xmltoman --prefix=/opt --with-distro=none --disable-python --disable-manpages"
+    FLAGS="$FLAGS --prefix=/opt/local --disable-pygtk"
     ;;
     FreeBSD)
     cp /usr/local/share/aclocal/libtool15.m4 common
@@ -37,7 +37,7 @@ case `uname -s` in
     export CFLAGS="-I/usr/local/include"
     export LDFLAGS="-L/usr/local/lib"
     export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
-    FLAGS="$FLAGS --disable-monodoc --disable-mono --disable-qt3 --disable-qt4 --disable-xmltoman --prefix=/opt --with-distro=none --disable-python --disable-dbus --disable-glib --disable-gtk --disable-manpages"
+    FLAGS="$FLAGS --prefix=/opt/ --with-distro=none --disable-python --disable-dbus --disable-glib --disable-gtk"
     ;;
     NetBSD)
     export LIBTOOLIZE=libtoolize
@@ -55,7 +55,7 @@ case "$USER" in
     FLAGS="$FLAGS --disable-monodoc"
     ;;
     sebest)
-    FLAGS="$FLAGS --disable-monodoc --disable-mono --disable-qt3 --disable-qt4 --sysconfdir=/etc --localstatedir=/var --prefix=/usr"
+    FLAGS="$FLAGS --disable-monodoc --disable-mono --disable-qt3 --disable-qt4 --sysconfdir=/etc --localstatedir=/var --prefix=/usr  --disable-manpages --disable-xmltoman"
     ;;
 esac
 

diff --git a/configure.ac b/configure.ac
index 6b83eed705add4fc6e78a51a96e7e7dc2a38f5c8..c8490dfec313169193ba3c0caa835bf260ba7d29 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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)
      ;;
+    darwin|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() {}])
@@ -737,7 +744,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}