diff --git a/tools/setup b/tools/setup
index 17eed516eca5b0e068586e97bb711fd266a5fe43..6da3f674837f6b7fd787a09560e64a4b725d5845 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
extra="-I $HOME/share/aclocal"
fi
-autopoint --force
-aclocal -I m4 $extra
-libtoolize --force --copy
+# 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 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