diff options
| author | Akim Demaille <akim@epita.fr> | 2001-10-15 07:52:52 +0000 |
|---|---|---|
| committer | Akim Demaille <akim@epita.fr> | 2001-10-15 07:52:52 +0000 |
| commit | 21ba32360dd993fc747bfd93447a5584ca4cb1f7 (patch) | |
| tree | 890d2c3f08c4a27a996abb674f7794790de9c5b2 /m4/depend.m4 | |
| parent | a8fc58a2c9126db272d81a7bf454c62188ebd131 (diff) | |
| download | automake-21ba32360dd993fc747bfd93447a5584ca4cb1f7.tar.gz | |
* m4/depend.m4 (AM_DEP_TRACK): Use AC_SUBST([AMDEPBACKSLASH])
normally, what is wrong is that automake outputs a variable
definition for it, hence...
* automake.in (scan_one_autoconf_file): don't.
* m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): New, extracted
from...
(AM_OUTPUT_DEPENDENCY_COMMANDS): here. Adjust.
Use AC_CONFIG_COMMANDS.
(_AM_OUTPUT_DEPENDENCY_COMMANDS): Use AS_DIRNAME and AS_MKDIR_P.
Diffstat (limited to 'm4/depend.m4')
| -rw-r--r-- | m4/depend.m4 | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/m4/depend.m4 b/m4/depend.m4 index 6478cb838..c95b5fcbe 100644 --- a/m4/depend.m4 +++ b/m4/depend.m4 @@ -27,7 +27,7 @@ # _AM_DEPENDENCIES(NAME) -# --------------------- +# ---------------------- # See how the compiler implements dependency checking. # NAME is "CC", "CXX" or "OBJC". # We try a few techniques and use that to set a single cache variable. @@ -106,8 +106,7 @@ else am_cv_$1_dependencies_compiler_type=none fi ]) -$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type" -AC_SUBST([$1DEPMODE]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ]) @@ -125,7 +124,7 @@ else DEPDIR=_deps fi rmdir .deps 2>/dev/null -AC_SUBST(DEPDIR) +AC_SUBST([DEPDIR]) ]) @@ -140,7 +139,5 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -pushdef([subst], defn([AC_SUBST])) -subst(AMDEPBACKSLASH) -popdef([subst]) +AC_SUBST([AMDEPBACKSLASH]) ]) |