* libltdl/m4/ltdl.m4 (LTDL_INIT) <CONFIG_H>: Rename to..

<LT_CONFIG_H>: this, to contain the name of the config
header.
* Makefile.am <DEFS>: Use it to define LT_CONFIG_H.
* HACKING, libltdl/argz.c, libltdl/lt__alloc.c,
libltdl/libltdl/lt__dirent.h, libltdl/libltdl/lt__glibc.h,
libltdl/libltdl/lt__private.h, libltdl/libltdl/lt__strl.h:
Adjusted.

diff --git a/ChangeLog b/ChangeLog
index 2c050bca1bf3048ea1106e6bf75d1b40701b84d7..5eab0ea40120d51ddb72f6e1cde1a9842b3fe621 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-09-17  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * libltdl/m4/ltdl.m4 (LTDL_INIT) <CONFIG_H>: Rename to..
+       <LT_CONFIG_H>: this, to contain the name of the config
+       header.
+       * Makefile.am <DEFS>: Use it to define LT_CONFIG_H.
+       * HACKING, libltdl/argz.c, libltdl/lt__alloc.c,
+       libltdl/libltdl/lt__dirent.h, libltdl/libltdl/lt__glibc.h,
+       libltdl/libltdl/lt__private.h, libltdl/libltdl/lt__strl.h:
+       Adjusted.
+
 2005-09-16  Peter Ekberg  <peda@lysator.liu.se>,
 
        * tests/testsuite.at (LT_AT_EXEC_CHECK): Make sure

diff --git a/HACKING b/HACKING
index 28d0c67328b0b7ed7d491e805e0043006d481971..7c86421b20d740a131dbe0f7e5c4d65f254261de 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -267,7 +267,11 @@ yyyy-mm-dd  Name of Author  <email@address>  (tiny change)
   by libtool.  Typically, the files that implement this layer begin:
 
   #if defined(HAVE_CONFIG_H)
-  #  include HAVE_CONFIG_H
+  #  if defined(LT_CONFIG_H)
+  #    include LT_CONFIG_H
+  #  else
+  #    include <config.h>
+  #  endif
   #endif
   #include "lt_system.h"
 

diff --git a/Makefile.am b/Makefile.am
index 86f6a61fddbe5a686ce04f8152be69b63e9e2c96..5534fd033b72c8e74d69aa21ed17e27ca3020f30 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -223,7 +223,7 @@ $(srcdir)/libltdl/Makefile.in: libltdl/Makefile.am
 
 # %%% BEGIN libltdl/Makefile.am
 
-DEFS                   = -DHAVE_CONFIG_H="<$(CONFIG_H)>" -DLTDL
+DEFS                   = -DLTDL -DHAVE_CONFIG_H -DLT_CONFIG_H='<$(LT_CONFIG_H)>'
 
 # -I$(srcdir) is needed for user that built libltdl with a sub-Automake
 # (not as a sub-package!) using 'nostdinc':

diff --git a/libltdl/argz.c b/libltdl/argz.c
index 4fce2f5a022d5eb4f76a96378febca4978cd6925..dae140aa3126a0951da7a73f1d82efb642e5bf19 100644 (file)
--- a/libltdl/argz.c
+++ b/libltdl/argz.c
@@ -27,14 +27,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 */
 
-/* Provide our wierdo HAVE_CONFIG_H rvalue for other clients.  */
-#if !defined(LTDL) && defined(HAVE_CONFIG_H)
-#  undef HAVE_CONFIG_H
-#  define HAVE_CONFIG_H <config.h>
-#endif
-
 #if defined(HAVE_CONFIG_H)
-#  include HAVE_CONFIG_H
+#  if defined(LTDL) && defined LT_CONFIG_H
+#    include LT_CONFIG_H
+#  else
+#    include <config.h>
+#  endif
 #endif
 
 #include <argz.h>

diff --git a/libltdl/libltdl/lt__dirent.h b/libltdl/libltdl/lt__dirent.h
index 642bd30b896b02d1d07476c41db06f871d100ded..fd1d0ff50bce4fd7fbdbca8a6cde77b1f2e15063 100644 (file)
--- a/libltdl/libltdl/lt__dirent.h
+++ b/libltdl/libltdl/lt__dirent.h
@@ -31,7 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #define LT__DIRENT_H 1
 
 #if defined(HAVE_CONFIG_H)
