X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=buildconf.sh;h=fdadda833558f4af151dabb321671a8416966463;hb=00028a044c656e246ff6991053b9cca50423cfe3;hp=1850bae2af30208d88f3e39be4e35580b6d60847;hpb=6d7c2a8c661d8c2b66bb18e4416396ef700a00e5;p=pazpar2-moved-to-github.git

diff --git a/buildconf.sh b/buildconf.sh
index 1850bae..fdadda8 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -6,6 +6,7 @@ autoconf=autoconf
 libtoolize=libtoolize
 autoheader=autoheader
 
+test -d autom4te.cache && rm -r autom4te.cache
 test -d config || mkdir config
 if [ -d .git ]; then
     git submodule init
@@ -40,6 +41,12 @@ $aclocal -I m4
 if grep AC_CONFIG_HEADERS configure.ac >/dev/null; then
     $autoheader
 fi
+if grep AM_PROG_LIBTOOL configure.ac >/dev/null; then
+    has_libtool=true
+else
+    has_libtool=false
+fi
+
 $libtoolize --automake --force 
 $automake --add-missing 
 $autoconf
@@ -54,7 +61,7 @@ sh_flags=""
 conf_flags=""
 case $1 in
     -d)
-	sh_cflags="-g -Wall -Wdeclaration-after-statement -Wstrict-prototypes"
+	sh_cflags="-O0 -g -Wall -Wdeclaration-after-statement -Wstrict-prototypes"
 	sh_cxxflags="-g -Wall"
 	enable_configure=true
 	enable_help=false
@@ -71,7 +78,11 @@ esac
 
 if $enable_configure; then
     if [ -n "$sh_cflags" ]; then
-	CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $*
+	if $has_libtool; then
+	    CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $*
+        else
+	    CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure $*
+        fi
     else
 	./configure $*
     fi
@@ -103,12 +114,9 @@ Or just build the Debian packages without configuring
   dpkg-buildpackage -rfakeroot
 
 When building from Git, 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
-
-Also perhaps: libgnutls-dev libicu-dev
+  autoconf automake libtool gcc tcl8.4
+  xsltproc docbook docbook-xml docbook-xsl
+  libxslt1-dev libgnutls-dev libreadline5-dev libicu-dev
 
 And if you want to make a Debian package: dpkg-dev fakeroot debhelper
 (Then run "dpkg-buildpackage -rfakeroot" in this directory.)