X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=buildconf.sh;h=7e6581d4bffb790a33e2e2df8fa0e7738c08b632;hp=69a942a1443d0a77d9a05e6bf8d479d329b92b9a;hb=d940392c53c32ccf76fb287cc5b997b9e921a431;hpb=1ecd49d730df37f92f997957e2c9f32158bc5d0f

diff --git a/buildconf.sh b/buildconf.sh
index 69a942a..7e6581d 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,14 +1,21 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.35 2006-05-24 16:21:02 adam Exp $
 
 automake=automake
 aclocal=aclocal
 autoconf=autoconf
 libtoolize=libtoolize
 
+test -d config || mkdir config
+if test -d m4/.git -a -d doc/common/.git; then
+    :
+else
+    git submodule init
+    git submodule update
+fi
+
 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
@@ -26,7 +33,7 @@ fi
 
 set -x
 # I am tired of underquoted warnings for Tcl macros
-$aclocal -I m4 2>&1 | grep -v "warning: underquoted definition"
+$aclocal -I m4
 $libtoolize --automake --force 
 $automake --add-missing 
 $autoconf
@@ -41,7 +48,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
@@ -56,7 +64,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
@@ -90,14 +98,15 @@ Or just build the Debian packages without configuring
 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
+  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
+  docbook-xsl, libxml2, libxslt, g++-4.0, make
 EOF
     fi
 fi