From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 24 Oct 2006 20:33:38 +0000 (+0000)
Subject: * doc/libtool.texi (Distributing libltdl): In recursive and
X-Git-Tag: release-2-1b~232
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a68608ef1fafdd8b10e70c835c8b8c0b2c57f3b6;p=thirdparty%2Flibtool.git

* doc/libtool.texi (Distributing libltdl): In recursive and
nonrecursive mode, a config header is now required.
* libltdl/argz.c: Remove check for HAVE_CONFIG_H, to conform
to gnulib's policy of including config.h unconditionally.
---

diff --git a/ChangeLog b/ChangeLog
index 219af1910..6f05f7c10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-24  Paul Eggert  <eggert@cs.ucla.edu>,
+	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* doc/libtool.texi (Distributing libltdl): In recursive and
+	nonrecursive mode, a config header is now required.
+	* libltdl/argz.c: Remove check for HAVE_CONFIG_H, to conform
+	to gnulib's policy of including config.h unconditionally.
+
 2006-10-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* tests/link-order2.at: New test to show one case where ordering
diff --git a/doc/libtool.texi b/doc/libtool.texi
index 146a65f5d..02a310c69 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -4246,6 +4246,7 @@ need releases of Autoconf and Automake that support
 
 @example
 AM_INIT_AUTOMAKE([subdir-objects])
+AC_CONFIG_HEADERS([config.h])
 AC_PROG_CC
 AM_PROG_CC_C_O
 LT_CONFIG_LTDL_DIR([libltdl], [nonrecursive])
@@ -4253,7 +4254,10 @@ LT_WITH_LTDL
 @end example
 
 @noindent
-And add the following near the top of your @file{Makefile.am}:
+You have to use a config header, but it may have a name different than
+@file{config.h}.
+
+Also, add the following near the top of your @file{Makefile.am}:
 
 @example
 AM_CPPFLAGS =
@@ -4286,13 +4290,17 @@ mode, you should add to your @file{configure.ac}:
 
 @example
 AM_INIT_AUTOMAKE
+AC_CONFIG_HEADERS([config.h])
 LT_CONFIG_LTDL_DIR([libltdl], [recursive])
 LT_WITH_LTDL
 AC_CONFIG_FILES([libltdl/Makefile])
 @end example
 
 @noindent
-and to your @file{Makefile.am}:
+You have to use a config header, but it may have a name different than
+@file{config.h}.
+
+Also, add this to your @file{Makefile.am}:
 
 @example
 SUBDIRS = libltdl
diff --git a/libltdl/argz.c b/libltdl/argz.c
index 47ac53101..e49d73e09 100644
--- a/libltdl/argz.c
+++ b/libltdl/argz.c
@@ -27,12 +27,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 */
 
-#ifdef HAVE_CONFIG_H
-#  if defined(LTDL) && defined LT_CONFIG_H
-#    include LT_CONFIG_H
-#  else
-#    include <config.h>
-#  endif
+#if defined(LTDL) && defined LT_CONFIG_H
+#  include LT_CONFIG_H
+#else
+#  include <config.h>
 #endif
 
 #include <argz.h>