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.

diff --git a/ChangeLog b/ChangeLog
index a8279b4526a574fdeb4da4d56949f2cd907d61c1..7f8db0b0ccd89612f706ddae0844d58bf7fe14b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-08-30  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       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.
+
 2006-08-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * doc/automake.texi, lib/Automake/Rule.pm: Fix some typos.

diff --git a/Makefile.in b/Makefile.in
index 6aadcbb55eea21fd0c52f2b7d261f12220bfdbba..1fe8971001a28b7cf97051db2a46225d3dcef81e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,7 +42,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \
        $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
        $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
        $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
-       $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \

diff --git a/aclocal.m4 b/aclocal.m4
index 33c5a750febcacc58c04af1d8dca99c971e06795..d5f9e1688d0750c89590c641f5494078cc16f153 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -25,4 +25,5 @@ m4_include([m4/options.m4])
 m4_include([m4/runlog.m4])
 m4_include([m4/sanity.m4])
 m4_include([m4/strip.m4])
+m4_include([m4/substnot.m4])
 m4_include([m4/tar.m4])

diff --git a/automake.in b/automake.in
index 35fb1987759a0bb009b2ec2260023fd047460773..b08c591a62d9eba2410fcc68b164e89d21add501 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2301,16 +2301,22 @@ sub handle_compile ()
     my $default_includes = '';
     if (! option 'nostdinc')
       {
-       $default_includes = ' -I. -I$(srcdir)';
+       my @incs = ('-I.');
 
        my $var = var 'CONFIG_HEADER';
        if ($var)
          {
            foreach my $hdr (split (' ', $var->variable_value))
              {
-               $default_includes .= ' -I' . dirname ($hdr);
+               push @incs, '-I' . dirname ($hdr);
              }
          }
+       # We want `-I. -I$(srcdir)', but the latter -I is redundant
+       # and unaesthetic in non-VPATH builds.  We use `-I.@am__isrc@`
+       # instead.  It will be replaced by '-I.' or '-I. -I$(srcdir)'.
+       # Items in CONFIG_HEADER are never in $(srcdir) so it is safe
+       # to just append @am__isrc@.
+       $default_includes = ' ' . uniq (@incs) . '@am__isrc@';
       }
 
     my (@mostly_rms, @dist_rms);

diff --git a/configure b/configure
index 89bcc108d98960ff308a44681af8473f296b007e..23579b6ebc5e2bcf2035cf800bfadc30be0ce943 100755 (executable)
--- a/configure
+++ b/configure
@@ -609,6 +609,7 @@ am_AUTOCONF
 INSTALL_PROGRAM
 INSTALL_SCRIPT
 INSTALL_DATA
+am__isrc
 CYGPATH_W
 PACKAGE
 VERSION
@@ -2014,12 +2015,16 @@ else
 fi
 rmdir .tst 2>/dev/null
 
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
+  fi
 fi
 
 # test whether we have cygpath
@@ -3350,6 +3355,7 @@ am_AUTOCONF!$am_AUTOCONF$ac_delim
 INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
 CYGPATH_W!$CYGPATH_W$ac_delim
 PACKAGE!$PACKAGE$ac_delim
 VERSION!$VERSION$ac_delim
@@ -3381,7 +3387,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

diff --git a/doc/Makefile.in b/doc/Makefile.in
index de71779c7e8a7259d4afebb6a227fcd23e446fde..f6cd295a44dcd9b820e12843a14871203c37a7e3 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -43,7 +43,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \
        $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
        $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
        $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
-       $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 92100854c8feb1bacfcb0a4c8c80c430893c0fc1..732b24c054f50252cab732f97b8f126559e44449 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -41,7 +41,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \
        $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
        $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
        $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
-       $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs

diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index e23a1356cb5a9d85d5413d4122eb94352aa3ae8e..7c50263aab662e9b2f3433e4b21a6414fc96b309 100644 (file)
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -39,7 +39,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \
        $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
        $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
        $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
-       $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs

diff --git a/lib/Makefile.in b/lib/Makefile.in
index fc7670adea2b404757002464668fcbef7b518442..bcab75832de3eaeb63e9cb98d2a39203193895a0 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -44,7 +44,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \
        $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
        $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
        $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
-       $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs

diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 63ead4c3e1f68f01f30d8afbe6b1c6d24d10f8a2..e89d45f6de18465b2123ba81cafa7222c1e00d4a 100644 (file)
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -41,7 +41,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \
        $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
        $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
        $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
-       $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 8c71d23b3610e9d1f34783df89e8a5e9fdb3db27..222149c0d808460ec2b00c67959d6464e3528d2c 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -41,7 +41,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \
        $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
        $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
        $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
-       $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs

diff --git a/m4/init.m4 b/m4/init.m4
index 37d73c9657acbf47d4b2a3b54d45697add06a43e..511073c1c62c8b28c4ac32050abfb12600adce55 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -30,10 +30,14 @@ dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
 fi
 
 # test whether we have cygpath

diff --git a/tests/Makefile.in b/tests/Makefile.in
index f1db03d3c3d783839e68b7d62dc40f1cc5405245..3934eacd771a81d8240295bf2f525ad9d509f8b2 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -40,7 +40,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \
        $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \
        $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
        $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \
-       $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs

diff --git a/tests/subpkg.test b/tests/subpkg.test
index 69ff96b021c5e646f65adbc833fec7fd9556398a..c7015b6b2854fdf5720f596f46f14e9301beebdb 100755 (executable)
--- 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