X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=buildconf.sh;h=8647f28129dab197dfb0656600f8bbd2bda19914;hp=e20925fc1db62564f57dbd7d503facc0e5389199;hb=75b457189bc3d6551a945b862d0618f2a29b86bd;hpb=243dcdc032523016724ee50765a8a58e9d808209

diff --git a/buildconf.sh b/buildconf.sh
index e20925f..8647f28 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,17 +1,18 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.31 2006-05-22 15:15:26 mike Exp $
+# $Id: buildconf.sh,v 1.46 2007-02-20 09:53:01 adam Exp $
 
 automake=automake
 aclocal=aclocal
 autoconf=autoconf
+libtoolize=libtoolize
 
 if [ "`uname -s`" = FreeBSD ]; then
     # FreeBSD intalls the various auto* tools with version numbers
-    echo "Using special configuation for FreeBSD ..."
+    echo "Using special configuration for FreeBSD ..."
     automake=automake19
     aclocal="aclocal19 -I /usr/local/share/aclocal"
     autoconf=autoconf259
-    echo "Remember to use gmake (GNU make) instead of vanilla make"
+    libtoolize=libtoolize15
 fi
 
 if $automake --version|head -1 |grep '1\.[4-7]'; then
@@ -25,8 +26,8 @@ fi
 
 set -x
 # I am tired of underquoted warnings for Tcl macros
-$aclocal -I m4 2>&1 | grep -v "warning: underquoted definition"
-libtoolize --automake --force 
+$aclocal -I m4
+$libtoolize --automake --force 
 $automake --add-missing 
 $autoconf
 set -
@@ -40,7 +41,8 @@ sh_flags=""
 conf_flags=""
 case $1 in
     -d)
-	sh_flags="-g -Wall -Wdeclaration-after-statement"
+	#sh_flags="-g -Wall -Wdeclaration-after-statement -Werror -Wstrict-prototypes"
+	sh_flags="-g -Wall -Wdeclaration-after-statement -Wstrict-prototypes"
 	enable_configure=true
 	enable_help=false
 	shift
@@ -55,7 +57,7 @@ esac
 
 if $enable_configure; then
     if test -n "$sh_flags"; then
-	CFLAGS="$sh_flags" ./configure $*
+	CFLAGS="$sh_flags" ./configure --disable-shared --enable-static $*
     else
 	./configure $*
     fi
@@ -80,12 +82,24 @@ Build distribution tarball with
 Verify distribution tarball with
   make distcheck
 
+EOF
+    if [ -f /etc/debian_version ]; then
+        cat <<EOF
 Or just build the Debian packages without configuring
   dpkg-buildpackage -rfakeroot
 
-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,
-  libxslt1-dev, libssl-dev, libreadline5-dev, libwrap0-dev, any tcl
+When building from a CVS checkout, you need these Debian packages:
+  autoconf, automake, libtool, gcc, bison, any tcl,
+  xsltproc, docbook, docbook-xml, docbook-xsl,
+  libxslt1-dev, libssl-dev, libreadline5-dev, libwrap0-dev,
+  libpcap0.8-dev
+EOF
+    fi
+    if [ "`uname -s`" = FreeBSD ]; then
+        cat <<EOF
+When building from a CVS checkout, you need these FreeBSD Ports:
+  autoconf259, automake19, libtool15, bison, tcl84,
+  docbook-xsl, libxml2, libxslt, g++-4.0, make
 EOF
+    fi
 fi