* acgeneral.m4 (_AC_INIT_VERSION): Use AC_PACKAGE_NAME and

AC_PACKAGE_VERSION only if they are defined.
(_AC_OUTPUT_CONFIG_STATUS): Likewise.

diff --git a/ChangeLog b/ChangeLog
index b5454d53ec4d8e78c3317b5624ec93cb38998fc6..bb9899afe1a26d9d4608d04544c7f35d396e7b83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-16  Pavel Roskin  <proski@gnu.org>
+
+       * acgeneral.m4 (_AC_INIT_VERSION): Use AC_PACKAGE_NAME and
+       AC_PACKAGE_VERSION only if they are defined.
+       (_AC_OUTPUT_CONFIG_STATUS): Likewise.
+
 2001-04-15  Lars J. Aas  <larsa@sim.no>
 
         * acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): Alter response on

diff --git a/acgeneral.m4 b/acgeneral.m4
index f018be61974207acb208c26d7789f57e70dad439..46af809e9d6f46915a4a9617b807363204f69156 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1351,7 +1351,9 @@ m4_define([_AC_INIT_VERSION],
   cat <<\EOF])dnl
 m4_ifset([AC_PACKAGE_STRING],
          [m4_divert_text([VERSION_BEGIN],
-                         [AC_PACKAGE_NAME configure AC_PACKAGE_VERSION
+                         [dnl
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])configure[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 generated by GNU Autoconf AC_ACVERSION])])
 m4_divert_text([VERSION_END],
 [EOF
@@ -3681,7 +3683,8 @@ EOF
 
 cat >>$CONFIG_STATUS <<EOF
 ac_cs_version="\\
-AC_PACKAGE_NAME config.status AC_PACKAGE_VERSION
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.status[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by [$]0, generated by GNU Autoconf AC_ACVERSION,
   with options \"`echo "$ac_configure_args" | sed 's/[[\\""\`\$]]/\\\\&/g'`\"
 

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index f018be61974207acb208c26d7789f57e70dad439..46af809e9d6f46915a4a9617b807363204f69156 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1351,7 +1351,9 @@ m4_define([_AC_INIT_VERSION],
   cat <<\EOF])dnl
 m4_ifset([AC_PACKAGE_STRING],
          [m4_divert_text([VERSION_BEGIN],
-                         [AC_PACKAGE_NAME configure AC_PACKAGE_VERSION
+                         [dnl
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])configure[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 generated by GNU Autoconf AC_ACVERSION])])
 m4_divert_text([VERSION_END],
 [EOF
@@ -3681,7 +3683,8 @@ EOF
 
 cat >>$CONFIG_STATUS <<EOF
 ac_cs_version="\\
-AC_PACKAGE_NAME config.status AC_PACKAGE_VERSION
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.status[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by [$]0, generated by GNU Autoconf AC_ACVERSION,
   with options \"`echo "$ac_configure_args" | sed 's/[[\\""\`\$]]/\\\\&/g'`\"