[Bug-gnulib] getting gettext files automatically

[Paul Eggert]

Here's a proposed gnulib patch to automate the process of
incorporating gettext's source files into gnulib.  I've tested this
against gettext 0.12.1 and it results in no change to gnulib, other
than by replacing the LGPL with the GPL.

It is a little weird that vasprintf.h comes from gettext-tools/lib
whereas vasprintf.c comes from gettext-runtime/libasprintf, but right
now I'm just documenting where the current sources come from, rather
than changing what they do.

2003-07-09  Paul Eggert  <address@hidden>

        * srclist.txt: Add tons more gettext files.  $GETTEXT is now
        assumed to refer to the root of the most recent stable gettext version.
        * srclistvars.sh: Add defaults for eggert.
        * srclist-update: Convert LGPL to GPL in shell scripts, too.
        Match "This program" as well as "The program".  This is needed
        for gettext.

Index: config/srclist.txt
===================================================================
RCS file: /cvsroot/gnulib/gnulib/config/srclist.txt,v
retrieving revision 1.17
diff -p -u -r1.17 srclist.txt
--- config/srclist.txt  10 Jul 2003 05:07:45 -0000      1.17
+++ config/srclist.txt  10 Jul 2003 06:05:14 -0000
@@ -18,7 +18,25 @@ $AUTOCONF/INSTALL            doc
 $GNUORG/COPYING.DOC            doc
 $GNUORG/fdl.texi               doc
 
-$GETTEXT/gettext.h             lib
+$GETTEXT/gettext-runtime/libasprintf/asnprintf.c       lib gpl
+$GETTEXT/gettext-runtime/libasprintf/asprintf.c                lib gpl
+$GETTEXT/gettext-runtime/libasprintf/printf-args.c     lib gpl
+$GETTEXT/gettext-runtime/libasprintf/printf-args.h     lib gpl
+$GETTEXT/gettext-runtime/libasprintf/printf-parse.c    lib gpl
+$GETTEXT/gettext-runtime/libasprintf/printf-parse.h    lib gpl
+$GETTEXT/gettext-runtime/libasprintf/vasnprintf.c      lib gpl
+$GETTEXT/gettext-runtime/libasprintf/vasnprintf.h      lib gpl
+$GETTEXT/gettext-runtime/libasprintf/vasprintf.c       lib gpl
+$GETTEXT/gettext-tools/lib/config.charset              lib gpl
+$GETTEXT/gettext-tools/lib/gettext.h                   lib gpl
+$GETTEXT/gettext-tools/lib/localcharset.c              lib gpl
+$GETTEXT/gettext-tools/lib/localcharset.h              lib gpl
+$GETTEXT/gettext-tools/lib/mkdtemp.c                   lib gpl
+$GETTEXT/gettext-tools/lib/ref-add.sin                 lib gpl
+$GETTEXT/gettext-tools/lib/ref-del.sin                 lib gpl
+$GETTEXT/gettext-tools/lib/setenv.c                    lib gpl
+$GETTEXT/gettext-tools/lib/unsetenv.c                  lib gpl
+$GETTEXT/gettext-tools/lib/vasprintf.h                 lib gpl
 #
 $LIBCSRC/argp/argp-ba.c                        lib gpl
 $LIBCSRC/argp/argp-eexst.c             lib gpl
Index: config/srclist-update
===================================================================
RCS file: /cvsroot/gnulib/gnulib/config/srclist-update,v
retrieving revision 1.6
diff -p -u -r1.6 srclist-update
--- config/srclist-update       8 Jul 2003 23:33:45 -0000       1.6
+++ config/srclist-update       10 Jul 2003 06:05:14 -0000
@@ -26,7 +26,24 @@ test -r $mydir/srclistvars.sh && . $mydi
 #
 fixlicense() \
 {
-    sed '/The .* is free software/,/USA\.  *\*\//c\
+    sed '
+
+  /^\([[:space:]]*#[[:space:]]*\)Th[ei][ s].* is free 
software/,/^[[:space:]]*#.*USA\./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)\
+#      any later version.\
+#\
+#      This program is distributed in the hope that it will be useful,\
+#      but WITHOUT ANY WARRANTY; without even the implied warranty of\
+#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\
+#      GNU General Public License for more details.\
+#\
+#      You should have received a copy of the GNU General Public License along\
+#      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\
    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/srclistvars.sh
===================================================================
RCS file: /cvsroot/gnulib/gnulib/config/srclistvars.sh,v
retrieving revision 1.8
diff -p -u -r1.8 srclistvars.sh
--- config/srclistvars.sh       18 May 2003 15:28:33 -0000      1.8
+++ config/srclistvars.sh       10 Jul 2003 06:05:14 -0000
@@ -2,6 +2,17 @@
 # Variables for srclist-update and srclist.txt.
 # Will change for each user.
 
+case $LOGNAME in
+eggert)
+  : ${AUTOCONF=../autoconf}
+  : ${AUTOMAKE=../automake}
+  : ${GETTEXT=../gettext}
+  : ${GNUCONFIG=../config}
+  : ${GNUORG=../gnuorg}
+  : ${LIBCSRC=../libc}
+  : ${TEXINFOSRC=../texinfo}
+esac
+
 : ${ACLOCAL=/usr/local/gnu/share/aclocal}
 : ${AUTOCONF=/usr/local/gnu/share/autoconf}
 : ${AUTOMAKE=$HOME/gnu/src/automake}