From: Ralf Wildenhues Date: Wed, 9 Nov 2005 21:38:09 +0000 (+0000) Subject: * libltdl/Makefile.inc (AM_CPPFLAGS): Do not define X-Git-Tag: release-2-1b~418 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e338c14da6f2073d51b0173d4eaa09eed0a78a2d;p=thirdparty%2Flibtool.git * 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 8120b3fab..7e243af27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-11-09 Ralf Wildenhues + + * 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 * libltdl/config/ltmain.m4sh (func_mode_link) [ sysv4*uw2*, diff --git a/libltdl/Makefile.inc b/libltdl/Makefile.inc index e19de418a..1965f1a0f 100644 --- 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 ebf42e738..4fd38a965 100644 --- 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],