* libltdl/Makefile.inc (AM_CPPFLAGS): Do not define

HAVE_CONFIG_H.
* libltdl/m4/ltdl.m4 (LTDL_INIT): Do not invoke
AC_CONFIG_HEADERS ourselves, we can build with or without now.

diff --git a/ChangeLog b/ChangeLog
index 8120b3fab2c2a7cd9eff74585e3ba4a6bb9f7176..7e243af27fdbfebedc531428f4acc2ff4ae2d4ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-09  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * libltdl/Makefile.inc (AM_CPPFLAGS): Do not define
+       HAVE_CONFIG_H.
+       * libltdl/m4/ltdl.m4 (LTDL_INIT): Do not invoke
+       AC_CONFIG_HEADERS ourselves, we can build with or without now.
+
 2005-11-07  Kean Johnston  <jkj@sco.com>
 
        * libltdl/config/ltmain.m4sh (func_mode_link) [ sysv4*uw2*,

diff --git a/libltdl/Makefile.inc b/libltdl/Makefile.inc
index e19de418acb0a7ed9450ff3a8a0a4804a5ff67ea..1965f1a0fdbdda327133a1bc951dbe2db2631f47 100644 (file)
--- a/libltdl/Makefile.inc
+++ b/libltdl/Makefile.inc
@@ -26,7 +26,7 @@
 
 # -I$(srcdir) is needed for user that built libltdl with a sub-Automake
 # (not as a sub-package!) using 'nostdinc':
-AM_CPPFLAGS           += -DHAVE_CONFIG_H -DLT_CONFIG_H='<$(LT_CONFIG_H)>' \
+AM_CPPFLAGS           += -DLT_CONFIG_H='<$(LT_CONFIG_H)>' \
                          -DLTDL -I. -I$(srcdir) -Ilibltdl \
                          -I$(srcdir)/libltdl -I$(srcdir)/libltdl/libltdl
 AM_LDFLAGS            += -no-undefined

diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
index ebf42e73828f1d16223fcec7d0f6632e7037bf70..4fd38a96597ac56d9d0fbb993995d2c33dc7e682 100644 (file)
--- a/libltdl/m4/ltdl.m4
+++ b/libltdl/m4/ltdl.m4
@@ -273,10 +273,10 @@ m4_provide_if([_LT_CONFIG_LTDL_DIR],
 dnl _LTDL_MODE specific code must be evaluated at least once:
 _LTDL_MODE_DISPATCH
 
-# In order that ltdl.c can compile, run AC_CONFIG_HEADERS for the user
-# 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.
+# In order that ltdl.c can compile, find out the first AC_CONFIG_HEADERS
+# the user used.  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.
 # FIXME: Remove use of undocumented AC_LIST_HEADERS (2.59 compatibility).
 AC_CONFIG_COMMANDS_PRE([dnl
 m4_pattern_allow([^LT_CONFIG_H$])dnl
@@ -284,11 +284,7 @@ m4_ifset([AH_HEADER],
     [LT_CONFIG_H=AH_HEADER],
     [m4_ifset([AC_LIST_HEADERS],
            [LT_CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's,^[[      ]]*,,;s,[[ :]].*$,,'`],
-       [LT_CONFIG_H=config.h
-       dnl subproject mode libltdl has its own config.h...
-       m4_if(_LTDL_MODE, [subproject],
-               [],
-           [AC_CONFIG_HEADERS([config.h:config-h.in])])])])])
+       [])])])
 AC_SUBST([LT_CONFIG_H])
 
 AC_CHECK_HEADERS([memory.h unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h],