diff options
| author | Tom Tromey <tromey@redhat.com> | 2001-02-19 00:12:15 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2001-02-19 00:12:15 +0000 |
| commit | 03414b51330e441361cbb388d3b7d0a75fee5a90 (patch) | |
| tree | df3de0aa8b17e1579644ec83dff51d68e7022561 /m4/strip.m4 | |
| parent | c8a7b8b93bd0436ebbced621a6e4a30ba6922d6f (diff) | |
| download | automake-03414b51330e441361cbb388d3b7d0a75fee5a90.tar.gz | |
* m4/strip.m4 (AM_PROG_INSTALL_STRIP): Don't call AM_PROG_STRIP.
Set INSTALL_STRIP_PROGRAM_ENV to `$(STRIP)', not `$STRIP'.
(AM_PROG_STRIP): Commented out.
Diffstat (limited to 'm4/strip.m4')
| -rw-r--r-- | m4/strip.m4 | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/m4/strip.m4 b/m4/strip.m4 index 2948166a6..8ca63feb8 100644 --- a/m4/strip.m4 +++ b/m4/strip.m4 @@ -8,13 +8,17 @@ AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_MISSING_INSTALL_SH]) dnl Don't test for $cross_compiling = yes, it might be `maybe'... -if test "$cross_compiling" != no; then - # since we are cross-compiling, we need to check for a suitable `strip' - AM_PROG_STRIP - if test -z "$STRIP"; then - AC_MSG_WARN([strip missing, install-strip will not strip binaries]) - fi -fi +# We'd like to do this but we can't because it will unconditionally +# require config.guess. One way would be if autoconf had the capability +# to let us compile in this code only when config.guess was already +# a possibility. +#if test "$cross_compiling" != no; then +# # since we are cross-compiling, we need to check for a suitable `strip' +# AM_PROG_STRIP +# if test -z "$STRIP"; then +# AC_MSG_WARN([strip missing, install-strip will not strip binaries]) +# fi +#fi # If $STRIP is defined (either by the user, or by AM_PROG_STRIP), # instruct install-strip to use install-sh and the given $STRIP program. @@ -31,16 +35,17 @@ if test -z "$STRIP"; then else _am_dirpart="`echo $install_sh | sed -e 's,//*[[^/]]*$,,'`" INSTALL_STRIP_PROGRAM="\${SHELL} \`CDPATH=: && cd $_am_dirpart && pwd\`/install-sh -c -s" - INSTALL_STRIP_PROGRAM_ENV="STRIPPROG='$STRIP'" + INSTALL_STRIP_PROGRAM_ENV="STRIPPROG='\$(STRIP)'" fi +AC_SUBST([STRIP]) AC_SUBST([INSTALL_STRIP_PROGRAM]) AC_SUBST([INSTALL_STRIP_PROGRAM_ENV])]) -AC_DEFUN([AM_PROG_STRIP], -[# Check for `strip', unless the installer +#AC_DEFUN([AM_PROG_STRIP], +#[# Check for `strip', unless the installer # has set the STRIP environment variable. # Note: don't explicitly check for -z "$STRIP" here because # that will cause problems if AC_CANONICAL_* is AC_REQUIREd after # this macro, and anyway it doesn't have an effect anyway. -AC_CHECK_TOOL([STRIP],[strip]) -]) +#AC_CHECK_TOOL([STRIP],[strip]) +#]) |