From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 26 Oct 2006 20:39:04 +0000 (+0000)
Subject: Assume presence of a config header in all files, to provoke
X-Git-Tag: release-2-1b~231
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b77562fee3a461adb39d4ddef5d3a0e13fb1952;p=thirdparty%2Flibtool.git

Assume presence of a config header in all files, to provoke
test failures on all systems.
* libltdl/lt__alloc.c: Likewise.
* libltdl/libltdl/lt__dirent.h: Likewise.
* libltdl/libltdl/lt__glibc.h: Likewise.
* libltdl/libltdl/lt__private.h: Likewise.
* libltdl/libltdl/lt__strl.h: Likewise.
* tests/recursive.at: Use AC_CONFIG_HEADERS.
* tests/nonrecursive.at: Likewise.  Invoke autoheader.
* HACKING: Adjust.
Report by Patrick Welche.
---

diff --git a/ChangeLog b/ChangeLog
index 6f05f7c10..26ffc4b22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-10-26  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Assume presence of a config header in all files, to provoke
+	test failures on all systems.
+	* libltdl/lt__alloc.c: Likewise.
+	* libltdl/libltdl/lt__dirent.h: Likewise.
+	* libltdl/libltdl/lt__glibc.h: Likewise.
+	* libltdl/libltdl/lt__private.h: Likewise.
+	* libltdl/libltdl/lt__strl.h: Likewise.
+	* tests/recursive.at: Use AC_CONFIG_HEADERS.
+	* tests/nonrecursive.at: Likewise.  Invoke autoheader.
+	* HACKING: Adjust.
+	Report by Patrick Welche.
+
 2006-10-24  Paul Eggert  <eggert@cs.ucla.edu>,
 	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
diff --git a/HACKING b/HACKING
index dd3a7e2b8..9fc90707a 100644
--- a/HACKING
+++ b/HACKING
@@ -291,17 +291,13 @@ yyyy-mm-dd  Name of Author  <email@address>  (tiny change)
   to various system libc interfaces that differ between hosts supported
   by libtool.  Typically, the files that implement this layer begin:
 
-  #ifdef HAVE_CONFIG_H
-  #  if defined(LT_CONFIG_H)
-  #    include LT_CONFIG_H
-  #  else
-  #    include <config.h>
-  #  endif
+  #if defined(LT_CONFIG_H)
+  #  include LT_CONFIG_H
+  #else
+  #  include <config.h>
   #endif
   #include "lt_system.h"
 
