* automake.in (generate_makefile): Suggest using AM_CPPFLAGS

instead of INCLUDES.
* tests/pluseq5.test: Check that AM_CPPFLAGS is suggested.

diff --git a/ChangeLog b/ChangeLog
index 6a04c6026ab2c86ca3da44cd478cab632fcf596f..da26db2db37f614c38d781257a99c4e719a66703 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-09  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * automake.in (generate_makefile): Suggest using AM_CPPFLAGS
+       instead of INCLUDES.
+       * tests/pluseq5.test: Check that AM_CPPFLAGS is suggested.
+
 2002-07-09  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * automake.in (usage, version): Honor $exit_code.

diff --git a/automake.in b/automake.in
index eca1b127467f67cedec5a24b1bfcbff2473dd9c3..7a1af9b7ffbc399f665da431b615e98883eb2b2d 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1525,6 +1525,11 @@ sub generate_makefile
          if ! $var_is_am{$var};
       }
 
+    # Catch some obsolete variables.
+    msg_var ('obsolete', 'INCLUDES',
+            "`INCLUDES' is the old name for `AM_CPPFLAGS'")
+      if variable_defined ('INCLUDES');
+
     # At the toplevel directory, we might need config.guess, config.sub
     # or libtool scripts (ltconfig and ltmain.sh).
     if ($relative_dir eq '.')

diff --git a/tests/pluseq5.test b/tests/pluseq5.test
index 6009e5ec1931b79479003c11c63a5722f21638a5..1c444c9d72ed83fd7f837f85f5f64647c7ef4598 100755 (executable)
--- a/tests/pluseq5.test
+++ b/tests/pluseq5.test
@@ -31,4 +31,6 @@ grep ':.*CHECK_FALSE$' stderr || exit 1
 # Is there only one missing condition?
 test `grep ':  ' stderr | wc -l` = 1 || exit 1
 
-:
+# By the way, Automake should suggest using AM_CPPFLAGS,
+# because INCLUDES is an obsolete name.
+grep AM_CPPFLAGS stderr || exit 1