[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Bug-gnulib] [PATCH] libtool argz compatibility
From: |
Paul Eggert |
Subject: |
Re: [Bug-gnulib] [PATCH] libtool argz compatibility |
Date: |
Tue, 22 Jun 2004 11:31:59 -0700 |
User-agent: |
Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (gnu/linux) |
"Gary V.Vaughan" <address@hidden> writes:
> Here is a patch to contribute the libtool argz
> compatibility functions as a module of gnulib.
>
> Okay to apply?
The only problem I saw with it was a spurious "#include" in
modules/argz. A further improvment is to have argz autoupdated from
libtool so that we don't have to propagate future changes by hand. I
installed the following, which incorporates that idea as well.
Karl, you'll probably need to add your LIBTOOL to config/srclistvars.sh.
2004-06-22 Paul Eggert <address@hidden>
* config/srclist-update: Don't insist on "USA." before the
close-comment, as libtool omits the period and puts the */ on
a separate line.
* config/srclist.txt: Add argz.c, argz_.h, argz.m4.
* config/srclistvars.sh: Add LIBTOOL (for eggert only).
* lib/argz.c, lib/argz_.h, m4/argz.m4:
New files, which are autoupdated from libtool.
* modules/argz: Omit "#include".
2004-06-22 Gary V. Vaughan <address@hidden>
* modules/argz: New file.
* MODULES.html.sh (func_all_modules): Add argz.
Index: MODULES.html.sh
===================================================================
RCS file: /cvsroot/gnulib/gnulib/MODULES.html.sh,v
retrieving revision 1.53
diff -p -u -r1.53 MODULES.html.sh
--- MODULES.html.sh 22 Jun 2004 18:02:53 -0000 1.53
+++ MODULES.html.sh 22 Jun 2004 18:15:25 -0000
@@ -1904,6 +1904,7 @@ func_all_modules ()
func_begin_table
func_module argp
+ func_module argz
func_module exitfail
func_module c-stack
func_module error
Index: config/srclist-update
===================================================================
RCS file: /cvsroot/gnulib/gnulib/config/srclist-update,v
retrieving revision 1.14
diff -p -u -r1.14 srclist-update
--- config/srclist-update 15 Aug 2003 18:04:34 -0000 1.14
+++ config/srclist-update 22 Jun 2004 18:15:25 -0000
@@ -58,7 +58,7 @@ fixlicense='
# with this program; if not, write to the Free Software Foundation,\
# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- /Th[ei][ s].* is free software/,/USA\. *\*\//c\
+ /Th[ei][ s].* is free software/,/\*\//c\
This program is free software; you can redistribute it and/or modify\
it under the terms of the GNU General Public License as published by\
the Free Software Foundation; either version 2, or (at your option)\
Index: config/srclist.txt
===================================================================
RCS file: /cvsroot/gnulib/gnulib/config/srclist.txt,v
retrieving revision 1.39
diff -p -u -r1.39 srclist.txt
--- config/srclist.txt 18 May 2004 12:22:41 -0000 1.39
+++ config/srclist.txt 22 Jun 2004 18:15:25 -0000
@@ -173,3 +173,7 @@ $LIBCSRC/sysdeps/generic/strtoul.c lib g
#$LIBCSRC/sysdeps/unix/sysv/gethostname.c lib gpl
#$LIBCSRC/sysdeps/unix/mkdir.c lib gpl
#$LIBCSRC/sysdeps/unix/utime.c lib gpl
+
+$LIBTOOL/libltdl/argz.c lib gpl
+$LIBTOOL/libltdl/argz_.h lib gpl
+$LIBTOOL/m4/argz.m4 m4
Index: config/srclistvars.sh
===================================================================
RCS file: /cvsroot/gnulib/gnulib/config/srclistvars.sh,v
retrieving revision 1.15
diff -p -u -r1.15 srclistvars.sh
--- config/srclistvars.sh 9 Mar 2004 19:42:23 -0000 1.15
+++ config/srclistvars.sh 22 Jun 2004 18:15:25 -0000
@@ -10,6 +10,7 @@ eggert)
: ${GNUCONFIG=../config}
: ${GNUORG=../gnuorg}
: ${GNUWWWLICENSES=$GNUORG}
+ : ${LIBTOOL=../libtool}
: ${LIBCSRC=../libc}
: ${TEXINFOSRC=../texinfo}
;;
--- /dev/null 2003-03-18 13:55:57 -0800
+++ modules/argz 2004-06-22 10:51:10 -0700
@@ -0,0 +1,30 @@
+Description:
+Argv style string arrays in a single null delimited char*.
+
+Files:
+lib/argz_.h
+lib/argz.c
+m4/argz.m4
+
+Depends-on:
+
+configure.ac:
+gl_FUNC_ARGZ
+
+Makefile.am:
+BUILT_SOURCES += $(ARGZ_H)
+EXTRA_DIST += argz_.h
+
+# We need the following in order to create an <argz.h> when the system
+# doesn't have one that works with the given compiler.
+all-local $(lib_OBJECTS): $(ARGZ_H)
+argz.h: argz_.h
+ cp $(srcdir)/argz_.h address@hidden
+ mv address@hidden $@
+MOSTLYCLEANFILES += argz.h argz.h-t
+
+Include:
+<argz.h>
+
+Maintainer:
address@hidden