[xslt] [PATCH] Modernize configure script



When running configure.in through recent versions of autoconf, they will
complain about usage that won't be supported in future versions. This
commit uses the AC_INIT() macro in the recommended syntax that receives
the package name and version as parameters and both can be dropped from
the AM_INIT_AUTOMAKE invocation. The latter is passed the foreign option
instead to mark it as a non-GNU project.

Another recommendation for modern autotools is to put m4 macros in a
separate directory, so this commit creates the m4 directory in the
autogen.sh script and instructs the autotools to look there for m4
files.

Signed-off-by: Thierry Reding <thierry reding avionic-design de>
---
 Makefile.am                  | 2 ++
 autogen.sh                   | 2 ++
 configure.in => configure.ac | 5 +++--
 3 files changed, 7 insertions(+), 2 deletions(-)
 rename configure.in => configure.ac (99%)

diff --git a/Makefile.am b/Makefile.am
index e357f19..6e16cf1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = \
 	libxslt \
 	libexslt \
diff --git a/autogen.sh b/autogen.sh
index f091bef..aa2a312 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -46,6 +46,8 @@ if test -z "$*"; then
         echo "to pass any to it, please specify them on the $0 command line."
 fi
 
+test -d m4 || mkdir m4
+
 echo "Running libtoolize..."
 libtoolize --copy --force
 echo "Running aclocal..."
diff --git a/configure.in b/configure.ac
similarity index 99%
rename from configure.in
rename to configure.ac
index 0d7ba86..63e5a0a 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configuration script.
 AC_PREREQ(2.59)
-AC_INIT(libxslt/xslt.c)
+AC_INIT([libxslt], [1.1.27])
 AC_CONFIG_HEADERS(config.h)
 AC_CANONICAL_HOST
 AC_USE_SYSTEM_EXTENSIONS
@@ -82,7 +82,8 @@ AC_SUBST(LIBEXSLT_VERSION_EXTRA)
 
 VERSION=${LIBXSLT_VERSION}
 
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AM_INIT_AUTOMAKE([foreign])
+AC_CONFIG_MACRO_DIR([m4])
 
 # AM_MAINTAINER_MODE
 
-- 
1.7.12



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]