X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=buildconf.sh;h=77c505b72dfa73fb275c36625b8ce30a443bfec2;hb=ea632b5255eff5fa23797126df76542ac8720d94;hp=01eb1b77c703fbbe6e1e2f63424985232b626b4d;hpb=74420da6f0c5cffc13ac62d7d845fade996e7c0f;p=metaproxy-moved-to-github.git

diff --git a/buildconf.sh b/buildconf.sh
index 01eb1b7..77c505b 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.3 2005-10-08 09:48:32 adam Exp $
+# $Id: buildconf.sh,v 1.7 2006-03-30 07:47:14 adam Exp $
 
-if automake --version|head -1 |grep '1\.[4-8]'; then
-    echo "automake 1.4-1.8 is active. You should use automake 1.9 or later"
+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"
@@ -11,7 +11,9 @@ if automake --version|head -1 |grep '1\.[4-8]'; then
 fi
 
 set -x
-aclocal -I m4
+
+# I am tired of underquoted warnings for Tcl macros
+aclocal -I m4 2>&1 | grep -v aclocal/tcl.m4
 autoheader
 libtoolize --automake --force 
 automake --add-missing 
@@ -42,7 +44,7 @@ esac
 
 if $enable_configure; then
     if test -n "$sh_flags"; then
-	CXXFLAGS="$sh_flags" ./configure $*
+	CXXFLAGS="$sh_flags" ./configure --disable-shared --enable-static $*
     else
 	./configure $*
     fi
@@ -71,7 +73,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, docbook-utils, docbook, docbook-xml,
+  docbook-dsssl, jade, jadetex,
+  libxslt1-dev, libyazpp1-dev
 EOF
 fi