--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-01  Bruno Haible  <bruno@clisp.org>
+
+	* gnulib-tool (func_emit_initmacro_done): Special case for alloca.c.
+	Needed for the alloca-opt module.
+
 2007-09-30  Bruno Haible  <bruno@clisp.org>
 
 	* lib/alloca.in.h: Renamed from lib/alloca_.h.

--- a/gnulib-tool
+++ b/gnulib-tool
@@ -1950,13 +1950,17 @@
   echo "  AC_CHECK_FUNCS([\$1], , [${macro_prefix}_LIBOBJ(\$ac_func)])"
   echo "])"
   echo
-  echo "# Like AC_LIBSOURCES, except check for typos now."
-  echo "# We rely on EXTRA_lib..._SOURCES instead."
+  echo "# Like AC_LIBSOURCES, except the directory where the source file is"
+  echo "# expected is derived from the gnulib-tool parametrization,"
+  echo "# and alloca is special cased (for the alloca-opt module)."
+  echo "# We could also entirely rely on EXTRA_lib..._SOURCES."
   echo "AC_DEFUN([${macro_prefix}_LIBSOURCES], ["
   echo "  m4_foreach([_gl_NAME], [\$1], ["
-  echo "    m4_syscmd([test -r $sourcebase/]_gl_NAME[ || test ! -d $sourcebase])dnl"
-  echo "    m4_if(m4_sysval, [0], [],"
-  echo "      [AC_FATAL([missing $sourcebase/]_gl_NAME)])"
+  echo "    m4_if(_gl_NAME, [alloca.c], [], ["
+  echo "      m4_syscmd([test -r $sourcebase/]_gl_NAME[ || test ! -d $sourcebase])dnl"
+  echo "      m4_if(m4_sysval, [0], [],"
+  echo "        [AC_FATAL([missing $sourcebase/]_gl_NAME)])"
+  echo "    ])"
   echo "  ])"
   echo "])"
 }