X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=buildconf.sh;h=21ce6818b285bd145d2f05b164f542ef9af697cf;hp=422d2a6b811bed7975439d65b56aee7052c0ea62;hb=5d536c8cf5400b1e4da91061cf736a9ab53e5bd1;hpb=b8b8cd66686521782aa58bfccb8a30534769c423

diff --git a/buildconf.sh b/buildconf.sh
index 422d2a6..21ce681 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,13 +1,16 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.26 2007-04-03 15:26:14 adam Exp $
 
 automake=automake
 aclocal=aclocal
 autoconf=autoconf
 libtoolize=libtoolize
+autoheader=autoheader
 
 test -d config || mkdir config
-
+if [ -d .git ]; then
+    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 ..."
@@ -15,11 +18,17 @@ if [ "`uname -s`" = FreeBSD ]; then
     aclocal="aclocal19 -I /usr/local/share/aclocal"
     autoconf=autoconf259
     libtoolize=libtoolize15
+    autoheader=autoheader259
+fi
+
+if [ "`uname -s`" = Darwin ]; then
+    echo "Using special configuration for Darwin/MacOS ..."
+    libtoolize=glibtoolize
 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
+    if [ -f /etc/debian_version ]; then
         echo " sudo apt-get install automake1.9"
         echo " sudo update-alternatives --config automake"
     fi
@@ -27,10 +36,12 @@ if $automake --version|head -1 |grep '1\.[4-7]'; then
 fi
 
 set -x
-# I am tired of underquoted warnings for Tcl macros
-$aclocal -I m4 2>&1 | grep -v aclocal/tcl.m4
+$aclocal -I m4
+if grep AC_CONFIG_HEADERS configure.ac >/dev/null; then
+    $autoheader
+fi
 $libtoolize --automake --force 
-$automake -a 
+$automake --add-missing 
 $autoconf
 set -
 if [ -f config.cache ]; then
@@ -43,25 +54,15 @@ sh_flags=""
 conf_flags=""
 case $1 in
     -d)
-	sh_flags="-g -Wall -O0 -Wdeclaration-after-statement -Wstrict-prototypes"
-	enable_configure=true
-	enable_help=false
-	shift
-	;;
-    -p)
-	sh_flags="-g -pg -Wall -Wdeclaration-after-statement -Wstrict-prototypes"
-	enable_configure=true
-	enable_help=false
-	shift
-	;;
-    -o)
-	sh_flags="-g -Wall -O3 -Wdeclaration-after-statement -Wstrict-prototypes"
+	sh_cflags="-g -Wall -Wdeclaration-after-statement -Wstrict-prototypes"
+	sh_cxxflags="-g -Wall"
 	enable_configure=true
 	enable_help=false
 	shift
 	;;
     -c)
-	sh_flags=""
+	sh_cflags=""
+	sh_cxxflags=""
 	enable_configure=true
 	enable_help=false
 	shift
@@ -69,8 +70,8 @@ case $1 in
 esac
 
 if $enable_configure; then
-    if test -n "$sh_flags"; then
-	CFLAGS="$sh_flags" ./configure --disable-shared $*
+    if [ -n "$sh_cflags" ]; then
+	CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $*
     else
 	./configure $*
     fi
@@ -95,13 +96,28 @@ 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 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
+When building from Git, you need these Debian packages:
+  autoconf automake libtool gcc tcl8.4
+  xsltproc docbook docbook-xml docbook-xsl inkscape
+  libxslt1-dev libgnutls-dev libreadline5-dev libexpat1-dev
+  pkg-config libexpat1-dev
+
+And if you want to make a Debian package: dpkg-dev fakeroot debhelper
+(Then run "dpkg-buildpackage -rfakeroot" in this directory.)
+
+EOF
+    fi
+    if [ "`uname -s`" = FreeBSD ]; then
+        cat <<EOF
+When building from a Git, you need these FreeBSD Ports:
+  autoconf259, automake19, libtool15, bison, tcl84,
+  docbook-xsl, libxml2, libxslt, g++-4.0, make
 EOF
+    fi
 fi