RPN to CQL: always quote resulting terms

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

diff --git a/buildconf.sh b/buildconf.sh
index 9671592..b2edcf6 100755 (executable)
--- 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
@@ -14,11 +15,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
-    autoheader=autoheader259
+    automake=automake
+    aclocal="aclocal -I /usr/local/share/aclocal"
+    autoconf=autoconf
+    libtoolize=libtoolize
+    autoheader=autoheader
 fi
 
 if [ "`uname -s`" = Darwin ]; then
@@ -78,7 +79,8 @@ esac
 if $enable_configure; then
     if [ -n "$sh_cflags" ]; then
        if $has_libtool; then
-           CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $*
+           CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure \
+               --disable-shared --enable-static --with-pic $*
         else
            CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure $*
         fi
@@ -113,12 +115,10 @@ 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, pkg-config
-
-Also perhaps: libgnutls-dev libicu-dev
+  autoconf automake libtool gcc bison tcl8.4
+  xsltproc docbook docbook-xml docbook-xsl
+  libxslt1-dev libgnutls-dev libreadline5-dev libwrap0-dev
+  pkg-config libicu-dev 
 
 And if you want to make a Debian package: dpkg-dev fakeroot debhelper
 (Then run "dpkg-buildpackage -rfakeroot" in this directory.)
@@ -128,8 +128,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