X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=buildconf.sh;h=6e6e322e9f513815d6f139fd8f8d07e30ed6d614;hp=5ce967ccd6db65cc41d65f621ea66f80f63a2c4c;hb=7143bc8f77ac03fdb6f36f30b16cf64c2d6cc3e2;hpb=a624e2e9e2271292147cb432411464bd5eab8da6

diff --git a/buildconf.sh b/buildconf.sh
index 5ce967c..6e6e322 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,77 +1,12 @@
 #!/bin/sh
 
-automake=automake
-aclocal=aclocal
-autoconf=autoconf
-libtoolize=libtoolize
-
-test -d config || mkdir config
-if test .git; then
+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
-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 test -f /etc/debian_version; then
-        echo " sudo apt-get install automake1.9"
-        echo " sudo update-alternatives --config automake"
-    fi
-    exit 1
-fi
-
-set -x
-# I am tired of underquoted warnings for Tcl macros
-$aclocal -I m4
-$libtoolize --automake --force 
-$automake --add-missing 
-$autoconf
-set -
-if [ -f config.cache ]; then
-	rm config.cache
-fi
 
-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
+. m4/id-config.sh
 
-if $enable_configure; then
-    if test -n "$sh_flags"; then
-	CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure --disable-shared --enable-static $*
-    else
-	./configure $*
-    fi
-fi
 if $enable_help; then
     cat <<EOF
 
@@ -98,13 +33,11 @@ EOF
 Or just build the Debian packages without configuring
   dpkg-buildpackage -rfakeroot
 
-When building from a CVS checkout, 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
+When building from Git, you need these Debian packages:
+  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.)
@@ -113,9 +46,10 @@ EOF
     fi
     if [ "`uname -s`" = FreeBSD ]; then
         cat <<EOF
-When building from a CVS checkout, you need these FreeBSD Ports:
-  autoconf259, automake19, libtool15, bison, tcl84,
-  docbook-xsl, libxml2, libxslt, g++-4.0, make
+When building from a Git, you need these FreeBSD Ports:
+  pkg_add -r autoconf268 automake111 libtool bison tcl84 \\
+             docbook-xsl libxml2 libxslt
+  pkg_add -r icu4
 EOF
     fi
 fi