Small improvement.

diff --git a/src/ChangeLog b/src/ChangeLog
index 64a856088e33204f771a57392e89e3151b85706d..9653d8cef62821e05dcba9ea2bf351156cd044fb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-16  Bruno Haible  <bruno@clisp.org>
+
+       * project-id: Make it work when the configure file was generated by
+       autoconf-2.52 with AC_INIT and AM_INIT_AUTOMAKE(...).
+
 2002-06-14  Bruno Haible  <bruno@clisp.org>
 
        * po-lex.c (mbfile_getc): Handle the case where iconv converts

diff --git a/src/project-id b/src/project-id
index 099edf436b16cedc02678196f71d46c00b258e75..fc746c605ed83318511e092b24b87ca95b40d17d 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_NAME=' configure; grep '^PACKAGE=' configure) | 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) | 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.