-#  include HAVE_CONFIG_H
+#  if defined(LT_CONFIG_H)
+#    include LT_CONFIG_H
+#  else
+#    include <config.h>
+#  endif
 #endif
 
 #include "lt_system.h"

diff --git a/libltdl/libltdl/lt__glibc.h b/libltdl/libltdl/lt__glibc.h
index cc4950761c02e0a8b7d7a08599ee51c5c0e6f5a0..310f73d40e1da6ecf1e2be2e3bf780f1eaacb9ff 100644 (file)
--- a/libltdl/libltdl/lt__glibc.h
+++ b/libltdl/libltdl/lt__glibc.h
@@ -31,7 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #define LT__GLIBC_H 1
 
 #if defined(HAVE_CONFIG_H)
-#  include HAVE_CONFIG_H
+#  if defined(LT_CONFIG_H)
+#    include LT_CONFIG_H
+#  else
+#    include <config.h>
+#  endif
 #endif
 
 #if !defined(HAVE_ARGZ_H)

diff --git a/libltdl/libltdl/lt__private.h b/libltdl/libltdl/lt__private.h
index eea20bdb6b7f279c4269f5830f6a1c5b1e6a07a9..9098f42412228392e69441b3a6f104a447af16dd 100644 (file)
--- a/libltdl/libltdl/lt__private.h
+++ b/libltdl/libltdl/lt__private.h
@@ -31,7 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #define LT__PRIVATE_H 1
 
 #if defined(HAVE_CONFIG_H)
-#  include HAVE_CONFIG_H
+#  if defined(LT_CONFIG_H)
+#    include LT_CONFIG_H
+#  else
+#    include <config.h>
+#  endif
 #endif
 
 #include <stdio.h>

diff --git a/libltdl/libltdl/lt__strl.h b/libltdl/libltdl/lt__strl.h
index f334ed698feb444dc5c51969bcdc44ee825d05af..895ecdbf9f1053552963c696c18e28e5b4fd4519 100644 (file)
--- a/libltdl/libltdl/lt__strl.h
+++ b/libltdl/libltdl/lt__strl.h
@@ -31,7 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #define LT__STRL_H 1
 
 #if defined(HAVE_CONFIG_H)
-#  include HAVE_CONFIG_H
+#  if defined(LT_CONFIG_H)
+#    include LT_CONFIG_H
+#  else
+#    include <config.h>
+#  endif
 #endif
 
 #include <string.h>

diff --git a/libltdl/lt__alloc.c b/libltdl/lt__alloc.c
index 64f6e2e4ddd495680259aaee3dff8ccc04234163..d65b3d2c9f1fc67716c63f83a1241bef44e4f514 100644 (file)
--- a/libltdl/lt__alloc.c
+++ b/libltdl/lt__alloc.c
@@ -28,7 +28,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 */
 
 #if defined(HAVE_CONFIG_H)
-#  include HAVE_CONFIG_H
+#  if defined(LT_CONFIG_H)
+#    include LT_CONFIG_H
+#  else
+#    include <config.h>
+#  endif
 #endif
 
 #include <stdio.h>

diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
index ff14d60a77a3e6c29979b8b6b61a7ff47725c5cb..05f4abe11567a4b1eb355e6d86579d6c0ba0d326 100644 (file)
--- a/libltdl/m4/ltdl.m4
+++ b/libltdl/m4/ltdl.m4
@@ -170,12 +170,13 @@ m4_require([_LT_CHECK_DLPREOPEN])dnl
 # must contain the definitions required by ltdl.c.
 # FIXME: Remove use of undocumented AC_LIST_HEADERS (2.59 compatibility).
 AC_CONFIG_COMMANDS_PRE([dnl
+m4_pattern_allow([^LT_CONFIG_H$])dnl
 m4_ifset([AH_HEADER],
-        [CONFIG_H=AH_HEADER],
+        [LT_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])
+                  [LT_CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's,^[[      ]]*,,;s,[[ :]].*$,,'`],
+                  [LT_CONFIG_H=config.h;AC_CONFIG_HEADERS([config.h])])])])
+AC_SUBST([LT_CONFIG_H])
 
 AC_CHECK_HEADERS([memory.h unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h],
        [], [], [AC_INCLUDES_DEFAULT])