diff options
| author | Rob Savoye <rob@welcomehome.org> | 2003-03-17 02:25:05 +0000 |
|---|---|---|
| committer | Rob Savoye <rob@welcomehome.org> | 2003-03-17 02:25:05 +0000 |
| commit | 4306dace39d6628ca4105c672b1497c3c75ee745 (patch) | |
| tree | f5a8e016dc94c65d51f49b16cfeb7ccf44f353fe /aclocal.m4 | |
| parent | fcec39f2fe9f5a28065086273464e7a589194969 (diff) | |
| download | dejagnu-4306dace39d6628ca4105c672b1497c3c75ee745.zip dejagnu-4306dace39d6628ca4105c672b1497c3c75ee745.tar.gz dejagnu-4306dace39d6628ca4105c672b1497c3c75ee745.tar.bz2 | |
2003-03-16 Rob Savoye <rob@direwolf.welcomehome.org>
* lib/unix.exp: Preservce the value of LD_LIBRARY_PATH, rather
than stomp on it. This is based on a patch from Brendan Conoboy
<blc@redhat.com>.
* Most files: Update copyright dates.
2003-03-13 Mike Stump <mrs@apple.com>
* lib/dg.exp(dg-test): Add compiler flags to testcase name, to
help ensure uniqueness.
2003-03-05 Alexandre Oliva <aoliva@redhat.com>
* lib/remote.exp (standard_download, standard_upload): Support
nfsdir and nfsroot_server.
2001-11-12 Andrew Cagney <ac131313@redhat.com>
* lib/remote.exp (local_exec, standard_close): Use SHELL
background instead of tcl background to background the kill
processes. Work around problem found by Nick Duffek in older
CYGWINs. (migrated from Redhat's sources kind late, sorry)
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 18 |
1 files changed, 12 insertions, 6 deletions
@@ -1,4 +1,4 @@ -# aclocal.m4 generated automatically by aclocal 1.6 -*- Autoconf -*- +# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -198,9 +198,9 @@ _AM_IF_OPTION([no-define],, # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, "aclocal-${am__api_version}") +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, "automake-${am__api_version}") +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) AM_MISSING_PROG(AMTAR, tar) @@ -250,7 +250,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.6])]) + [AM_AUTOMAKE_VERSION([1.6.3])]) # Helper functions for option handling. -*- Autoconf -*- @@ -582,7 +582,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'] + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -707,7 +707,13 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [for mf in $CONFIG_FILES; do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` - if (sed 1q $mf | fgrep 'generated by automake') > /dev/null 2>&1; then + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue |