Set AC_PACKAGE_NAME.

diff --git a/ChangeLog b/ChangeLog
index 9de4b797b774b5e14af25a599b9cd002e10d0911..073c42987f0b2e6f80faaed5897eb0f3d796d5e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-01  Bruno Haible  <bruno@clisp.org>
+
+       * m4/init-package-version.m4 (gl_INIT_PACKAGE): Set AC_PACKAGE_NAME.
+
 2009-11-30  Bruno Haible  <bruno@clisp.org>
 
        * autogen.sh: Treat gettext-runtime/libasprintf before gettext-runtime.

diff --git a/m4/init-package-version.m4 b/m4/init-package-version.m4
index f131a844f0568a12de827d53f44c2fabb4f5b97d..0472349005772abb96a1eb2a5a6d8159c98d1901 100644 (file)
--- a/m4/init-package-version.m4
+++ b/m4/init-package-version.m4
@@ -1,4 +1,4 @@
-# init-package-version.m4 serial 1 (gettext-0.18)
+# init-package-version.m4 serial 2 (gettext-0.18)
 dnl Copyright (C) 1992-2009 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
@@ -70,6 +70,8 @@ dnl the same distribution terms as the rest of that program.
 AC_DEFUN([gl_INIT_PACKAGE],
 [
   AC_BEFORE([$0], [AM_INIT_AUTOMAKE])
+  dnl Define AC_PACKAGE_NAME, because macros such as gnulib/m4/acl.m4 need it.
+  m4_ifndef([AC_PACKAGE_NAME], [m4_define([AC_PACKAGE_NAME], [$1])])
   dnl Redefine AM_INIT_AUTOMAKE.
   m4_define([gl_AM_INIT_AUTOMAKE],
     m4_bpatsubst(m4_dquote(