From 31cbd6251e122fa3d6589b04995fe7360f85b75f Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Thu, 14 Sep 2017 19:04:49 +0200 Subject: [PATCH] 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(-) delete mode 100644 config.h.in rename configure.in => configure.ac (98%) diff --git a/.gitignore b/.gitignore index d48221a4..791af6f2 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 0eeadd3c..ec3378d2 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/config.h.in b/config.h.in deleted file mode 100644 index 682eadc1..00000000 --- a/config.h.in +++ /dev/null @@ -1,219 +0,0 @@ -/* config.h.in. Generated from configure.in by autoheader. */ - -/* Define to 1 if you have the header file. */ -#undef HAVE_ANSIDECL_H - -/* Define to 1 if you have the `clock_gettime' function. */ -#undef HAVE_CLOCK_GETTIME - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_ERRNO_H - -/* Define if fabs is there */ -#undef HAVE_FABS - -/* Define to 1 if you have the header file. */ -#undef HAVE_FLOAT_H - -/* Define if floor is there */ -#undef HAVE_FLOOR - -/* Define to 1 if you have the `fprintf' function. */ -#undef HAVE_FPRINTF - -/* Define to 1 if you have the header file. */ -#undef HAVE_FP_CLASS_H - -/* Define to 1 if you have the `ftime' function. */ -#undef HAVE_FTIME - -/* Define if gcrypt library is available. */ -#undef HAVE_GCRYPT - -/* Define to 1 if you have the `gettimeofday' function. */ -#undef HAVE_GETTIMEOFDAY - -/* Define to 1 if you have the `gmtime' function. */ -#undef HAVE_GMTIME - -/* Define to 1 if you have the `gmtime_r' function. */ -#undef HAVE_GMTIME_R - -/* Define to 1 if you have the header file. */ -#undef HAVE_IEEEFP_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define if pthread library is there (-lpthread) */ -#undef HAVE_LIBPTHREAD - -/* Define to 1 if you have the header file. */ -#undef HAVE_LOCALE_H - -/* Define to 1 if you have the `localtime' function. */ -#undef HAVE_LOCALTIME - -/* Define to 1 if you have the `localtime_r' function. */ -#undef HAVE_LOCALTIME_R - -/* Define to 1 if you have the header file. */ -#undef HAVE_MATH_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NAN_H - -/* Define if pow is there */ -#undef HAVE_POW - -/* Define to 1 if you have the `printf' function. */ -#undef HAVE_PRINTF - -/* Define if is there */ -#undef HAVE_PTHREAD_H - -/* Define to 1 if you have the `snprintf' function. */ -#undef HAVE_SNPRINTF - -/* Define to 1 if you have the `sprintf' function. */ -#undef HAVE_SPRINTF - -/* Define to 1 if you have the `sscanf' function. */ -#undef HAVE_SSCANF - -/* Define to 1 if you have the `stat' function. */ -#undef HAVE_STAT - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDARG_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SELECT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TIMEB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TIME_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the `time' function. */ -#undef HAVE_TIME - -/* Define to 1 if you have the header file. */ -#undef HAVE_TIME_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the `vfprintf' function. */ -#undef HAVE_VFPRINTF - -/* Define to 1 if you have the `vsnprintf' function. */ -#undef HAVE_VSNPRINTF - -/* Define to 1 if you have the `vsprintf' function. */ -#undef HAVE_VSPRINTF - -/* Define to 1 if you have the header file. */ -#undef HAVE_XLOCALE_H - -/* Define to 1 if you have the `_stat' function. */ -#undef HAVE__STAT - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#undef LT_OBJDIR - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# undef _ALL_SOURCE -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# undef _POSIX_PTHREAD_SEMANTICS -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif - - -/* Version number of package */ -#undef VERSION - -/* Define if debugging support is enabled */ -#undef WITH_DEBUGGER - -/* Define to 1 if on MINIX. */ -#undef _MINIX - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -#undef _POSIX_1_SOURCE - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -#undef _POSIX_SOURCE - -/* Using the Win32 Socket implementation */ -#undef _WINSOCKAPI_ - -/* Win32 Std C name mangling work-around */ -#undef snprintf - -/* Win32 Std C name mangling work-around */ -#undef vsnprintf diff --git a/configure.in b/configure.ac similarity index 98% rename from configure.in rename to configure.ac index d39a916b..58d0b0f2 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