[bug-gnulib] proposed patch for m4/mempcpy.m4

[Paul Eggert]

Here's a proposed patch for mempcpy.m4, to merge changes from
coreutils and update the copyright notice as per RMS.  Simon is the
maintainer so I'll hold off for a bit before installing this patch.
I assume it's not controversial, though.

2005-01-18  Paul Eggert  <address@hidden>
      and   Jim Meyering  <address@hidden>

        * modules/mempcpy (Makefile.am): Remove mention of mempcpy.h;
        AC_LIBSOURCES now does this.
        * m4/mempcpy.m4 (gl_FUNC_MEMPCPY): Use AC_LIBSOURCES.

Index: modules/mempcpy
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/mempcpy,v
retrieving revision 1.2
diff -p -u -r1.2 mempcpy
--- modules/mempcpy     22 Sep 2004 15:11:04 -0000      1.2
+++ modules/mempcpy     18 Jan 2005 23:47:29 -0000
@@ -12,7 +12,6 @@ configure.ac:
 gl_FUNC_MEMPCPY
 
 Makefile.am:
-lib_SOURCES += mempcpy.h
 
 Include:
 "mempcpy.h"
Index: m4/mempcpy.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/mempcpy.m4,v
retrieving revision 1.1
diff -p -u -r1.1 mempcpy.m4
--- m4/mempcpy.m4       14 Jul 2003 18:50:59 -0000      1.1
+++ m4/mempcpy.m4       18 Jan 2005 23:47:29 -0000
@@ -1,13 +1,13 @@
-# mempcpy.m4 serial 1
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# mempcpy.m4 serial 3
+dnl Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_MEMPCPY],
 [
+  AC_LIBSOURCES([mempcpy.c, mempcpy.h])
+
   dnl Persuade glibc <string.h> to declare mempcpy().
   AC_REQUIRE([AC_GNU_SOURCE])