detecting AC_REPLACE_FUNCS typos [was: underscores in gnulib file names]

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Jim, Bruno,

According to Jim Meyering on 9/25/2007 3:42 AM:
>> And in the process, broke builds for platforms that lack __fpending
>> (such as cygwin), since AC_REPLACE_FUNCS is a stickler about
>> __fpending.c existing in that case.  (I didn't notice it until now,
>> because I had been doing incremental builds where a stale
>> __fpending.o was still in place from before the rename).

OK to apply this patch, so that we can see these sorts of failures in the
autobuilder?

2007-09-25  Eric Blake  <address@hidden>

        Enforce that AC_REPLACE_FUNCS files exist.
        * gnulib-tool (func_emit_initmacro_done): Make AC_LIBSOURCES
        override check for typos.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFG+Qmd84KuGfSFAYARAuAFAJ9q/yi+glQhywYQ2bRWJ7P6Ht8WfACeIoU5
r9PX5/Xcxs44kRqa/hdZWBM=
=9Znr
-----END PGP SIGNATURE-----

>From 8fd12c8a4ed0cafb84466ab898c64f9523526e57 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 25 Sep 2007 07:11:35 -0600
Subject: [PATCH] Enforce that AC_REPLACE_FUNCS files exist.

* gnulib-tool (func_emit_initmacro_done): Make AC_LIBSOURCES
override check for typos.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog   |    6 ++++++
 gnulib-tool |   11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 90c0414..44321c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-25  Eric Blake  <address@hidden>
+
+       Enforce that AC_REPLACE_FUNCS files exist.
+       * gnulib-tool (func_emit_initmacro_done): Make AC_LIBSOURCES
+       override check for typos.
+
 2007-09-24  Bruno Haible  <address@hidden>
 
        * README: Update git instructions.
diff --git a/gnulib-tool b/gnulib-tool
index f6c4a17..a14d125 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -1932,23 +1932,28 @@ func_emit_initmacro_end ()
 # func_emit_initmacro_done
 # emits a few statements after the gl_INIT macro to standard output.
 # - macro_prefix    prefix of gl_EARLY, gl_INIT macros to use
+# - sourcebase      directory relative to destdir where to place source code
 func_emit_initmacro_done ()
 {
   echo
   echo "# Like AC_LIBOBJ, except that the module name goes"
   echo "# into ${macro_prefix}_LIBOBJS instead of into LIBOBJS."
   echo "AC_DEFUN([${macro_prefix}_LIBOBJ],"
-  echo "  [${macro_prefix}_LIBOBJS=\"\$${macro_prefix}_LIBOBJS 
\$1.\$ac_objext\"])"
+  echo "  [${macro_prefix}_LIBSOURCES([\$1.c])dnl"
+  echo "  ${macro_prefix}_LIBOBJS=\"\$${macro_prefix}_LIBOBJS 
\$1.\$ac_objext\"])"
   echo
   echo "# Like AC_REPLACE_FUNCS, except that the module name goes"
   echo "# into ${macro_prefix}_LIBOBJS instead of into LIBOBJS."
   echo "AC_DEFUN([${macro_prefix}_REPLACE_FUNCS],"
   echo "  [AC_CHECK_FUNCS([\$1], , [${macro_prefix}_LIBOBJ(\$ac_func)])])"
   echo
-  echo "# Like AC_LIBSOURCES, except that it does nothing."
+  echo "# Like AC_LIBSOURCES, except check for typos now."
   echo "# We rely on EXTRA_lib..._SOURCES instead."
   echo "AC_DEFUN([${macro_prefix}_LIBSOURCES],"
-  echo "  [])"
+  echo "  [m4_foreach([_gl_FILE_NAME], [\$1],"
+  echo "    [m4_syscmd([test -r $sourcebase/]_gl_FILE_NAME[ || test ! -d 
$sourcebase])dnl"
+  echo "    m4_if(m4_sysval, [0], [],"
+  echo "      [AC_FATAL([missing $sourcebase/]_gl_FILE_NAME)])])])"
 }
 
 # func_import modules
-- 
1.5.3.2