mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2024-11-21 01:40:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
<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.
This commit is contained in:
Ralf Wildenhues 2005-09-17 07:29:03 +00:00
parent 38599480fc
commit 609c71cc50
10 changed files with 52 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -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>, 2005-09-16 Peter Ekberg <peda@lysator.liu.se>,
* tests/testsuite.at (LT_AT_EXEC_CHECK): Make sure * tests/testsuite.at (LT_AT_EXEC_CHECK): Make sure

6
HACKING
View File

@ -267,7 +267,11 @@ yyyy-mm-dd Name of Author <email@address> (tiny change)
by libtool. Typically, the files that implement this layer begin: by libtool. Typically, the files that implement this layer begin:
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
# include HAVE_CONFIG_H # if defined(LT_CONFIG_H)
# include LT_CONFIG_H
# else
# include <config.h>
# endif
#endif #endif
#include "lt_system.h" #include "lt_system.h"

2
Makefile.am
View File

@ -223,7 +223,7 @@ $(srcdir)/libltdl/Makefile.in: libltdl/Makefile.am
# %%% BEGIN 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 # -I$(srcdir) is needed for user that built libltdl with a sub-Automake
# (not as a sub-package!) using 'nostdinc': # (not as a sub-package!) using 'nostdinc':

12
libltdl/argz.c
View File

@ -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) #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 #endif
#include <argz.h> #include <argz.h>

6
libltdl/libltdl/lt__dirent.h
View File

@ -31,7 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
#define LT__DIRENT_H 1 #define LT__DIRENT_H 1
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
# include HAVE_CONFIG_H # if defined(LT_CONFIG_H)
# include LT_CONFIG_H
# else
# include <config.h>
# endif
#endif #endif
#include "lt_system.h" #include "lt_system.h"

6
libltdl/libltdl/lt__glibc.h
View File

@ -31,7 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
#define LT__GLIBC_H 1 #define LT__GLIBC_H 1
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
# include HAVE_CONFIG_H # if defined(LT_CONFIG_H)
# include LT_CONFIG_H
# else
# include <config.h>
# endif
#endif #endif
#if !defined(HAVE_ARGZ_H) #if !defined(HAVE_ARGZ_H)

6
libltdl/libltdl/lt__private.h
View File

@ -31,7 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
#define LT__PRIVATE_H 1 #define LT__PRIVATE_H 1
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
# include HAVE_CONFIG_H # if defined(LT_CONFIG_H)
# include LT_CONFIG_H
# else
# include <config.h>
# endif
#endif #endif
#include <stdio.h> #include <stdio.h>

6
libltdl/libltdl/lt__strl.h
View File

@ -31,7 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
#define LT__STRL_H 1 #define LT__STRL_H 1
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
# include HAVE_CONFIG_H # if defined(LT_CONFIG_H)
# include LT_CONFIG_H
# else
# include <config.h>
# endif
#endif #endif
#include <string.h> #include <string.h>

6
libltdl/lt__alloc.c
View File

@ -28,7 +28,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
*/ */
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
# include HAVE_CONFIG_H # if defined(LT_CONFIG_H)
# include LT_CONFIG_H
# else
# include <config.h>
# endif
#endif #endif
#include <stdio.h> #include <stdio.h>

9
libltdl/m4/ltdl.m4
View File

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