started autotools usage overhaul with some configure.ac revision

Modernisation of libtool initialisation.  Use of acinclude.m4 to load
macro definition files.

diff --git a/expat/acinclude.m4 b/expat/acinclude.m4
new file mode 100644 (file)
index 0000000..130cc3a
--- /dev/null
+++ b/expat/acinclude.m4
@@ -0,0 +1,8 @@
+# acinclude.m4 --
+#
+
+m4_include(conftools/ac_c_bigendian_cross.m4)
+dnl m4_include(meta/autoconf/ax-check-compile-flag.m4)
+dnl m4_include(meta/autoconf/ax-gcc-version.m4)
+
+### end of file

diff --git a/expat/buildconf.sh b/expat/buildconf.sh
index 27c01e14b5e2ec6a3ad489b9d19e155f96d581f6..c3c2edaf17236fe2997da3c800f3187be41b3b38 100755 (executable)
--- a/expat/buildconf.sh
+++ b/expat/buildconf.sh
@@ -1,2 +1,2 @@
 #! /bin/sh
-exec autoreconf -i -f
+exec autoreconf --warnings=all --install --verbose "$@"

diff --git a/expat/configure.ac b/expat/configure.ac
index 07b170d2286c4406b5cec7b42bac359e5a7404f1..ec0c05e81f9fa77a9b12a57a14a75fa40b25b1e7 100644 (file)
--- a/expat/configure.ac
+++ b/expat/configure.ac
@@ -29,10 +29,10 @@ define([expat_version], ifdef([__gnu__],
 AC_INIT(expat, expat_version, expat-bugs@libexpat.org)
 undefine([expat_version])
 
-AC_CONFIG_SRCDIR(Makefile.in)
-AC_CONFIG_AUX_DIR(conftools)
-AM_INIT_AUTOMAKE
+AC_CONFIG_SRCDIR([Makefile.in])
+AC_CONFIG_AUX_DIR([conftools])
 AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE
 
 
 dnl
@@ -42,7 +42,7 @@ dnl If the API has changed, increment LIBCURRENT and set LIBREVISION to 0
 dnl
 dnl If the API changes compatibly (i.e. simply adding a new function
 dnl without changing or removing earlier interfaces), then increment LIBAGE.
-dnl 
+dnl
 dnl If the API changes incompatibly set LIBAGE back to 0
 dnl
 
@@ -53,19 +53,21 @@ LIBAGE=6       # CMakeLists.txt!
 CPPFLAGS="${CPPFLAGS} -DHAVE_EXPAT_CONFIG_H"
 AC_CONFIG_HEADER(expat_config.h)
 
-sinclude(conftools/ac_c_bigendian_cross.m4)
+AM_PROG_AR
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_MKDIR_P
 
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
+LT_PREREQ([2.4])
+LT_INIT([win32-dll])
 
 AC_SUBST(LIBCURRENT)
 AC_SUBST(LIBREVISION)
 AC_SUBST(LIBAGE)
 
-dnl Checks for programs.
 AC_PROG_CC_C99
 AC_PROG_CXX
-AC_PROG_INSTALL
 
 if test "$GCC" = yes ; then
     dnl

diff --git a/expat/conftools/.gitignore b/expat/conftools/.gitignore
index ff15588f334fcd1a29eb9812bf2ed922794786ea..c214f69d2c96e1970d142497af7658ddbf7a4ce3 100644 (file)
--- a/expat/conftools/.gitignore
+++ b/expat/conftools/.gitignore
@@ -8,3 +8,4 @@ ltconfig
 ltmain.sh
 missing
 test-driver
+ar-lib