FYI: consider file with relative path as local files for m4_include

[Alexandre Duret-Lutz]

I'm installing this.

2003-09-23  Alexandre Duret-Lutz  <address@hidden>

        * aclocal.in (write_aclocal): Consider files with relative
        paths as local to the project, i.e., subject to m4_include.
        * tests/subpkg.test (ACLOCAL_AMFLAGS): Make sure m4_include
        is also used for .m4 files in the outer project.

Index: aclocal.in
===================================================================
RCS file: /cvs/automake/automake/aclocal.in,v
retrieving revision 1.93
diff -u -r1.93 aclocal.in
--- aclocal.in  7 Sep 2003 13:26:43 -0000       1.93
+++ aclocal.in  23 Sep 2003 19:30:58 -0000
@@ -511,11 +511,10 @@
       my $mtime = mtime $file;
       $greatest_mtime = $mtime if $greatest_mtime < $mtime;
 
-      # If the file to add looks like path outside the project,
-      # copy it to the output.
-      # The regex catches filenames starting with things like
-      #   / \ c:\ ../ ./../ etc.
-      if ($file =~ m,^(?:(?:\w:)?[\\/]|(?:\.[\\/]+)*\.\.[\\/]),)
+      # If the file to add looks like outside the project, copy it
+      # to the output.  The regex catches filenames starting with
+      # things like `/', `\', or `c:\'.
+      if ($file =~ m,^(?:\w:)?[\\/],)
        {
          $output .= $file_contents{$file} . "\n";
        }
Index: tests/subpkg.test
===================================================================
RCS file: /cvs/automake/automake/tests/subpkg.test,v
retrieving revision 1.6
diff -u -r1.6 subpkg.test
--- tests/subpkg.test   27 Jun 2003 00:03:59 -0000      1.6
+++ tests/subpkg.test   23 Sep 2003 19:30:59 -0000
@@ -25,10 +25,18 @@
 
 set -e
 
+mkdir m4
+
+cat >m4/foo.m4 <<'EOF'
+AC_DEFUN([FOO],[
+  AC_PROG_CC
+  AC_OUTPUT
+])
+EOF
+
 cat >>configure.in <<'END'
 AC_CONFIG_SUBDIRS([lib])
-AC_PROG_CC
-AC_OUTPUT
+FOO
 END
 
 cat >Makefile.am <<'EOF'
@@ -44,6 +52,8 @@
 dist-hook:
        test -f $(distdir)/LDADD.c
        test -f $(top_distdir)/LDADD.c
+
+ACLOCAL_AMFLAGS = -I m4
 EOF
 
 cat >LDADD.c <<'EOF'
@@ -62,10 +72,9 @@
 cat >lib/configure.ac <<'EOF'
 AC_INIT([lib], [2.3])
 AM_INIT_AUTOMAKE
-AC_PROG_CC
 AC_PROG_RANLIB
 AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
+FOO
 EOF
 
 cat >lib/Makefile.am <<'EOF'
@@ -77,6 +86,8 @@
        test -f $(top_distdir)/LDADD.c
        test -f $(distdir)/src/x.c
        test ! -f $(top_distdir)/src/x.c
+
+ACLOCAL_AMFLAGS = -I ../m4
 EOF
 
 cat >lib/src/x.c <<'EOF'
@@ -86,12 +97,13 @@
 }
 EOF
 
-$ACLOCAL
+$ACLOCAL -I m4
 $AUTOCONF
 $AUTOMAKE -Wno-override
 
 cd lib
-$ACLOCAL
+$ACLOCAL -I ../m4
+$FGREP 'm4_include([../m4/foo.m4])' aclocal.m4
 $AUTOCONF
 $AUTOMAKE -Wno-override
 cd ..

-- 
Alexandre Duret-Lutz