Skip to content

Commit

Permalink
Misc autoconf updates
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nwellnhof committed Sep 14, 2017
1 parent 76df4c9 commit 31cbd62
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 239 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -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
Expand Down
9 changes: 1 addition & 8 deletions autogen.sh
Expand Up @@ -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

Expand Down
219 changes: 0 additions & 219 deletions config.h.in

This file was deleted.

24 changes: 12 additions & 12 deletions configure.in → 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
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 31cbd62

Please sign in to comment.