diff --git a/tools/setup b/tools/setup
index 6f3fdee982814e0b3e2c46bf99f96ccc2110a8cb..6da3f674837f6b7fd787a09560e64a4b725d5845 100755 (executable)
--- a/tools/setup
+++ b/tools/setup
#!/bin/sh
#
# autogen.sh glue from CMU Cyrus IMAP
#!/bin/sh
#
# autogen.sh glue from CMU Cyrus IMAP
-# $Id$
#
# Requires: automake, autoconf, dpkg-dev
# set -e
#
# Requires: automake, autoconf, dpkg-dev
# set -e
echo Found GNU Make at $MAKE ... good.
fi
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
+
+# This file will be automagically re-generated of present - still looks
+# better than having a versioned file change based on automake version
+touch build-aux/mkinstalldirs
-aclocal -I lib
+aclocal -I gl/m4 -I m4 $extra
+#libtoolize --force --copy
autoheader
autoheader
-automake --add-missing --copy
+automake --add-missing --force-missing --copy
autoconf
autoconf
-autopoint --force
if [ -f debian/rules ] ; then
chmod +x debian/rules
if [ -f debian/rules ] ; then
chmod +x debian/rules
docbook=1
fi
else
docbook=1
fi
else
- if which docbook2html ; then
+ if which docbook2html >/dev/null 2>&1; then
docbook=1
fi
fi
if [ $docbook = 1 ] ; then
docbook=1
fi
fi
if [ $docbook = 1 ] ; then
- cd doc && make
+ ( cd doc && make )
fi
fi