From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Sat, 12 Jan 2002 17:38:56 +0000 (+0000)
Subject: * test/nodefine.test, test/nodefine2.test: Check that no-define
X-Git-Tag: Release-1-5d~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e375e1f2529d02f5585c55436d236613ef999094;p=thirdparty%2Fautomake.git

* test/nodefine.test, test/nodefine2.test: Check that no-define
works, not the contrary...
* m4/options.m4 (_AM_IF_OPTIONS): Use m4_ifset.
* m4/init.m4 (AM_INIT_AUTOMAKE): A third argument implies no-define,
not the contrary.
---

diff --git a/ChangeLog b/ChangeLog
index c3548ecc5..c1ba5e812 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-12  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+	* test/nodefine.test, test/nodefine2.test: Check that no-define
+	works, not the contrary...
+	* m4/options.m4 (_AM_IF_OPTIONS): Use m4_ifset.
+	* m4/init.m4 (AM_INIT_AUTOMAKE): A third argument implies no-define,
+	not the contrary.
+
 2002-01-12  Jim Meyering  <meyering@lucent.com>
 
 	* automake.in (scan_one_autoconf_file): Unquote AC_LIBOBJ argument.
diff --git a/aclocal.m4 b/aclocal.m4
index de34966ae..d19358ead 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -71,7 +71,7 @@ fi
 
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-  [m4_ifval([$3],, [_AM_SET_OPTION([no-define])])],
+  [m4_ifval([$3], [_AM_SET_OPTION([no-define])])],
   [_AM_SET_OPTIONS([$1])])dnl
 
 # Define the identity of the package.
@@ -182,7 +182,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 # -------------------------------------------
 # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
 AC_DEFUN([_AM_IF_OPTION],
-[m4_if(_AM_MANGLE_OPTION([$1]), 1, [$2], [$3])])
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
 #
 # Check to make sure that the build environment is sane.
diff --git a/m4/init.m4 b/m4/init.m4
index 0d2698d4f..32fbf7d67 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -58,7 +58,7 @@ fi
 
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-  [m4_ifval([$3],, [_AM_SET_OPTION([no-define])])],
+  [m4_ifval([$3], [_AM_SET_OPTION([no-define])])],
   [_AM_SET_OPTIONS([$1])])dnl
 
 # Define the identity of the package.
diff --git a/m4/options.m4 b/m4/options.m4
index 8c9779a28..2b72148f1 100644
--- a/m4/options.m4
+++ b/m4/options.m4
@@ -40,4 +40,4 @@ AC_DEFUN([_AM_SET_OPTIONS],
 # -------------------------------------------
 # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
 AC_DEFUN([_AM_IF_OPTION],
-[m4_if(_AM_MANGLE_OPTION([$1]), 1, [$2], [$3])])
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1b33ed391..3f655d082 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -263,6 +263,7 @@ libobj7.test \
 libobj8.test \
 libobj9.test \
 libobj10.test \
+libobj11.test \
 library.test \
 libtool.test \
 libtool2.test \
diff --git a/tests/nodefine.test b/tests/nodefine.test
index ed00ff0e5..75ecbe457 100755
--- a/tests/nodefine.test
+++ b/tests/nodefine.test
@@ -40,5 +40,5 @@ $ACLOCAL
 $AUTOCONF
 ./configure
 
-grep 'DEFS.*-DVERSION=\\"UnIqUe' output || exit 1
+grep 'DEFS.*-DVERSION=\\"UnIqUe' output && exit 1
 :
diff --git a/tests/nodefine2.test b/tests/nodefine2.test
index cd3df2664..e4bfcd45a 100755
--- a/tests/nodefine2.test
+++ b/tests/nodefine2.test
@@ -36,5 +36,5 @@ $AUTOCONF
 $AUTOMAKE   # Dummy call to make sure Automake grok `no-define' silently.
 ./configure
 
-grep 'DEFS.*-DVERSION=\\"UnIqUe' output || exit 1
+grep 'DEFS.*-DVERSION=\\"UnIqUe' output && exit 1
 :