check_pgsql: Determine connection time in µs-resolution.

[nagiosplug.git] / tools / setup

diff --git a/tools/setup b/tools/setup
index 904120f04210ef296f4414c62f0eb5bb65b1ff01..6da3f674837f6b7fd787a09560e64a4b725d5845 100755 (executable)
--- a/tools/setup
+++ b/tools/setup
@@ -1,15 +1,14 @@
 #!/bin/sh
 #
 # autogen.sh glue from CMU Cyrus IMAP
-# $Id$
 #
 # Requires: automake, autoconf, dpkg-dev
 # set -e
 
-MAKE=$(which gnumake)
-if test ! -x "$MAKE" ; then MAKE=$(which gmake) ; fi
-if test ! -x "$MAKE" ; then MAKE=$(which make) ; fi
-HAVE_GNU_MAKE=$($MAKE --version|grep -c "Free Software Foundation")
+MAKE=`which gnumake`
+if test ! -x "$MAKE" ; then MAKE=`which gmake` ; fi
+if test ! -x "$MAKE" ; then MAKE=`which make` ; fi
+HAVE_GNU_MAKE=`$MAKE --version|grep -c "Free Software Foundation"`
 
 if test "$HAVE_GNU_MAKE" != "1"; then 
        echo Could not find GNU make on this system, can not proceed with build.
@@ -18,18 +17,20 @@ else
        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
-automake --add-missing --copy
+automake --add-missing --force-missing --copy
 autoconf
 
 if [ -f debian/rules ] ; then
@@ -43,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