buildsys: various buildsystem updates

[catta] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 71675319fd21d4acb80c13264aff0c183f6be5a9..16f221e6b46e119ca1ed1d7604ced4650ebe4720 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
@@ -51,12 +51,12 @@ case `uname -s` in
 esac
 
 case "$USER" in
-    lathiat)
-    FLAGS="$FLAGS --disable-monodoc"
+    lathiat|trentl)
+    FLAGS="$FLAGS --disable-qt4"
     ;;
     sebest)
-    FLAGS="$FLAGS --disable-monodoc --disable-mono --disable-qt3 --disable-qt4 --sysconfdir=/etc --localstatedir=/var --prefix=/usr"
+    FLAGS="$FLAGS --disable-monodoc --enable-dbus=no --enable-mono=no --enable-qt3=no --enable-qt4=no  --sysconfdir=/etc --localstatedir=/var --prefix=/usr  --disable-manpages --disable-xmltoman"
     ;;
 esac
 
-CFLAGS="$CFLAGS -g -O0" exec ./autogen.sh $FLAGS "$@"
+CFLAGS="$CFLAGS -g -O0" exec ./autogen.sh $FLAGS "$@" --enable-qt3=no