Happy new year

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

diff --git a/buildconf.sh b/buildconf.sh
index a889bdb..f844bce 100755 (executable)
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -4,6 +4,7 @@ automake=automake
 aclocal=aclocal
 autoconf=autoconf
 libtoolize=libtoolize
+autoheader=autoheader
 
 test -d config || mkdir config
 if [ -d .git ]; then
@@ -17,6 +18,7 @@ if [ "`uname -s`" = FreeBSD ]; then
     aclocal="aclocal19 -I /usr/local/share/aclocal"
     autoconf=autoconf259
     libtoolize=libtoolize15
+    autoheader=autoheader259
 fi
 
 if [ "`uname -s`" = Darwin ]; then
@@ -35,6 +37,15 @@ fi
 
 set -x
 $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
@@ -66,7 +77,12 @@ 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 --with-pic $*
+        else
+           CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure $*
+        fi
     else
        ./configure $*
     fi
@@ -101,7 +117,7 @@ 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
+  libpcap0.8-dev, pkg-config
 
 Also perhaps: libgnutls-dev libicu-dev