Use shared id-config.sh and fix automake check

The automake version was incorrect and this is fixed by this.

diff --git a/Makefile.am b/Makefile.am
index e9626be..57a54b4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = yaz.pc
 
 SPEC_FILE=$(PACKAGE).spec
-EXTRA_DIST=$(SPEC_FILE) IDMETA README LICENSE NEWS \
+EXTRA_DIST=$(SPEC_FILE) IDMETA README LICENSE NEWS m4/id-config.sh \
        yaz-config.in yaz.pc.in m4/yaz.m4 m4/yaz_libxml2.m4 buildconf.sh \
        Doxyfile.in m4/acx_pthread.m4 m4/ac_check_icu.m4
 

diff --git a/buildconf.sh b/buildconf.sh
index bc1f6e2..6e6e322 100755 (executable)
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,93 +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
-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
-
-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
 

diff --git a/configure.ac b/configure.ac
index d148e32..20c85aa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ m4_esyscmd([. ./IDMETA; echo $VERSION|tr -d '\n']),
 AC_CONFIG_HEADERS(include/config.h)
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])
-AM_INIT_AUTOMAKE([1.9])
+AM_INIT_AUTOMAKE
 dnl
 AC_SUBST([READLINE_LIBS])
 AC_SUBST([YAZ_CONF_CFLAGS])

diff --git a/m4 b/m4
index a63e9ca..1680e50 160000 (submodule)
--- a/m4
+++ b/m4
@@ -1 +1 @@
-Subproject commit a63e9ca4bf4ca6e78f16d58196e7b962de95a6f1
+Subproject commit 1680e50638711cfd57f952d44def5d46c3f09291