X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=buildconf.sh;h=c82194a080ae6039897cced78acb7f7d05605a30;hp=a889bdb99a2a7e61d8d85d40d4f6a77ca53fe117;hb=4d300e643896e74f94514065da5236fc24f14b13;hpb=98db267fe0117e2bff00e044ccbee8f37dd69548

diff --git a/buildconf.sh b/buildconf.sh
index a889bdb..c82194a 100755
--- 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
@@ -13,10 +14,11 @@ fi
 if [ "`uname -s`" = FreeBSD ]; then
     # FreeBSD intalls the various auto* tools with version numbers
     echo "Using special configuration for FreeBSD ..."
-    automake=automake19
-    aclocal="aclocal19 -I /usr/local/share/aclocal"
-    autoconf=autoconf259
-    libtoolize=libtoolize15
+    automake=automake
+    aclocal="aclocal -I /usr/local/share/aclocal"
+    autoconf=autoconf
+    libtoolize=libtoolize
+    autoheader=autoheader
 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
 
@@ -113,8 +129,9 @@ EOF
     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
+  pkg_add -r autoconf262 automake110 libtool bison tcl84 \\
+             docbook-xsl libxml2 libxslt
+  pkg_add -r icu4
 EOF
     fi
 fi