From: Bruno Haible <bruno@clisp.org>
Date: Tue, 30 Apr 2002 14:46:33 +0000 (+0000)
Subject: Make it work better when autoconf-2.52's AC_INIT is used.
X-Git-Tag: v0.11.3~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a65499a13eaad05b9589e17587b6424f009302a;p=thirdparty%2Fgettext.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index bc25fb620..a601f3262 100644
--- 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 d51bc4047..099edf436 100755
--- 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.