* bug fix in run_versioned

* bug fix in socket.c and cosmectic change
* use uname instead of MACHTYPE in bootstrap.sh


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

1 files changed, 14 insertions, 3 deletions

diff --git a/bootstrap.sh b/bootstrap.sh
index 4c34566..e632373 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -22,13 +22,24 @@ FLAGS="--sysconfdir=/etc --localstatedir=/var --enable-tests --enable-compat-how
 
 # Feel free to add your own custom flags in here -Lathiat
 
-case "$MACHTYPE" in
-    powerpc-apple-darwin8.0)
+case `uname -s` in
+    Darwin)
     export LIBTOOLIZE=/opt/local/bin/glibtoolize
     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"
+    FLAGS="$FLAGS --disable-monodoc --disable-mono --disable-qt3 --disable-qt4 --disable-xmltoman --prefix=/opt --with-distro=none --disable-python --disable-manpages"
+    ;;
+    FreeBSD)
+    cp /usr/local/share/aclocal/libtool15.m4 common
+    cp /usr/local/share/aclocal/pkg.m4 common
+    export LIBTOOLIZE=/usr/local/bin/libtoolize15
+    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"
+    ;;
+    Linux)
     ;;
 esac