diff options
author | Alexandre Duret-Lutz <adl@gnu.org> | 2006-08-30 18:50:38 +0000 |
---|---|---|
committer | Alexandre Duret-Lutz <adl@gnu.org> | 2006-08-30 18:50:38 +0000 |
commit | 8ae25d96fddea93d469d9b86c78519245dc911d8 (patch) | |
tree | eab3ecefaa0e8cabf8226ea0cec85aafc716a737 /tests/subpkg.test | |
parent | f83d84f889456cdce7e9741d5e87d8f305b631d1 (diff) | |
download | automake-8ae25d96fddea93d469d9b86c78519245dc911d8.tar.gz |
For PR automake/500:
* automake.in (handle_compile) <$default_includes>: Do not output
the same -I twice. Use @am__isrc@ instead of ` -I$(srcdir)'.
* m4/init.m4: Define am__isrc as ` -I$(srcdir)' only in
non-VPATH builds since we always have `-I.'.
* tests/subpkg.test: Make sure config headers are found in VPATH
and non-VPATH builds.
Diffstat (limited to 'tests/subpkg.test')
-rwxr-xr-x | tests/subpkg.test | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/subpkg.test b/tests/subpkg.test index 69ff96b02..c7015b6b2 100755 --- a/tests/subpkg.test +++ b/tests/subpkg.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -74,6 +74,7 @@ AC_INIT([lib], [2.3]) AM_INIT_AUTOMAKE AC_PROG_RANLIB AC_PROG_YACC +AC_CONFIG_HEADERS([config.h:config.hin]) AC_CONFIG_FILES([Makefile]) FOO EOF @@ -105,6 +106,7 @@ END cp lib/foo.y lib/bar.y cat >lib/src/x.c <<'EOF' +#include <config.h> int lib () { return 0; @@ -119,10 +121,12 @@ cd lib $ACLOCAL -I ../m4 $FGREP 'm4_include([../m4/foo.m4])' aclocal.m4 $AUTOCONF +$AUTOHEADER $AUTOMAKE -Wno-override --add-missing cd .. ./configure +$MAKE $MAKE distcheck test ! -d subpack-1 # make sure distcheck cleans up after itself test -f subpack-1.tar.gz |