Re: Cleanup 2/4: make install-strip in cross-compilation environments

[Alexandre Duret-Lutz]

> >>> "Tom" == Tom Tromey <address@hidden> writes:
>  >>>>>> "adl" == Alexandre Duret-Lutz <address@hidden> writes:
>  adl> 2001-01-28  Alexandre Duret-Lutz  <address@hidden>
>  adl> * m4/strip.m4: New file.
>  adl> * m4/Makefile.am (m4data_DATA): Add strip.m4.
>  adl> * m4/init.m4: Call AM_PROG_INSTALL_STRIP.
>  adl> * m4/missing.m4 (AM_AUX_DIR_EXPAND): New function.
> |adl> (AM_MISSING_INSTALL_SH, AM_MISSING_HAS_RUN): Use $am_aux_dir instead
> |adl> of $ac_aux_dir, and require AM_AUX_DIR_EXPAND.
> |adl> * m4/depend.m4 (AM_DEP_TRACK): Likewise.
> |
> \ I believe this part of the patch has not been applied
>   (conflicts with Akim's changes on 01-16).

I don't care about depend.m4, this adds only the missing changes
from m4/missing.m4.  Note that this also fix a bug in
AC_MISSING_INSTALL_SH which was using ${ac_auxdir} instead of 
${ac_aux_dir}.

2001-02-25  Alexandre Duret-Lutz  <address@hidden>

        * m4/missing.m4 (AM_MISSING_INSTALL_SH, AM_MISSING_HAS_RUN):
        Require AM_AUX_DIR_EXPAND and use $am_aux_dir instead of $ac_aux_dir.

Index: m4/missing.m4
===================================================================
RCS file: /cvs/automake/automake/m4/missing.m4,v
retrieving revision 1.13
diff -u -r1.13 missing.m4
--- missing.m4  2001/02/18 00:35:19     1.13
+++ missing.m4  2001/02/25 14:06:08
@@ -16,11 +16,12 @@
 # ---------------------
 # Like AM_MISSING_PROG, but only looks for install-sh.
 AC_DEFUN([AM_MISSING_INSTALL_SH],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
+[AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 if test -z "$install_sh"; then
-   for install_sh in "$ac_aux_dir/install-sh" \
-                     "$ac_aux_dir/install.sh" \
-                     "${am_missing_run}${ac_auxdir}/install-sh";
+   for install_sh in "${am_aux_dir}/install-sh" \
+                     "${am_aux_dir}/install.sh" \
+                     "${am_missing_run}${am_aux_dir}/install-sh";
    do
      test -f "$install_sh" && break
    done
@@ -36,8 +37,9 @@
 # Define MISSING if not defined so far and test if it supports --run.
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
-[test x"${MISSING+set}" = xset ||
-  MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset ||
+  MISSING="\${SHELL} ${am_aux_dir}/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run :"; then
   am_missing_run="$MISSING --run "


-- 
Alexandre Duret-Lutz