FYI: warn about INCLUDES

[Alexandre Duret-Lutz]

>>> "adl" == Alexandre Duret-Lutz <address@hidden> writes:

[...]

 adl> - add more warning about obsolete features (e.g. INCLUDES
 adl> is the old name for AM_CPPFLAGS)

[...]

I'm checking this in.

2002-07-09  Alexandre Duret-Lutz  <address@hidden>

        * automake.in (generate_makefile): Suggest using AM_CPPFLAGS
        instead of INCLUDES.
        * tests/pluseq5.test: Check that AM_CPPFLAGS is suggested.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1322
diff -u -r1.1322 automake.in
--- automake.in 9 Jul 2002 19:45:10 -0000       1.1322
+++ automake.in 9 Jul 2002 20:40:38 -0000
@@ -1525,6 +1525,11 @@
          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 '.')
Index: tests/pluseq5.test
===================================================================
RCS file: /cvs/automake/automake/tests/pluseq5.test,v
retrieving revision 1.3
diff -u -r1.3 pluseq5.test
--- tests/pluseq5.test  16 May 2002 20:36:36 -0000      1.3
+++ tests/pluseq5.test  9 Jul 2002 20:40:40 -0000
@@ -31,4 +31,6 @@
 # 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

-- 
Alexandre Duret-Lutz