Make it work better when autoconf-2.52's AC_INIT is used.

diff --git a/src/ChangeLog b/src/ChangeLog
index bc25fb620d99836100ce0ce4a69e95164114b0f4..a601f32629b789a9b78919febed318b723328a1b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-28  Bruno Haible  <bruno@clisp.org>
+
+       * project-id: Recognize package name and version when given by a
+       two-argument AC_INIT invocation (autoconf 2.52 and newer).
+
 2002-04-24  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.11.2 released.

diff --git a/src/project-id b/src/project-id
index d51bc40470f420f72bb59e6f9c4e42f70ad05e1f..099edf436b16cedc02678196f71d46c00b258e75 100755 (executable)
--- a/src/project-id
+++ b/src/project-id
@@ -20,7 +20,7 @@
 want_version="$1"
 while true; do
   if test -f configure; then
-    package=`grep '^PACKAGE=' configure | sed -e '1q' | sed -e 's/^PACKAGE=//'`
+    package=`(grep '^PACKAGE_NAME=' configure; grep '^PACKAGE=' configure) | sed -e '1q' | sed -e 's/^[^=]*=//' | sed -e "s/^'//" -e "s/'$//"`
     case "$package" in
       *[\"\$\`\{\}]*)
         # Some packages (gcal) retrieve the package name dynamically.
@@ -33,7 +33,7 @@ while true; do
         package="GNU $package"
       fi
       if test -n "$want_version"; then
-        version=`grep '^VERSION=' configure | sed -e '1q' | sed -e 's/^VERSION=//'`
+        version=`(grep '^PACKAGE_VERSION=' configure; grep '^VERSION=' configure) | sed -e '1q' | sed -e 's/^[^=]*=//' | sed -e "s/^'//" -e "s/'$//"`
         case "$version" in
           *[\"\$\`\{\}]*)
             # Some packages (gcal, gcc, clisp) retrieve the version dynamically.