-  The `ifdef HAVE_CONFIG_H' helps facilitate code sharing with gnulib.
-
   Or if they are installed headers that must work outside the libtool
   source tree, simply:
 
diff --git a/libltdl/libltdl/lt__dirent.h b/libltdl/libltdl/lt__dirent.h
index af3ddf27b..be70f5a4a 100644
--- a/libltdl/libltdl/lt__dirent.h
+++ b/libltdl/libltdl/lt__dirent.h
@@ -30,12 +30,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #if !defined(LT__DIRENT_H)
 #define LT__DIRENT_H 1
 
-#ifdef HAVE_CONFIG_H
-#  if defined(LT_CONFIG_H)
-#    include LT_CONFIG_H
-#  else
-#    include <config.h>
-#  endif
+#if defined(LT_CONFIG_H)
+#  include LT_CONFIG_H
+#else
+#  include <config.h>
 #endif
 
 #include "lt_system.h"
diff --git a/libltdl/libltdl/lt__glibc.h b/libltdl/libltdl/lt__glibc.h
index ee54c3595..7019b77cb 100644
--- a/libltdl/libltdl/lt__glibc.h
+++ b/libltdl/libltdl/lt__glibc.h
@@ -30,12 +30,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #if !defined(LT__GLIBC_H)
 #define LT__GLIBC_H 1
 
-#ifdef HAVE_CONFIG_H
-#  if defined(LT_CONFIG_H)
-#    include LT_CONFIG_H
-#  else
-#    include <config.h>
-#  endif
+#if defined(LT_CONFIG_H)
+#  include LT_CONFIG_H
+#else
+#  include <config.h>
 #endif
 
 #if !defined(HAVE_ARGZ_H)
diff --git a/libltdl/libltdl/lt__private.h b/libltdl/libltdl/lt__private.h
index e712b6b8e..321050023 100644
--- a/libltdl/libltdl/lt__private.h
+++ b/libltdl/libltdl/lt__private.h
@@ -30,12 +30,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #if !defined(LT__PRIVATE_H)
 #define LT__PRIVATE_H 1
 
-#ifdef HAVE_CONFIG_H
-#  if defined(LT_CONFIG_H)
-#    include LT_CONFIG_H
-#  else
-#    include <config.h>
-#  endif
+#if defined(LT_CONFIG_H)
+#  include LT_CONFIG_H
+#else
+#  include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/libltdl/libltdl/lt__strl.h b/libltdl/libltdl/lt__strl.h
index 2b2de16db..36e553b30 100644
--- a/libltdl/libltdl/lt__strl.h
+++ b/libltdl/libltdl/lt__strl.h
@@ -30,12 +30,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #if !defined(LT__STRL_H)
 #define LT__STRL_H 1
 
-#ifdef HAVE_CONFIG_H
-#  if defined(LT_CONFIG_H)
-#    include LT_CONFIG_H
-#  else
-#    include <config.h>
-#  endif
+#if defined(LT_CONFIG_H)
+#  include LT_CONFIG_H
+#else
+#  include <config.h>
 #endif
 
 #include <string.h>
diff --git a/libltdl/lt__alloc.c b/libltdl/lt__alloc.c
index 7cb8553b0..647a0de82 100644
--- a/libltdl/lt__alloc.c
+++ b/libltdl/lt__alloc.c
@@ -27,12 +27,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 */
 
-#ifdef HAVE_CONFIG_H
-#  if defined(LT_CONFIG_H)
-#    include LT_CONFIG_H
-#  else
-#    include <config.h>
-#  endif
+#if defined(LT_CONFIG_H)
+#  include LT_CONFIG_H
+#else
+#  include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/tests/nonrecursive.at b/tests/nonrecursive.at
index 44838ce07..295319713 100644
--- a/tests/nonrecursive.at
+++ b/tests/nonrecursive.at
@@ -27,6 +27,7 @@ LT_CONFIG_LTDL_DIR([ltdl], [nonrecursive])
 AC_CONFIG_AUX_DIR([ltdl/config])
 AC_CONFIG_MACRO_DIR([ltdl/m4])
 AC_CONFIG_LIBOBJ_DIR([ltdl])
+AC_CONFIG_HEADERS([config.h:config.hin])
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 AC_PROG_CC
 AM_PROG_CC_C_O
@@ -79,7 +80,7 @@ for file in argz.c lt__dirent.c lt__strl.c; do
   cp ltdl/$file $file
 done
 
-LT_AT_BOOTSTRAP([ignore], [-I ltdl/m4], [ignore], [--add-missing --copy],
+LT_AT_BOOTSTRAP([ignore], [-I ltdl/m4], [], [--add-missing --copy],
 	[], [], [all $tst_dist])
 
 AT_CHECK([test -f ltdl/libltdlc.la])
@@ -103,7 +104,7 @@ for file in argz.c lt__dirent.c lt__strl.c; do
   cp ltdl/$file $file
 done
 
-LT_AT_BOOTSTRAP([ignore], [-I ltdl/m4], [ignore], [--add-missing --copy],
+LT_AT_BOOTSTRAP([ignore], [-I ltdl/m4], [], [--add-missing --copy],
 	[], [], [all $tst_dist])
 
 AT_CHECK([test -f ltdl/libltdlc.la])
@@ -129,7 +130,7 @@ for file in argz.c lt__dirent.c lt__strl.c; do
   cp ltdl/$file $file
 done
 
-LT_AT_BOOTSTRAP([ignore], [-I ltdl/m4], [ignore], [--add-missing --copy],
+LT_AT_BOOTSTRAP([ignore], [-I ltdl/m4], [], [--add-missing --copy],
 	[], [--enable-ltdl-install --prefix=$prefix], [all install $tst_dist])
 
 AT_CHECK([test -f $prefix/lib/libltdl.la])
diff --git a/tests/recursive.at b/tests/recursive.at
index 2a5b10764..ca8108d3f 100644
--- a/tests/recursive.at
+++ b/tests/recursive.at
@@ -27,6 +27,7 @@ LT_CONFIG_LTDL_DIR([ltdl], [recursive])
 AC_CONFIG_AUX_DIR([ltdl/config])
 AC_CONFIG_MACRO_DIR([ltdl/m4])
 AC_CONFIG_LIBOBJ_DIR([ltdl])
+AC_CONFIG_HEADERS([config.h:config.hin])
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT
 LT_WITH_LTDL