X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=buildconf.sh;h=95be2a5346b37833b158b4f0a564c294ddd6f5a0;hp=f844bce8acf70fade9172319f320fa998fbdc5a3;hb=30af0a1ebbea75c3e757eb03d3f988c61fce8511;hpb=6bb56cea1f0da95aab92c52878f8501a7f4e6a75

diff --git a/buildconf.sh b/buildconf.sh
index f844bce..95be2a5 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,92 +1,12 @@
 #!/bin/sh
 
-automake=automake
-aclocal=aclocal
-autoconf=autoconf
-libtoolize=libtoolize
-autoheader=autoheader
-
-test -d config || mkdir config
 if [ -d .git ]; then
     git submodule init
     git submodule update
 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
-fi
-
-if [ "`uname -s`" = Darwin ]; then
-    echo "Using special configuration for Darwin/MacOS ..."
-    libtoolize=glibtoolize
-fi
-
-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 [ -f /etc/debian_version ]; then
-        echo " sudo apt-get install automake1.9"
-        echo " sudo update-alternatives --config automake"
-    fi
-    exit 1
-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
-set -
-if [ -f config.cache ]; then
-	rm config.cache
-fi
+. m4/id-config.sh
 
-enable_configure=false
-enable_help=true
-sh_flags=""
-conf_flags=""
-case $1 in
-    -d)
-	sh_cflags="-g -Wall -Wdeclaration-after-statement -Wstrict-prototypes"
-	sh_cxxflags="-g -Wall"
-	enable_configure=true
-	enable_help=false
-	shift
-	;;
-    -c)
-	sh_cflags=""
-	sh_cxxflags=""
-	enable_configure=true
-	enable_help=false
-	shift
-	;;
-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 --with-pic $*
-        else
-	    CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure $*
-        fi
-    else
-	./configure $*
-    fi
-fi
 if $enable_help; then
     cat <<EOF
 
@@ -114,12 +34,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 libreadline-gplv2-dev libwrap0-dev
+  pkg-config libicu-dev make
 
 And if you want to make a Debian package: dpkg-dev fakeroot debhelper
 (Then run "dpkg-buildpackage -rfakeroot" in this directory.)
@@ -129,8 +47,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 autoconf268 automake111 libtool bison tcl84 \\
+             docbook-xsl libxml2 libxslt
+  pkg_add -r icu4
 EOF
     fi
 fi