bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: gnulib-tool: restore the ability to create a big testdir


From: Ralf Wildenhues
Subject: Re: gnulib-tool: restore the ability to create a big testdir
Date: Sat, 14 Oct 2006 12:24:52 +0200
User-agent: Mutt/1.5.13 (2006-08-11)

[ Adding libtool-patches in the game ]

Hello Paul,

* Paul Eggert wrote on Fri, Oct 13, 2006 at 12:01:16AM CEST:
> Ralf Wildenhues <address@hidden> writes:
> 
> >> Would anybody object if I changed all the other modules to be
> >> compatible with config-h?
> >
> > This would break lib/argz.c.
> 
> Sorry, I don't follow.  Is this because lib/argz.c is used in projects
> that don't use AC_CONFIG_HEADERS?  Which projects are they?

None currently, I assume.  But we are offering this to projects that use
Libtool and libltdl.  (And we worked hard to make this work, so I'm
reluctant to let go.)

> If there are actual projects that don't use AC_CONFIG_HEADERS then of
> course we have to be cautious about assuming config-h.  But if not,
> then why wouldn't the following patch work for lib/argz.c?

Yes, probably you're right, and I should give in on this one.  Sigh.

Libtool folks, do you agree to this change, or would you rather have the
gnulib argz module diverge from the Libtool copy (please let's not) or
something else?

Cheers,
Ralf

2006-10-14  Paul Eggert  <address@hidden>,
            Ralf Wildenhues  <address@hidden>

        * 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.

Index: doc/libtool.texi
===================================================================
RCS file: /cvsroot/libtool/libtool/doc/libtool.texi,v
retrieving revision 1.215
diff -u -r1.215 libtool.texi
--- doc/libtool.texi    18 May 2006 00:10:37 -0000      1.215
+++ doc/libtool.texi    14 Oct 2006 09:59:36 -0000
@@ -4246,6 +4246,7 @@
 
 @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 @@
 @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
address@hidden
+
+Also, add the following near the top of your @file{Makefile.am}:
 
 @example
 AM_CPPFLAGS =
@@ -4286,13 +4290,17 @@
 
 @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
address@hidden
+
+Also, add this to your @file{Makefile.am}:
 
 @example
 SUBDIRS = libltdl
Index: libltdl/argz.c
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/argz.c,v
retrieving revision 1.8
diff -u -r1.8 argz.c
--- libltdl/argz.c      28 Aug 2006 16:02:14 -0000      1.8
+++ libltdl/argz.c      14 Oct 2006 09:59:36 -0000
@@ -27,12 +27,10 @@
 
 */
 
-#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>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]