Use m4/id-config.sh

diff --git a/Makefile.am b/Makefile.am
index ab749c6..77133a8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ aclocaldir=$(datadir)/aclocal
 aclocal_DATA = m4/yazpp.m4
 
 SPEC_FILE=$(PACKAGE).spec
-EXTRA_DIST= $(SPEC_FILE) IDMETA README LICENSE NEWS \
+EXTRA_DIST= $(SPEC_FILE) IDMETA README LICENSE NEWS m4/id-config.sh \
        yazpp-config.in m4/yaz.m4 m4/yazpp.m4 buildconf.sh Doxyfile.in
 
 dist-hook:

diff --git a/buildconf.sh b/buildconf.sh
index ea58ec3..c6a4e39 100755 (executable)
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,83 +1,12 @@
 #!/bin/sh
 
-automake=automake
-aclocal=aclocal
-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
     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=automake
-    aclocal="aclocal -I /usr/local/share/aclocal"
-    autoconf=autoconf
-    libtoolize=libtoolize
-    autoheader=autoheader
-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
+. m4/id-config.sh
 
-set -x
-$aclocal -I m4
-if grep AC_CONFIG_HEADERS configure.ac >/dev/null; then
-    $autoheader
-fi
-$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
-
-if $enable_configure; then
-    if [ -n "$sh_cflags" ]; then
-       CFLAGS="$sh_cflags" CXXFLAGS="$sh_cxxflags" ./configure \
-               --disable-shared --enable-static --with-pic $*
-    else
-       ./configure $*
-    fi
-fi
 if $enable_help; then
     cat <<EOF
 
@@ -118,7 +47,7 @@ EOF
     if [ "`uname -s`" = FreeBSD ]; then
         cat <<EOF
 When building from a Git, you need these FreeBSD Ports:
-  pkg_add -r autoconf262 automake110 libtool bison tcl84 \\
+  pkg_add -r autoconf268 automake111 libtool bison tcl84 \\
              docbook-xsl libxml2 libxslt
   pkg_add -r icu4
 EOF

diff --git a/m4 b/m4
index eda6995..58092fa 160000 (submodule)
--- a/m4
+++ b/m4
@@ -1 +1 @@
-Subproject commit eda6995523f2412995ee60b5fe6443dee3e0d156
+Subproject commit 58092fa51c66ace9beb4b058854266c7134f18a6