2005-08-12  Stepan Kasal  <address@hidden>,
	    Ralf Wildenhues  <address@hidden>

	* m4/ltdl.m4 (LTDL_INIT): Use AH_HEADER if defined.
	Compute CONFIG_H only before creating config.status.
	Reported by Peter Ekberg <address@hidden>.

Index: m4/ltdl.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/ltdl.m4,v
retrieving revision 1.31
diff -u -r1.31 ltdl.m4
--- m4/ltdl.m4	29 Jul 2005 13:24:13 -0000	1.31
+++ m4/ltdl.m4	12 Aug 2005 21:51:49 -0000
@@ -163,11 +163,13 @@
 # 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],