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

diff --git a/projects/ChangeLog b/projects/ChangeLog
index 754d8644cced2889c6cff42e87434c6ad0a6b9f9..93360090c91c1939bfc19e73f444ab1d9a3530db 100644 (file)
--- 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 20bacb6e8ba3c9a7bf1d00c7d89017004726deea..e7a04feaf60239b05efe44994d0036753a7dfd8b 100755 (executable)
--- 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 90712d8856ca2f83d0251a3216befae6578febb0..3426454939a91ce68d76a3b0f8141c7112034ab4 100755 (executable)
--- 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