* lib/am/lang-compile.am (%FPFX%DEPMODE): Delete. This is now

traced from configure.ac.

* automake.in (macro_define): Don't accept to override an AC_SUBST
or Automake variable in a new condition.
* tests/cond23.test, tests/cond24.test: New file.
* tests/Makefile.am (TESTS): Add cond23.test and cond24.test.
Reported by Patrik Weiskirchre.

diff --git a/ChangeLog b/ChangeLog
index a45e021ec7f5c3060893bade6aab067788635d36..69d3f2f03ec49ba9a1a489ef8436ad5bbf2fdc71 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-06-19  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * lib/am/lang-compile.am (%FPFX%DEPMODE): Delete.  This is now
+       traced from configure.ac.
+
+       * automake.in (macro_define): Don't accept to override an AC_SUBST
+       or Automake variable in a new condition.
+       * tests/cond23.test, tests/cond24.test: New file.
+       * tests/Makefile.am (TESTS): Add cond23.test and cond24.test.
+       Reported by Patrik Weiskirchre.
+
 2002-06-19  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * tests/nobase.test, tests/pr204.test, tests/pr300-lib.test,

diff --git a/THANKS b/THANKS
index 6f82409524f9ce059fb07591d29544d0b7df6c80..f7ffaf2712e9d1b99bc5c32a53dcfefbc3bdb4a3 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -136,6 +136,7 @@ OKUJI Yoshinori             okuji@kuicr.kyoto-u.ac.jp
 Olivier Louchart-Fletcher olivier@zipworld.com.au
 Olly Betts             olly@muscat.co.uk
 Patrick Welche         prlw1@newn.cam.ac.uk
+Patrik Weiskircher     me@justp.at
 Paul Berrevoets                paul@swi.com
 Paul D. Smith          psmith@BayNetworks.COM
 Paul Eggert            eggert@twinsun.com

diff --git a/automake.in b/automake.in
index 3ed14df10e9b2f46604d05a46d9d2a46fbb8a518..f639dc02453250aa49cfdfc46f2e3c2a61a30e4e 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5911,10 +5911,12 @@ sub macro_define ($$$$$$)
       else
        {
          # There must be no previous value unless the user is redefining
-         # an Automake variable or an AC_SUBST variable.
+         # an Automake variable or an AC_SUBST variable for an existing
+         # condition.
          check_ambiguous_conditional ($var, $cond)
-           unless ($var_is_am{$var} && !$var_is_am
-                   || exists $configure_vars{$var});
+           unless (($var_is_am{$var} && !$var_is_am
+                    || exists $configure_vars{$var})
+                   && exists $var_value{$var}{$cond});
 
          $var_value{$var}{$cond} = $value;
        }

diff --git a/lib/am/lang-compile.am b/lib/am/lang-compile.am
index 02def500e385d765df36e94581abff0e24842f3c..39adfc29aec39b6f31f4e51eea28f87723076109 100644 (file)
--- a/lib/am/lang-compile.am
+++ b/lib/am/lang-compile.am
@@ -18,17 +18,6 @@
 
 ## This file is read once per *language*, not per extension.
 
-## ----------------------------- ##
-## Common to all the languages.  ##
-## ----------------------------- ##
-
-## Dependency tracking.
-if %AMDEP%
-%FPFX%DEPMODE = @%FPFX%DEPMODE@
-endif %AMDEP%
-
-
-
 ## ------------------------- ##
 ## Preprocessed Fortran 77.  ##
 ## ------------------------- ##

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c86a42382d6d6b75a97a087102a84024dbd71973..a6cbae920137db41b683a95e6de4f24a447e032f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -86,6 +86,8 @@ cond19.test \
 cond20.test \
 cond21.test \
 cond22.test \
+cond23.test \
+cond24.test \
 condd.test \
 condincl.test \
 condincl2.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 13332ba5c814d7efad91f293f758ab3b45b831f5..571193b708a9cad766f79f63a4213741bc4ab460 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -172,6 +172,8 @@ cond19.test \
 cond20.test \
 cond21.test \
 cond22.test \
+cond23.test \
+cond24.test \
 condd.test \
 condincl.test \
 condincl2.test \

diff --git a/tests/cond23.test b/tests/cond23.test
new file mode 100755 (executable)
index 0000000..8de8a5a
--- /dev/null
+++ b/tests/cond23.test
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Check that conditional redefinitions of AC_SUBST'ed variables are detected.
+# Report from Patrik Weiskircher
+
+. $srcdir/defs
+
+set -e
+
+cat >>configure.in <<EOF
+AM_CONDITIONAL([COND], [true])
+AC_OUTPUT
+EOF
+
+cat >Makefile.am <<EOF
+if COND
+libdir = mumble
+endif
+EOF
+
+$ACLOCAL
+$AUTOMAKE 2>stderr && exit 1
+grep 'libdir was already defined' stderr

diff --git a/tests/cond24.test b/tests/cond24.test
new file mode 100755 (executable)
index 0000000..32d5e92
--- /dev/null
+++ b/tests/cond24.test
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Check that conditional redefinitions of AC_SUBST'ed variables are detected.
+# Report from Patrik Weiskircher
+
+. $srcdir/defs
+
+set -e
+
+cat >>configure.in <<EOF
+AC_SUBST([foo], [bar])
+AM_CONDITIONAL([COND], [true])
+AC_OUTPUT
+EOF
+
+cat >Makefile.am <<EOF
+if COND
+foo = baz
+endif
+EOF
+
+$ACLOCAL
+$AUTOMAKE 2>stderr && exit 1
+grep 'foo was already defined' stderr