diff --git a/tools/setup b/tools/setup
index 084399b03fba07ce0083995f560331e83c690eb0..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
-# Refresh GNU autotools toolchain.
-for i in config.guess config.sub missing install-sh mkinstalldirs ; do
- test -r /usr/share/automake/${i} && {
- rm -f ${i}
- cp /usr/share/automake/${i} .
- }
- chmod 755 ${i}
-done
+# 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 lib
+aclocal -I gl/m4 -I m4 $extra
+#libtoolize --force --copy
autoheader
-automake --add-missing --copy
+automake --add-missing --force-missing --copy
autoconf
if [ -f debian/rules ] ; then
docbook=1
fi
else
- if which docbook2html ; then
+ if which docbook2html >/dev/null 2>&1; then
docbook=1
fi
fi
if [ $docbook = 1 ] ; then
- cd doc && make
+ ( cd doc && make )
fi