configure maintenance

From 07d8d35c0d8d321693835f97af511dd546196d2f Mon Sep 17 00:00:00 2001
From: Stefan Kost <[email protected]>
Date: Tue, 10 May 2011 10:35:43 +0300
Subject: [PATCH 1/2] configure: support silent automake rules if possible

This gives us a much less noisy build and makes error stand out a lot more.
---
 configure.in |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/configure.in b/configure.in
index 243173b..7ee1a19 100644
--- a/configure.in
+++ b/configure.in
@@ -86,6 +86,11 @@ AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
 # AM_MAINTAINER_MODE
 
+# Support silent build rules, requires at least automake-1.11. Disable
+# by either passing --disable-silent-rules to configure or passing V=1
+# to make
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
 dnl
 dnl Specific dir for HTML output ?
 dnl
-- 
1.7.1

From 1e1a5ca7563fc65936a02c1b2879e9b7642ed90e Mon Sep 17 00:00:00 2001
From: Stefan Kost <[email protected]>
Date: Tue, 10 May 2011 12:16:55 +0300
Subject: [PATCH 2/2] configure: acconfig.h is deprecated since autoconf-2.50

Remove deprecated file (leftover from autoconf-2.13). Change AC_DEFINE into
3-arg versions to provide the comments for config.h. Bump autoconf version to
2.59 (same as libxml).
---
 acconfig.h   |    6 ------
 configure.in |   29 +++++++++++++++--------------
 2 files changed, 15 insertions(+), 20 deletions(-)
 delete mode 100644 acconfig.h

diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 3900a67..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#undef HAVE_ISINF
-#undef HAVE_ISNAN
-#undef HAVE_POW
-#undef HAVE_FLOOR
-#undef HAVE_FABS
-#undef WITH_DEBUGGER
diff --git a/configure.in b/configure.in
index 7ee1a19..ccd2fee 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configuration script.
-AC_PREREQ(2.2)
+AC_PREREQ(2.59)
 AC_INIT(libxslt/xslt.c)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
@@ -231,19 +231,19 @@ AC_CHECK_HEADERS(ieeefp.h nan.h math.h fp_class.h float.h ansidecl.h)
 AC_CHECK_HEADERS(sys/timeb.h time.h sys/stat.h sys/select.h stdarg.h)
 AC_CHECK_FUNCS(stat _stat)
 AC_CHECK_FUNC(isnan, , AC_CHECK_LIB(m, isnan,
-  [M_LIBS="-lm"; AC_DEFINE(HAVE_ISNAN)]))
+  [M_LIBS="-lm"; AC_DEFINE([HAVE_ISNAN],[], [Define if isnan is there])]))
 
 AC_CHECK_FUNC(isinf, , AC_CHECK_LIB(m, isinf,
-  [M_LIBS="-lm"; AC_DEFINE(HAVE_ISINF)]))
+  [M_LIBS="-lm"; AC_DEFINE([HAVE_ISINF],[], [Define if isinf is there])]))
 
 AC_CHECK_FUNC(pow, , AC_CHECK_LIB(m, pow,
-  [M_LIBS="-lm"; AC_DEFINE(HAVE_POW)]))
+  [M_LIBS="-lm"; AC_DEFINE([HAVE_POW],[], [Define if pow is there])]))
 
 AC_CHECK_FUNC(floor, , AC_CHECK_LIB(m, floor,
-  [M_LIBS="-lm"; AC_DEFINE(HAVE_FLOOR)]))
+  [M_LIBS="-lm"; AC_DEFINE([HAVE_FLOOR],[], [Define if floor is there])]))
 
 AC_CHECK_FUNC(fabs, , AC_CHECK_LIB(m, fabs,
-  [M_LIBS="-lm"; AC_DEFINE(HAVE_FABS)]))
+  [M_LIBS="-lm"; AC_DEFINE([HAVE_FABS],[], [Define if fabs is there])]))
 
 
 AC_CHECK_FUNCS(gettimeofday)
@@ -268,7 +268,7 @@ dnl
 if test "${NEED_TRIO}" = "1" ; then
     echo Reusing trio library for string functions
     WITH_TRIO=1
-else    
+else
     WITH_TRIO=0
 fi
 AC_SUBST(WITH_TRIO)
@@ -425,7 +425,7 @@ AC_ARG_WITH(debug, [  --with-debug            Add the debugging code (on)])
 if test "$with_debug" = "no" ; then
     echo Disabling debug support
     WITH_XSLT_DEBUG=0
-else    
+else
     WITH_XSLT_DEBUG=1
 fi
 AC_SUBST(WITH_XSLT_DEBUG)
@@ -434,12 +434,12 @@ AC_ARG_WITH(mem_debug, [  --with-mem-debug        Add the memory debugging modul
 if test "$with_mem_debug" = "yes" ; then
     echo Enabling memory debug support
     WITH_MEM_DEBUG=1
-else    
+else
     WITH_MEM_DEBUG=0
 fi
 AC_SUBST(WITH_MEM_DEBUG)
 
-dnl 
+dnl
 dnl Is debugger support requested
 dnl
 AC_ARG_WITH(debugger, [  --with-debugger        Add the debugging support (on)])
@@ -449,7 +449,7 @@ if test "$with_debugger" = "no" ; then
 else
     echo Enabling debugger
     WITH_DEBUGGER=1
-    AC_DEFINE(WITH_DEBUGGER)
+    AC_DEFINE([WITH_DEBUGGER],[], [Define if debugging support is enabled])
 fi
 AC_SUBST(WITH_DEBUGGER)
 
@@ -469,7 +469,7 @@ AC_ARG_WITH(libxml-prefix,
         [  --with-libxml-prefix=[PFX]		Specify location of libxml config],
 	LIBXML_CONFIG_PREFIX=$withval
 )
-        
+
 AC_ARG_WITH(libxml-include-prefix,
         [  --with-libxml-include-prefix=[PFX]	Specify location of libxml headers],
         LIBXML_CFLAGS="-I$withval"
@@ -491,7 +491,7 @@ dnl where is xml2-config
 dnl
 
 AC_SUBST(LIBXML_REQUIRED_VERSION)
-AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) 
+AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION)
 if test "x$LIBXML_CONFIG_PREFIX" != "x"
 then
 	XML_CONFIG=${LIBXML_CONFIG_PREFIX}/bin/xml2-config
@@ -500,7 +500,7 @@ else
 fi
 
 dnl
-dnl imported from libxml2, c.f. #77827 
+dnl imported from libxml2, c.f. #77827
 dnl
 if test "${GCC}" != "yes" ; then
     case "${host}" in
@@ -675,6 +675,7 @@ libxslt/xsltwin32config.h
 libexslt/Makefile
 libexslt/exsltconfig.h
 xsltproc/Makefile
+xsltpp/Makefile
 python/Makefile
 python/tests/Makefile
 tests/Makefile
-- 
1.7.1