diff options
| author | Tom Tromey <tromey@redhat.com> | 2001-02-05 06:59:03 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2001-02-05 06:59:03 +0000 |
| commit | daea6deea6811d55032742e6508a780a79fbcc99 (patch) | |
| tree | 0ce672a4bc6246b9a5667e1ad937bdbe4ebaa36c /m4/depend.m4 | |
| parent | 3e19938698261dbe749ce4eb023b3461961e2da8 (diff) | |
| download | automake-daea6deea6811d55032742e6508a780a79fbcc99.tar.gz | |
* m4/Makefile.am (m4data_DATA): Added make.m4.
* automake.in (handle_dependencies): Use @AM_INCLUDE@ to include
dependency files.
* m4/depend.m4 (AM_DEPNDENCIES): Require AM_MAKE_INCLUDE.
Copy depcomp to subdir.
* m4/make.m4: New file.
Diffstat (limited to 'm4/depend.m4')
| -rw-r--r-- | m4/depend.m4 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/m4/depend.m4 b/m4/depend.m4 index 8f63a3d64..59c95d655 100644 --- a/m4/depend.m4 +++ b/m4/depend.m4 @@ -28,6 +28,8 @@ depcpp="$CXXCPP"], depcc="$$1" depcpp=""]) +AC_REQUIRE([AM_MAKE_INCLUDE]) + AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], [if test -z "$AMDEP"; then @@ -37,10 +39,13 @@ AC_CACHE_CHECK([dependency style of $depcc], # making a dummy file named `D' -- because `-MD' means `put the output # in D'. mkdir confdir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" confdir cd confdir am_cv_$1_dependencies_compiler_type=none - for depmode in `sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < "$am_depcomp"`; do + for depmode in `sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < "./depcomp"`; 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. @@ -65,7 +70,7 @@ AC_CACHE_CHECK([dependency style of $depcc], if depmode="$depmode" \ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ - $SHELL $am_depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && grep conftest.h conftest.Po > /dev/null 2>&1; then am_cv_$1_dependencies_compiler_type="$depmode" break |