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

diff --git a/buildconf.sh b/buildconf.sh
index bee20be..7e6581d 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,7 +1,28 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.27 2006-03-30 16:30:25 adam Exp $
 
-if automake --version|head -1 |grep '1\.[4-7]'; then
+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 configuration for FreeBSD ..."
+    automake=automake19
+    aclocal="aclocal19 -I /usr/local/share/aclocal"
+    autoconf=autoconf259
+    libtoolize=libtoolize15
+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 +33,10 @@ fi
 
 set -x
 # I am tired of underquoted warnings for Tcl macros
-aclocal -I m4 2>&1 | grep -v aclocal/tcl.m4
-libtoolize --automake --force 
-automake --add-missing 
-autoconf
+$aclocal -I m4
+$libtoolize --automake --force 
+$automake --add-missing 
+$autoconf
 set -
 if [ -f config.cache ]; then
 	rm config.cache
@@ -27,7 +48,8 @@ sh_flags=""
 conf_flags=""
 case $1 in
     -d)
-	sh_flags="-g -Wall"
+	#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
@@ -42,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
@@ -67,12 +89,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,
-  libxml2-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