X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=buildconf.sh;h=e20925fc1db62564f57dbd7d503facc0e5389199;hp=6cc5ca0eb4014a5b870e112ab8a0cc2cd2091b6f;hb=243dcdc032523016724ee50765a8a58e9d808209;hpb=09a0b5531c9286b7179625ce5f32009b2f27b8d5

diff --git a/buildconf.sh b/buildconf.sh
index 6cc5ca0..e20925f 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,7 +1,20 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.26 2006-03-30 07:45:42 adam Exp $
+# $Id: buildconf.sh,v 1.31 2006-05-22 15:15:26 mike Exp $
 
-if automake --version|head -1 |grep '1\.[4-7]'; then
+automake=automake
+aclocal=aclocal
+autoconf=autoconf
+
+if [ "`uname -s`" = FreeBSD ]; then
+    # FreeBSD intalls the various auto* tools with version numbers
+    echo "Using special configuation for FreeBSD ..."
+    automake=automake19
+    aclocal="aclocal19 -I /usr/local/share/aclocal"
+    autoconf=autoconf259
+    echo "Remember to use gmake (GNU make) instead of vanilla make"
+fi
+
+if $automake --version|head -1 |grep '1\.[4-7]'; then
     echo "automake 1.4-1.7 is active. You should use automake 1.8 or later"
     if test -f /etc/debian_version; then
         echo " sudo apt-get install automake1.9"
@@ -12,10 +25,10 @@ fi
 
 set -x
 # I am tired of underquoted warnings for Tcl macros
-aclocal -I . 2>&1 | grep -v aclocal/tcl.m4
+$aclocal -I m4 2>&1 | grep -v "warning: underquoted definition"
 libtoolize --automake --force 
-automake --add-missing 
-autoconf
+$automake --add-missing 
+$autoconf
 set -
 if [ -f config.cache ]; then
 	rm config.cache
@@ -27,7 +40,7 @@ sh_flags=""
 conf_flags=""
 case $1 in
     -d)
-	sh_flags="-g -Wall"
+	sh_flags="-g -Wall -Wdeclaration-after-statement"
 	enable_configure=true
 	enable_help=false
 	shift
@@ -73,6 +86,6 @@ Or just build the Debian packages without configuring
 When building from a CVS checkout, you need these Debian tools:
   autoconf, automake, bison, gcc, libtool,
   docbook-utils, docbook, docbook-xml, docbook-dsssl, jade, jadetex,
-  libxml2-dev, libssl-dev, libreadline5-dev, libwrap0-dev, any tcl
+  libxslt1-dev, libssl-dev, libreadline5-dev, libwrap0-dev, any tcl
 EOF
 fi