Re: am_init_automake-vs-ac_init.patch

[Alexandre Duret-Lutz]

How embarassing ...

I'm checking the following fix.

Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.1722
diff -u -r1.1722 ChangeLog
--- ChangeLog   2002/01/12 09:24:56     1.1722
+++ ChangeLog   2002/01/12 17:31:23
@@ -1,3 +1,11 @@
+2002-01-12  Alexandre Duret-Lutz  <address@hidden>
+
+       * 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  <address@hidden>
 
        * automake.in (scan_one_autoconf_file): Unquote AC_LIBOBJ argument.
Index: m4/init.m4
===================================================================
RCS file: /cvs/automake/automake/m4/init.m4,v
retrieving revision 1.37
diff -u -r1.37 init.m4
--- init.m4     2002/01/09 08:52:07     1.37
+++ init.m4     2002/01/12 17:31:36
@@ -58,7 +58,7 @@
 
 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.
Index: m4/options.m4
===================================================================
RCS file: /cvs/automake/automake/m4/options.m4,v
retrieving revision 1.2
diff -u -r1.2 options.m4
--- options.m4  2002/01/09 08:52:07     1.2
+++ options.m4  2002/01/12 17:31:36
@@ -40,4 +40,4 @@
 # -------------------------------------------
 # 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])])
Index: tests/nodefine.test
===================================================================
RCS file: /cvs/automake/automake/tests/nodefine.test,v
retrieving revision 1.1
diff -u -r1.1 nodefine.test
--- nodefine.test       2002/01/09 08:52:09     1.1
+++ nodefine.test       2002/01/12 17:31:38
@@ -40,5 +40,5 @@
 $AUTOCONF
 ./configure
 
-grep 'DEFS.*-DVERSION=\\"UnIqUe' output || exit 1
+grep 'DEFS.*-DVERSION=\\"UnIqUe' output && exit 1
 :
Index: tests/nodefine2.test
===================================================================
RCS file: /cvs/automake/automake/tests/nodefine2.test,v
retrieving revision 1.1
diff -u -r1.1 nodefine2.test
--- nodefine2.test      2002/01/09 08:52:09     1.1
+++ nodefine2.test      2002/01/12 17:31:38
@@ -36,5 +36,5 @@
 $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
 :

-- 
Alexandre Duret-Lutz