* 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 c3548ecc5cb494ae0bae22ef2ae7fa10c115091b..c1ba5e812fa8b2f4621269c9bf49df396c0ac630 100644 (file)
--- 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 de34966ae1d08edee80c2a462bab82580856a60d..d19358eada63dff96a67bbd1d0c06be3a3685224 100644 (file)
--- 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 0d2698d4f49ef2a82d984514414acab72dc55a24..32fbf7d67e104838c43aa75bcb3617dcb8d825d3 100644 (file)
--- 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 8c9779a2896340784a0d2fe961b7d4d0bcb6eec1..2b72148f1cf1347592fbf69b67b6d27c38951afd 100644 (file)
--- 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 1b33ed391b8f4a0ea66ea46ece2bc82249515192..3f655d0820daf9fe19930be97cccdf5ea15087d8 100644 (file)
--- 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 ed00ff0e5a3ef571e58e491e208aaa839c92b47c..75ecbe4576d7a137d89f25c0fba6df6b5f9bc008 100755 (executable)
--- 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 cd3df26648857ae09dec3d9692b5a9fc2d719db6..e4bfcd45a6a53949b2baed3e0daa6912cd5f372d 100755 (executable)
--- 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
 :