X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=buildconf.sh;h=95ea2226400b3e50fa9c83ddabc211f4ac6ab19a;hb=9d9266bfed4daa001a3f038f0d5b6e8c51a37373;hp=ab8ec0c0c3518e1abf911bd8882453ab1c505a17;hpb=28d9bda2734f323dafccfd07422e36b65b6487f1;p=idzebra-moved-to-github.git

diff --git a/buildconf.sh b/buildconf.sh
index ab8ec0c..95ea222 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,11 +1,19 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.16 2006-03-20 09:41:08 mike Exp $
+# $Id: buildconf.sh,v 1.22 2006-06-28 13:26:13 adam Exp $
+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"
+        echo " sudo update-alternatives --config automake"
+    fi
+    exit 1
+fi
+
 set -x
-dir=`aclocal --print-ac-dir`
-aclocal -I .
+# I am tired of underquoted warnings for Tcl macros
+aclocal -I m4 2>&1 | grep -v aclocal/tcl.m4
 libtoolize --automake --force 
 automake -a 
-automake -a 
 autoconf
 set -
 if [ -f config.cache ]; then
@@ -18,7 +26,7 @@ sh_flags=""
 conf_flags=""
 case $1 in
     -d)
-	sh_flags="-g -Wall -O0"
+	sh_flags="-g -Wall -O0 -Wdeclaration-after-statement"
 	enable_configure=true
 	enable_help=false
 	shift
@@ -33,7 +41,7 @@ esac
 
 if $enable_configure; then
     if test -n "$sh_flags"; then
-	CFLAGS="$sh_flags" ./configure $*
+	CFLAGS="$sh_flags" ./configure --disable-shared $*
     else
 	./configure $*
     fi
@@ -61,14 +69,10 @@ Verify distribution tarball with
 Or just build the Debian packages without configuring
   dpkg-buildpackage -rfakeroot
 
-When building from a CVS checkout, you need these Debian tools:
-  docbook-utils, docbook, docbook-xml, docbook-dsssl,
-  docbook-defguide, docbook-website, docbook-xsl, jade, jadetex,
-  libyaz-dev, libexpat1-dev, libtcl8.3-dev, libbz2-dev
+When building from a CVS checkout, you need these Debian packages:
+  docbook, docbook-xml, docbook-xsl, xsltproc,
+  libyaz-dev, libexpat1-dev, tcl8.4-dev, libbz2-dev
 and if you want the Alvis/XSLT filter, you also need:
   libxslt1-dev
-
-To build against a YAZ in an adjacent dirctory, use:
-	CFLAGS="-g -O0" LDFLAGS="-L`pwd`/../yaz/src/.libs" CPPFLAGS="-I../yaz/include" ./configure
 EOF
 fi