Always run 'git submodule update' when git is in use

[yazproxy-moved-to-github.git] / buildconf.sh

diff --git a/buildconf.sh b/buildconf.sh
index 63c014f..a037772 100755 (executable)
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,7 +1,27 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.8 2006-03-09 14:14:06 adam Exp $
+
+test -d config || mkdir config
+if test .git; then
+    if test -d m4/.git -a -d doc/common/.git; then
+        :
+    else
+        git submodule init
+    fi
+    git submodule update
+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"
+        echo " sudo update-alternatives --config automake"
+    fi
+    exit 1
+fi
+
 set -x
-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 --add-missing 
 autoconf
@@ -60,7 +80,8 @@ 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,
-  libxslt1-dev, libyaz++-dev
+  autoconf, automake, libtool, gcc, g++, make,
+  xsltproc, docbook, docbook-xml, docbook-xsl,
+  libxslt1-dev, libyazpp1-dev
 EOF
 fi