diff --git a/tools/setup b/tools/setup
index be625abdf63fc4f631c099abf0abb8a84f099fd0..1afe4f15bd749d6df2e101655e208a90a07d5ea5 100755 (executable)
--- a/tools/setup
+++ b/tools/setup
#!/bin/sh
#
# autogen.sh glue from CMU Cyrus IMAP
-# $Id$
#
# Requires: automake, autoconf, dpkg-dev
# set -e
echo Found GNU Make at $MAKE ... good.
fi
-autopoint --force
-aclocal -I m4
-libtoolize --force --copy
+# This bit is to fix SF's compile server as libtool not installed by default
+extra=""
+if test -d $HOME/share/aclocal ; then
+ extra="-I $HOME/share/aclocal"
+fi
+
+aclocal -I gl/m4 -I m4 $extra
+#libtoolize --force --copy
autoheader
automake --add-missing --force-missing --copy
autoconf
fi
if [ $docbook = 1 ] ; then
- cd doc && make
+ ( cd doc && make )
fi