* acgeneral.m4 (AC_PACKAGE): Also define AC_PACKAGE_STRING.

Use it here and there.

diff --git a/ChangeLog b/ChangeLog
index accebcc347fd3569b3dbe35e09e3ddc65fbff65d..affb02872a5805ed46b4b052562a2342b09d84e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-27  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (AC_PACKAGE): Also define AC_PACKAGE_STRING.
+       Use it here and there.
+
 2000-03-27  Ralf Corsepius  <corsepiu@faw.uni-ulm.de>
 
        * acgeneral.m4 (_AC_INIT_HELP, _AC_OUTPUT_SUBDIRS): Fix the DOS

diff --git a/acgeneral.m4 b/acgeneral.m4
index 4aeb24898b07dadbdb6854153d5334d03829fd80..de75af45e0e5626c8e0a8b19a9dba560697ec8d8 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -640,8 +640,9 @@ popdef([AC_Prefix])dnl
 # AC_PACKAGE(PACKAGE, VERSION, [BUG-REPORT])
 # ------------------------------------------
 AC_DEFUN(AC_PACKAGE,
-[define([AC_PACKAGE_NAME], [$1])dnl
-define([AC_PACKAGE_VERSION], [$2])dnl
+[define([AC_PACKAGE_NAME],     [$1])dnl
+define([AC_PACKAGE_VERSION],   [$2])dnl
+define([AC_PACKAGE_STRING],    [$1 $2])dnl
 define([AC_PACKAGE_BUGREPORT], [$3])dnl
 ])
 
@@ -1207,12 +1208,9 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<\EOF
-ifset([AC_PACKAGE_NAME],
-[`configure' configures AC_PACKAGE_NAME AC_PACKAGE_VERSION to adapt to many kinds
-of systems.
-],
-[`configure' configures software source code packages to adapt to many kinds
-of systems.])
+`configure' configures ifset([AC_PACKAGE_STRING],
+                       [AC_PACKAGE_STRING],
+                       [this package]) to adapt to many kinds
 
 [Usage: configure [OPTION]... [VAR=VALUE]... [HOST]
 
@@ -1267,9 +1265,9 @@ EOF
 fi
 
 if test -n "$ac_init_help"; then
-ifset([AC_Package_Name],
+ifset([AC_PACKAGE_STRING],
 [  $ac_init_help ||
-     echo "Configuration of AC_Package_Name AC_Package_Version:"])
+     echo "Configuration of AC_PACKAGE_STRING:"])
   cat <<\EOF
 AC_DIVERT_POP()dnl
 AC_DIVERT_PUSH([HELP_END])dnl
@@ -1320,9 +1318,9 @@ AC_DEFUN([_AC_INIT_VERSION],
 [AC_DIVERT([VERSION_BEGIN],
 [if $ac_init_version; then
   cat <<\EOF])dnl
-ifset([AC_PACKAGE_NAME],
+ifset([AC_PACKAGE_STRING],
 [AC_DIVERT([VERSION_BEGIN],
-           [configure (AC_PACKAGE_NAME AC_PACKAGE_VERSION) AC_ACVERSION])])
+           [configure (AC_PACKAGE_STRING) AC_ACVERSION])])
 AC_DIVERT([VERSION_END],
 [EOF
   exit 0

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 4aeb24898b07dadbdb6854153d5334d03829fd80..de75af45e0e5626c8e0a8b19a9dba560697ec8d8 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -640,8 +640,9 @@ popdef([AC_Prefix])dnl
 # AC_PACKAGE(PACKAGE, VERSION, [BUG-REPORT])
 # ------------------------------------------
 AC_DEFUN(AC_PACKAGE,
-[define([AC_PACKAGE_NAME], [$1])dnl
-define([AC_PACKAGE_VERSION], [$2])dnl
+[define([AC_PACKAGE_NAME],     [$1])dnl
+define([AC_PACKAGE_VERSION],   [$2])dnl
+define([AC_PACKAGE_STRING],    [$1 $2])dnl
 define([AC_PACKAGE_BUGREPORT], [$3])dnl
 ])
 
@@ -1207,12 +1208,9 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<\EOF
-ifset([AC_PACKAGE_NAME],
-[`configure' configures AC_PACKAGE_NAME AC_PACKAGE_VERSION to adapt to many kinds
-of systems.
-],
-[`configure' configures software source code packages to adapt to many kinds
-of systems.])
+`configure' configures ifset([AC_PACKAGE_STRING],
+                       [AC_PACKAGE_STRING],
+                       [this package]) to adapt to many kinds
 
 [Usage: configure [OPTION]... [VAR=VALUE]... [HOST]
 
@@ -1267,9 +1265,9 @@ EOF
 fi
 
 if test -n "$ac_init_help"; then
-ifset([AC_Package_Name],
+ifset([AC_PACKAGE_STRING],
 [  $ac_init_help ||
-     echo "Configuration of AC_Package_Name AC_Package_Version:"])
+     echo "Configuration of AC_PACKAGE_STRING:"])
   cat <<\EOF
 AC_DIVERT_POP()dnl
 AC_DIVERT_PUSH([HELP_END])dnl
@@ -1320,9 +1318,9 @@ AC_DEFUN([_AC_INIT_VERSION],
 [AC_DIVERT([VERSION_BEGIN],
 [if $ac_init_version; then
   cat <<\EOF])dnl
-ifset([AC_PACKAGE_NAME],
+ifset([AC_PACKAGE_STRING],
 [AC_DIVERT([VERSION_BEGIN],
-           [configure (AC_PACKAGE_NAME AC_PACKAGE_VERSION) AC_ACVERSION])])
+           [configure (AC_PACKAGE_STRING) AC_ACVERSION])])
 AC_DIVERT([VERSION_END],
 [EOF
   exit 0