From: Akim Demaille <akim@epita.fr>
Date: Mon, 8 Oct 2001 11:53:44 +0000 (+0000)
Subject: * m4/cond.m4 (AM_CONDITIONAL): Don't use m4_match as Autoconf
X-Git-Tag: Release-1-5b~126
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=4879531214f6c63b4c195487264c1153a3e8e808;p=automake.git

* m4/cond.m4 (AM_CONDITIONAL): Don't use m4_match as Autoconf
changed its name.
---

diff --git a/ChangeLog b/ChangeLog
index 547c4723..209cc89d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-08  Akim Demaille  <akim@epita.fr>
+
+	* m4/cond.m4 (AM_CONDITIONAL): Don't use m4_match as Autoconf
+	changed its name.
+
 2001-10-05  Akim Demaille  <akim@epita.fr>
 
 	* automake.in (scan_autoconf_files): Use find_configure_ac from
diff --git a/m4/cond.m4 b/m4/cond.m4
index e4556c4f..21537a43 100644
--- a/m4/cond.m4
+++ b/m4/cond.m4
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# serial 4
+# serial 5
 
 AC_PREREQ(2.52)
 
@@ -25,7 +25,8 @@ AC_PREREQ(2.52)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl
+[ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])
 AC_SUBST([$1_FALSE])
 if $2; then