2001-05-13 Tom Tromey <tromey@redhat.com>

	* tests/defs: Find files to copy in lib/.
	* automake.in (perllibdir): Set to Automake directory.
	* ansi2knr.c, ansi2knr.1: Removed.
	* Makefile.am (dist_am_DATA): Removed.
	(amdir): Removed.
	(maintainer-check): Look for lib/am/*.am.  Expect 28 lines of
	diffs.
	(scriptdir): Removed.
	(dist_script_DATA): Likewise.
	(install-data-hook): Likewise.
	(installcheck-local): Likewise.
	(TAGS_FILES): Removed amfiles.
	(dist_pkgdata_DATA): Removed ansi2knr.c and ansi2knr.1.
	* tests/installsh.test (AUTOMAKE): Use --libdir, not --amdir, and
	point it to the right directory.
	* ansi2knr.am, check.am, clean-hdr.am, clean.am, comp-vars.am,
	compile.am, configure.am, data.am, dejagnu.am, depend.am,
	depend2.am, distdir.am, footer.am, header-vars.am, header.am,
	install.am, java.am, lang-compile.am, lex.am, library.am, libs.am,
	libtool.am, lisp.am, ltlib.am, ltlibrary.am, mans-vars.am,
	mans.am, multilib.am, program.am, progs.am, python.am,
	remake-hdr.am, scripts.am, subdirs.am, tags.am, texi-vers.am,
	texibuild.am, texinfos.am, yacc.am: Moved to lib/am/.
	* configure.in (AC_OUTPUT): Added lib/am/Makefile.
	(AUTOMAKE): Use --libdir, not --amdir.
	Ues AC_CONFIG_AUX_DIR.
	* lib/Makefile.am (SUBDIRS): Added `am'.
	(scriptdir): New macro.
	(dist_script_DATA): Likewise.
	(dist_pkgdata_DATA): Likewise.
	(install-data-hook): New target.
	(installcheck-local): Likewise.
	* lib/am/Makefile.in: New file.
	* lib/am/Makefile.am: Removed everything except amdir and
	dist_am_DATA.

2001-05-13  Akim Demaille  <akim@epita.fr>

	* automake.in ($pkgdata_dir): Rename as...
	($libdir): this.
	($am_dir): Remove, replace it's uses with $libdir.
	(&parse_arguments): Replace --amdir with --libdir.
	* automake.texi (Invoking Automake): Document --libdir, not
	--amdir.
	* tests/defs (AUTOMAKE): Use --libdir, not --amdir.

1 files changed, 15 insertions, 5 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index ba0dcea3e..b73755797 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -278,6 +278,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM_ENV])])
 AC_DEFUN([AM_DEPENDENCIES],
 [AC_REQUIRE([AM_SET_DEPDIR])dnl
 AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+am_compiler_list=
 ifelse([$1], CC,
        [AC_REQUIRE([AC_PROG_][CC])dnl
 AC_REQUIRE([AC_PROG_][CPP])
@@ -287,16 +288,22 @@ depcpp="$CPP"],
 AC_REQUIRE([AC_PROG_][CXXCPP])
 depcc="$CXX"
 depcpp="$CXXCPP"],
-       [$1], OBJC, [am_cv_OBJC_dependencies_compiler_type=gcc],
+       [$1], OBJC, [am_compiler_list='gcc3 gcc'
+depcc="$OBJC"
+depcpp=""],
+       [$1], GCJ,  [am_compiler_list='gcc3 gcc'
+depcc="$GCJ"
+depcpp=""],
        [AC_REQUIRE([AC_PROG_][$1])dnl
 depcc="$$1"
 depcpp=""])
 
 AC_REQUIRE([AM_MAKE_INCLUDE])
+AC_REQUIRE([AM_DEP_TRACK])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP"; then
+[if test -z "$AMDEP_TRUE"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
@@ -309,7 +316,10 @@ AC_CACHE_CHECK([dependency style of $depcc],
   cd confdir
 
   am_cv_$1_dependencies_compiler_type=none
-  for depmode in `sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < "./depcomp"`; do
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list="`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`"
+  fi
+  for depmode in $am_compiler_list; do
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
@@ -396,7 +406,7 @@ popdef([subst])
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
 AC_OUTPUT_COMMANDS([
-test x"$AMDEP" != x"" ||
+test x"$AMDEP_TRUE" != x"" ||
 for mf in $CONFIG_FILES; do
   case "$mf" in
   Makefile) dirpart=.;;
@@ -433,7 +443,7 @@ for mf in $CONFIG_FILES; do
     echo '# dummy' > "$dirpart/$file"
   done
 done
-], [AMDEP="$AMDEP"
+], [AMDEP_TRUE="$AMDEP_TRUE"
 ac_aux_dir="$ac_aux_dir"])])
 
 # AM_MAKE_INCLUDE()