* m4/ltdl.m4 (LTDL_INIT): Use AH_HEADER if defined.

Compute CONFIG_H only before creating config.status.
Reported by Peter Ekberg <peda@axentia.se>.

diff --git a/ChangeLog b/ChangeLog
index 756831a2b3e8732fe9cbae0760174091b9e5f0cb..e4cf1307dfa7d5567fae1b779193ac4eb2bcd2c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-23  Stepan Kasal  <kasal@ucw.cz>,
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * m4/ltdl.m4 (LTDL_INIT): Use AH_HEADER if defined.
+       Compute CONFIG_H only before creating config.status.
+       Reported by Peter Ekberg <peda@axentia.se>.
+
 2005-08-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * Makefile.maint (web-manual): Fix $(LN_S) to use absolute path.

diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index a7037e9a314d08019fee39de303cc84a86fb37b0..3e07e2f4977bd32afec6063a212e287621be577b 100644 (file)
--- a/m4/ltdl.m4
+++ b/m4/ltdl.m4
@@ -163,11 +163,13 @@ m4_require([_LT_CHECK_DLPREOPEN])dnl
 # if they did not call it themself.  This is so that ltdl.h can pick up
 # the parent projects config.h file, The first file in AC_CONFIG_HEADERS
 # must contain the definitions required by ltdl.c.
-m4_ifset([_AC_LIST_TAGS],
-    [CONFIG_H=`echo "_AC_LIST_TAGS" | $GREP HEADERS | $SED 's,^[[      ]]*,,;s,[[ :)]].*$,,'`],
-  [m4_ifset([AC_LIST_HEADERS],
-    [CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's,^[[    ]]*,,;s,[[ :]].*$,,'`],
-  [CONFIG_H=config.h;AC_CONFIG_HEADERS([config.h])])])
+# FIXME: Remove use of undocumented AC_LIST_HEADERS (2.59 compatibility).
+AC_CONFIG_COMMANDS_PRE([dnl
+m4_ifset([AH_HEADER],
+        [CONFIG_H=AH_HEADER],
+        [m4_ifset([AC_LIST_HEADERS],
+                  [CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's,^[[      ]]*,,;s,[[ :]].*$,,'`],
+                  [CONFIG_H=config.h;AC_CONFIG_HEADERS([config.h])])])])
 AC_SUBST([CONFIG_H])
 
 AC_CHECK_HEADERS([memory.h unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h],