-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Applied to HEAD.
* looking for [EMAIL PROTECTED]/m4--devo--1.0--patch-9 to compare with
* comparing to [EMAIL PROTECTED]/m4--devo--1.0--patch-9
M bootstrap
M ChangeLog
M Makefile.am
M src/main.c
* modified files
Index: Changelog
from Gary V. Vaughan <[EMAIL PROTECTED]>
* Makefile.am (src_m4_SOURCES): Add version-etc-fsf.c.
* bootstrap (src_modules): Add version-etc-fsf.
* src/main.c (version_etc_copyright): Removed.
--- orig/Makefile.am
+++ mod/Makefile.am
@@ -71,6 +71,7 @@
src/getopt.c \
src/getopt1.c \
src/getopt.h \
+ src/version-etc-fsf.c \
src/version-etc.c \
src/version-etc.h \
src/main.c \
--- orig/bootstrap
+++ mod/bootstrap
@@ -12,7 +12,9 @@
config_aux_dir=$ltdldir/config
config_macro_dir=$ltdldir/m4
-src_modules='getopt version-etc'
+# List dependencies here too; we don't extract them, otherwise dependent
+# modules could end up being imported to src/ *and* gnu/!
+src_modules='getopt version-etc-fsf version-etc'
dirname="s,/[^/]*$,,"
basename="s,^.*/,,g"
@@ -49,8 +51,9 @@
AC_DEFUN([gl_AC_TYPE_UINTMAX_T], [jm_AC_TYPE_UINTMAX_T])
EOF
-func_echo "fetching version_etc and getopt modules for src directory"
+func_echo "fetching modules for src directory"
gnulibdir=`which gnulib-tool | $SED "$dirname"`
+
for file in `${GNULIB_TOOL} --extract-filelist $src_modules`; do
dest=`echo $file | $SED "$basename"`
--- orig/src/main.c
+++ mod/src/main.c
@@ -28,11 +28,6 @@
static void print_program_name_CB (void);
-/* Initialise gnulib version-etc module.
- Do *not* mark this string for translation. */
-const char version_etc_copyright[] =
- "Copyright (C) 2005 Free Software Foundation, Inc.";
-
/* Name of frozen file to digest after initialization. */
const char *frozen_file_to_read = NULL;
- --
Gary V. Vaughan ())_. [EMAIL PROTECTED],gnu.org}
Research Scientist ( '/ http://tkd.kicks-ass.net
GNU Hacker / )= http://www.gnu.org/software/libtool
Technical Author `(_~)_ http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.9
http://tkd.kicks-ass.net/arch/[EMAIL PROTECTED]/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)
iD8DBQFCeytYFRMICSmD1gYRAipWAJoDBHUcg6V+KHtnQY2PfzQLfWIYnwCeLieU
MPbewY0gWNChIP0wm/9QnJg=
=Q+5O
-----END PGP SIGNATURE-----
_______________________________________________
M4-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/m4-patches
