diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | TODO | 12 | ||||
| -rw-r--r-- | m4/strip.m4 | 29 |
3 files changed, 23 insertions, 24 deletions
@@ -1,3 +1,9 @@ +2001-02-18 Tom Tromey <tromey@redhat.com> + + * 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. + 2001-02-17 Raja R Harinath <harinath@cs.umn.edu> * depcomp (gcc3): Protect against the compiler deleting @@ -192,18 +192,6 @@ Tom: Then have automake know about fnmatch.h. [ probably should wait for autoconf to get right functionality ] -* Allow per-object cflags: - bin_PROGRAMS = foo - foo_CFLAGS = -DFOO -* per-object compiler flags do not apply to libobjs - -> give error in this case -* At the same time, allow sources in subdirs: - foo_SOURCES = x/y.c - This requires `mkdir x' at build time - [ both of these require per-file rules, and not pattern rules ] - [ use user-written suffix rules to generate the per-file rules in - an automatic way -- this would be mucho cool ] - * Every program foo has FOOFLAGS right now. It should also have AM_FOOFLAGS, which can be set in Makefile.am. DONE: but needs to be documented 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]) +#]) |