X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=buildconf.sh;h=3d84c9b77b6e982a7818d09a512f1c2538251d71;hp=e69ea5f926f3b9dfefe1d6e7eb240ab50ba5e1f3;hb=dcd1514bd18b7c8623f2f2271f36d11948cf3821;hpb=1159610ba48547a9af5275cbfb7df457b58a5b0c

diff --git a/buildconf.sh b/buildconf.sh
index e69ea5f..3d84c9b 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,11 +1,19 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.15 2006-03-20 09:30:13 mike Exp $
+# $Id: buildconf.sh,v 1.23 2006-10-29 17:19:07 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,13 @@ sh_flags=""
 conf_flags=""
 case $1 in
     -d)
-	sh_flags="-g -Wall -O0"
+	sh_flags="-g -Wall -O0 -Wdeclaration-after-statement -Wstrict-prototypes"
+	enable_configure=true
+	enable_help=false
+	shift
+	;;
+    -o)
+	sh_flags="-g -Wall -O3 -Wdeclaration-after-statement -Wstrict-prototypes"
 	enable_configure=true
 	enable_help=false
 	shift
@@ -33,7 +47,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,13 +75,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, 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