Re: [xslt] configure maintenance (resend with whitespace fixes)

[Stefan Kost <ensonic hora-obscura de>]

On 11.05.2011 18:00, Stefan Kost wrote:
> hi,
>
> two libxslt configure patches like the ones I have send for libxml2.
>
> Stefan
>
this time without gratuitous white-space cleanups.

Stefan

>From 07d8d35c0d8d321693835f97af511dd546196d2f Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic users sf net>
Date: Tue, 10 May 2011 10:35:43 +0300
Subject: [PATCH 1/4] 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 9750af37ef2877a4d9c35894394a56950e8b9a45 Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic users sf net>
Date: Wed, 18 May 2011 09:50:50 +0300
Subject: [PATCH 2/4] 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 |   14 +++++++-------
 2 files changed, 7 insertions(+), 13 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..ba0d37b 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)
@@ -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)
 
-- 
1.7.1