* tests/make.test: Use am__include.
* tests/exsource.test: Use am__include.
* m4/make.m4 (AM_MAKE_INCLUDE): Use am__include and am__quote.
* automake.in (handle_languages): Use am__include and am__quote.
2001-07-17 Tom Tromey <tromey@redhat.com>
+ Report from Motoyuki Kasahara:
+ * tests/make.test: Use am__include.
+ * tests/exsource.test: Use am__include.
+ * m4/make.m4 (AM_MAKE_INCLUDE): Use am__include and am__quote.
+ * automake.in (handle_languages): Use am__include and am__quote.
+
* m4/depend.m4 (AM_DEPENDENCIES): Renamed to _AM_DEPENDENCIES.
* m4/init.m4: Updated callers.
= Naming
* We've adopted the convention that internal AC_SUBSTs should be
- named with a leading `_am_', and internally generated targets should
- be named with a leading `_am-'. This convention is very new
+ named with a leading `am__', and internally generated targets should
+ be named with a leading `am--'. This convention is very new
(as of Feb 7 2001) and so it isn't yet universally used. But all
new code should use it.
+ We used to use `_am_' as the prefix for an internal AC_SUBST.
+ However, it turns out that NEWS-OS 4.2R complains if a Makefile
+ variable begins with `_'. Yay for them. I changed the target
+ naming convention just to be safe.
================================================================
= Editing `.am' files
foreach my $iter (@deplist)
{
$output_rules .= (subst ('AMDEP_TRUE')
- . subst ('_am_include')
+ . subst ('am__include')
. ' '
- . subst ('_am_quote')
+ . subst ('am__quote')
. $iter
- . subst ('_am_quote')
+ . subst ('am__quote')
. "\n");
}
END
# If we don't find an include directive, just comment out the code.
AC_MSG_CHECKING([for style of include used by $am_make])
-_am_include='#'
-_am_quote=
+am__include='#'
+am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
# be invoked under some other name (usually "gmake"), in which
# case it prints its new name instead of `make'.
if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
- _am_include=include
- _am_quote=
+ am__include=include
+ am__quote=
_am_result=GNU
fi
# Now try BSD make style include.
-if test "$_am_include" = "#"; then
+if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- _am_include=.include
- _am_quote='"'
+ am__include=.include
+ am__quote='"'
_am_result=BSD
fi
fi
-AC_SUBST(_am_include)
-AC_SUBST(_am_quote)
+AC_SUBST(am__include)
+AC_SUBST(am__quote)
AC_MSG_RESULT($_am_result)
rm -f confinc confmf
])
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-grep '@_am_include@ .*/xtra\.P' Makefile.in
+grep '@am__include@ .*/xtra\.P' Makefile.in
for flag in '' -w; do
MAKE="$save $flag" ./configure
- fgrep '_am_include = #' Makefile && exit 1
+ fgrep 'am__include = #' Makefile && exit 1
touch configure.in
$MAKE $flag
- fgrep '_am_include = #' Makefile && exit 1
+ fgrep 'am__include = #' Makefile && exit 1
rm -f config.cache
done