* aclocal.in (scan_configure_dep, scan_file): Include file names

are relative to the directory of configure.ac, not to the
directory of the file doing the include.  Remove code for this
latter case.
* tests/acloca13.test: Run distcheck and make sure all macros are
actually distributed.

diff --git a/ChangeLog b/ChangeLog
index 2dd6568..0412b10 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-04  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * aclocal.in (scan_configure_dep, scan_file): Include file names
+       are relative to the directory of configure.ac, not to the
+       directory of the file doing the include.  Remove code for this
+       latter case.
+       * tests/acloca13.test: Run distcheck and make sure all macros are
+       actually distributed.
+
 2005-03-03  Alexandre Duret-Lutz  <adl@gnu.org>
 
        For PR automake/450:

diff --git a/aclocal.in b/aclocal.in
index 2d61773..b139c52 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -377,8 +377,7 @@ sub scan_configure_dep ($)
     }
 
   add_macro ($_) foreach (@rlist);
-  my $dirname = dirname $file;
-  &scan_configure_dep (File::Spec->rel2abs ($_, $dirname)) foreach (@ilist);
+  &scan_configure_dep ($_) foreach @ilist;
 }
 
 # add_file ($FILE)
@@ -409,7 +408,6 @@ my $underquoted_manual_once = 0;
 sub scan_file ($$$)
 {
   my ($type, $file, $where) = @_;
-  my $dirname = dirname $file;
   my $basename = basename $file;
 
   # Do not scan the same file twice.
@@ -531,15 +529,6 @@ sub scan_file ($$$)
          my $ifile = $2 || $3;
          # Skip missing `sinclude'd files.
          next if $1 eq 's' && ! -f $ifile;
-         # m4_include is relative to the directory of the file which
-         # perform the include, but we want paths relative to the
-         # directory where aclocal is run.  Do not use
-         # File::Spec->rel2abs, because we want to store relative
-         # paths (they might be used later of aclocal outputs an
-         # m4_include for this file, or if the user itself includes
-         # this file).
-         $ifile = "$dirname/$ifile"
-           unless $dirname eq '.' || File::Spec->file_name_is_absolute ($ifile);
          push (@inc_files, $ifile);
          $inc_lines{$ifile} = $.;
        }

diff --git a/tests/acloca13.test b/tests/acloca13.test
index 8386f20..eccb3d8 100755 (executable)
--- a/tests/acloca13.test
+++ b/tests/acloca13.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -26,17 +26,25 @@ set -e
 
 cat >> configure.in << 'END'
 m4_include([somefile.m4])
+AC_OUTPUT
 END
 
+cat >Makefile.am <<'EOF'
+check-local:
+       test -f "$(srcdir)/somefile.m4"
+       test -f "$(srcdir)/m4/version1.m4"
+       test -f "$(srcdir)/m4/otherfile.m4"
+EOF
+
 mkdir m4
 
 echo MACRO1 >somefile.m4
-echo HELLO >m4/otherfile.m4
+echo 'AC_PREREQ([2.58])' >m4/otherfile.m4
 
 cat >m4/version1.m4 <<EOF
 AC_DEFUN([MACRO1])
 AC_DEFUN([MACRO2])
-m4_sinclude(otherfile.m4)
+m4_sinclude(m4/otherfile.m4)
 EOF
 
 cat >m4/version2.m4 <<EOF
@@ -60,3 +68,8 @@ touch m4/otherfile.m4
 $sleep
 $ACLOCAL -I m4
 test `ls -1t aclocal.m4 m4/otherfile.m4 | sed 1q` = aclocal.m4
+
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE distcheck