From: Bruno Haible <bruno@clisp.org>
Date: Tue, 30 Oct 2001 11:06:58 +0000 (+0000)
Subject: Make it work for autoconf-2.52 using packages as well.
X-Git-Tag: v0.11~378
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49b9da8ee43a4630dfacac65b2d356c0f2b42906;p=thirdparty%2Fgettext.git

Make it work for autoconf-2.52 using packages as well.
---

diff --git a/projects/ChangeLog b/projects/ChangeLog
index 754d8644c..93360090c 100644
--- a/projects/ChangeLog
+++ b/projects/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-27  Bruno Haible  <haible@clisp.cons.org>
+
+	* KDE/trigger: Treat configure.ac like configure.in.
+	* GNOME/trigger: Likewise.
+
 2001-10-21  Bruno Haible  <haible@clisp.cons.org>
 
 	* Makefile.am: New file.
diff --git a/projects/GNOME/trigger b/projects/GNOME/trigger
index 20bacb6e8..e7a04feaf 100755
--- a/projects/GNOME/trigger
+++ b/projects/GNOME/trigger
@@ -1,8 +1,15 @@
 #!/bin/sh
 # Test whether the current package is a GNOME package.
 while true; do
+  configfiles=
   if test -f configure.in; then
-    if grep '^GNOME_' configure.in >/dev/null 2>&1 ; then
+    configfiles="$configfiles configure.in"
+  fi
+  if test -f configure.ac; then
+    configfiles="$configfiles configure.ac"
+  fi
+  if test -n "$configfiles"; then
+    if grep '^GNOME_' $configfiles >/dev/null 2>&1 ; then
       exit 0
     fi
     exit 1
diff --git a/projects/KDE/trigger b/projects/KDE/trigger
index 90712d885..342645493 100755
--- a/projects/KDE/trigger
+++ b/projects/KDE/trigger
@@ -1,10 +1,17 @@
 #!/bin/sh
 # Test whether the current package is a KDE package.
 while true; do
+  configfiles=
   if test -f configure.in; then
-    if grep '^KDE_' configure.in >/dev/null 2>&1 || \
-       grep '^AC_PATH_KDE' configure.in >/dev/null 2>&1 || \
-       grep '^AM_KDE_WITH_NLS' configure.in >/dev/null 2>&1 ; then
+    configfiles="$configfiles configure.in"
+  fi
+  if test -f configure.ac; then
+    configfiles="$configfiles configure.ac"
+  fi
+  if test -n "$configfiles"; then
+    if grep '^KDE_' $configfiles >/dev/null 2>&1 || \
+       grep '^AC_PATH_KDE' $configfiles >/dev/null 2>&1 || \
+       grep '^AM_KDE_WITH_NLS' $configfiles >/dev/null 2>&1 ; then
       exit 0
     fi
     exit 1