[libxslt] Misc autoconf updates
- From: Nick Wellnhofer <nwellnhof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxslt] Misc autoconf updates
- Date: Thu, 14 Sep 2017 19:57:05 +0000 (UTC)
commit 31cbd6251e122fa3d6589b04995fe7360f85b75f
Author: Nick Wellnhofer <wellnhofer aevum de>
Date: Thu Sep 14 19:04:49 2017 +0200
Misc autoconf updates
* Switch to autoreconf in autogen.sh
* Rename configure.in to configure.ac
* Use modern form of AC_INIT and AM_INIT_AUTOMAKE
* Set "foreign" automake option to avoid creation of a default
COPYING and INSTALL.
* Remove AC_PATH_PROG(RM), otherwise libtool's $RM will be overwritten
and cause the infamous "cannot remove libtoolT" warning.
* Remove autogenerated config.h.in from version control
* Update .gitignore
.gitignore | 2 +
autogen.sh | 9 +--
config.h.in | 219 ------------------------------------------
configure.in => configure.ac | 24 +++---
4 files changed, 15 insertions(+), 239 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d48221a..791af6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,8 +11,10 @@ Makefile.in
aclocal.m4
autom4te.cache
broken.xsl
+compile
config.guess
config.h
+config.h.in
config.h.in~
config.log
config.status
diff --git a/autogen.sh b/autogen.sh
index 0eeadd3..ec3378d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -46,14 +46,7 @@ if test -z "$NOCONFIGURE" -a -z "$*"; then
echo "to pass any to it, please specify them on the $0 command line."
fi
-echo "Running libtoolize..."
-libtoolize --copy --force
-echo "Running aclocal..."
-aclocal $ACLOCAL_FLAGS
-echo "Running automake..."
-automake --add-missing --warnings=all
-echo "Running autoconf..."
-autoconf --warnings=all
+autoreconf -if -Wall
cd $THEDIR
diff --git a/configure.in b/configure.ac
similarity index 98%
rename from configure.in
rename to configure.ac
index d39a916..58d0b0f 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,6 +1,12 @@
dnl Process this file with autoconf to produce a configuration script.
-AC_PREREQ(2.59)
-AC_INIT(libxslt/xslt.c)
+AC_PREREQ(2.63)
+
+m4_define([MAJOR_VERSION], [1])
+m4_define([MINOR_VERSION], [1])
+m4_define([MICRO_VERSION], [30])
+
+AC_INIT([libxslt], [MAJOR_VERSION.MINOR_VERSION.MICRO_VERSION])
+AC_CONFIG_SRCDIR([libxslt/xslt.c])
AC_CONFIG_HEADERS(config.h)
AC_CANONICAL_HOST
AC_USE_SYSTEM_EXTENSIONS
@@ -9,10 +15,9 @@ dnl
dnl libxslt is the main part of the package
dnl libexslt is an extension
dnl
-LIBXSLT_MAJOR_VERSION=1
-LIBXSLT_MINOR_VERSION=1
-LIBXSLT_MICRO_VERSION=30
-PACKAGE=libxslt
+LIBXSLT_MAJOR_VERSION=MAJOR_VERSION
+LIBXSLT_MINOR_VERSION=MINOR_VERSION
+LIBXSLT_MICRO_VERSION=MICRO_VERSION
LIBEXSLT_MAJOR_VERSION=0
LIBEXSLT_MINOR_VERSION=8
LIBEXSLT_MICRO_VERSION=18
@@ -80,9 +85,7 @@ AC_SUBST(LIBEXSLT_VERSION_INFO)
AC_SUBST(LIBEXSLT_VERSION_NUMBER)
AC_SUBST(LIBEXSLT_VERSION_EXTRA)
-VERSION=${LIBXSLT_VERSION}
-
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AM_INIT_AUTOMAKE([foreign])
# AM_MAINTAINER_MODE
@@ -113,9 +116,6 @@ dnl
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_CPP
-AC_PATH_PROG(RM, rm, /bin/rm)
-AC_PATH_PROG(MV, mv, /bin/mv)
-AC_PATH_PROG(TAR, tar, /bin/tar)
AC_PATH_PROG(XMLLINT, xmllint, /usr/bin/xmllint)
AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc)
PKG_PROG_PKG_CONFIG
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]