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

* doc/libtool.texi (Distributing libltdl): In recursive and

Browse Source 
nonrecursive mode, a config header is now required.
* libltdl/argz.c: Remove check for HAVE_CONFIG_H, to conform
to gnulib's policy of including config.h unconditionally.
This commit is contained in:
Paul Eggert 2006-10-24 20:33:38 +00:00 committed by Ralf Wildenhues
parent aa546b46c0
commit a68608ef1f
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-10-24 Paul Eggert <eggert@cs.ucla.edu>,
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* doc/libtool.texi (Distributing libltdl): In recursive and
nonrecursive mode, a config header is now required.
* libltdl/argz.c: Remove check for HAVE_CONFIG_H, to conform
to gnulib's policy of including config.h unconditionally.
2006-10-24 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* tests/link-order2.at: New test to show one case where ordering

12
doc/libtool.texi
View File

@ -4246,6 +4246,7 @@ need releases of Autoconf and Automake that support
@example
AM_INIT_AUTOMAKE([subdir-objects])
AC_CONFIG_HEADERS([config.h])
AC_PROG_CC
AM_PROG_CC_C_O
LT_CONFIG_LTDL_DIR([libltdl], [nonrecursive])
@ -4253,7 +4254,10 @@ LT_WITH_LTDL
@end example
@noindent
And add the following near the top of your @file{Makefile.am}:
You have to use a config header, but it may have a name different than
@file{config.h}.
Also, add the following near the top of your @file{Makefile.am}:
@example
AM_CPPFLAGS =
@ -4286,13 +4290,17 @@ mode, you should add to your @file{configure.ac}:
@example
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
LT_CONFIG_LTDL_DIR([libltdl], [recursive])
LT_WITH_LTDL
AC_CONFIG_FILES([libltdl/Makefile])
@end example
@noindent
and to your @file{Makefile.am}:
You have to use a config header, but it may have a name different than
@file{config.h}.
Also, add this to your @file{Makefile.am}:
@example
SUBDIRS = libltdl

10
libltdl/argz.c
View File

@ -27,12 +27,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
*/
#ifdef HAVE_CONFIG_H
# if defined(LTDL) && defined LT_CONFIG_H
# include LT_CONFIG_H
# else
# include <config.h>
# endif
#if defined(LTDL) && defined LT_CONFIG_H
# include LT_CONFIG_H
#else
# include <config.h>
#endif
#include <argz.h>