Interoperability with automake-1.7.2.

diff --git a/src/ChangeLog b/src/ChangeLog
index e7af82ce2d513d2ec08d159bf5e7239e26d141ba..07cce3d166bf644ad9e91b97793d6c00a2a70908 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-08  Bruno Haible  <bruno@clisp.org>
+
+       * project-id: Make it work with configure files that use
+       AM_INIT_AUTOMAKE from automake-1.7.2.
+
 2002-12-04  Bruno Haible  <bruno@clisp.org>
 
        Fix handling of references to filenames starting with a digit.

diff --git a/src/project-id b/src/project-id
index 5ea3a17eff77d7fd3331836ea9360ef85c537153..7b1c86fbd7d7c69bf8968db5ac846954259df637 100755 (executable)
--- a/src/project-id
+++ b/src/project-id
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Prints a package's identification PACKAGE VERSION or PACKAGE.
 #
-# Copyright (C) 2001-2002 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 want_version="$1"
 while true; do
   if test -f configure; then
-    package=`(grep '^PACKAGE_NAME=' configure; grep '^PACKAGE=' configure) | grep -v '=[       ]*$' | sed -e '1q' | sed -e 's/^[^=]*=//' | sed -e "s/^'//" -e "s/'$//"`
+    package=`(grep '^PACKAGE_NAME=' configure; grep '^ *PACKAGE=' configure) | grep -v '=[     ]*$' | 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 '^PACKAGE_VERSION=' configure; grep '^VERSION=' configure) | grep -v '=[        ]*$' | sed -e '1q' | sed -e 's/^[^=]*=//' | sed -e "s/^'//" -e "s/'$//"`
+        version=`(grep '^PACKAGE_VERSION=' configure; grep '^ *VERSION=' configure) | grep -v '=[      ]*$' | sed -e '1q' | sed -e 's/^[^=]*=//' | sed -e "s/^'//" -e "s/'$//"`
         case "$version" in
           *[\"\$\`\{\}]*)
             # Some packages (gcal, gcc, clisp) retrieve the version dynamically.