X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=tools%2Fsetup;h=6da3f674837f6b7fd787a09560e64a4b725d5845;hb=refs%2Fheads%2Fsh%2Fcheck_pgsql;hp=a90d48aa58b0576f22471f76b83fcce112d04d70;hpb=53e8fe9903f09ffa303f7a9cbedd67419b025ae8;p=nagiosplug.git

diff --git a/tools/setup b/tools/setup
index a90d48a..6da3f67 100755
--- a/tools/setup
+++ b/tools/setup
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # autogen.sh glue from CMU Cyrus IMAP
-# $Id$
 #
 # Requires: automake, autoconf, dpkg-dev
 # set -e
@@ -18,10 +17,20 @@ else
 	echo Found GNU Make at $MAKE ... good.
 fi
 
-autopoint --force
-aclocal -I lib
+# 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 gl/m4 -I m4 $extra
+#libtoolize --force --copy
 autoheader
-automake --add-missing --force-missing
+automake --add-missing --force-missing --copy
 autoconf
 
 if [ -f debian/rules ] ; then
@@ -35,11 +44,11 @@ if [ `uname -s` = "SunOS" ] ; 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