diff options
| author | Ian Lance Taylor <ian@airs.com> | 1998-08-12 19:01:16 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 1998-08-12 19:01:16 +0000 |
| commit | 15ec5eb33b983e2900205cffd919cca52f8e1394 (patch) | |
| tree | 6d2afac780ab30ffc3f0bb65cee24dd264058d23 /gprof/aclocal.m4 | |
| parent | 24ec5f63f7f7f0bb0d2369666bcdd1a5666e63d0 (diff) | |
| download | gdb-15ec5eb33b983e2900205cffd919cca52f8e1394.zip gdb-15ec5eb33b983e2900205cffd919cca52f8e1394.tar.gz gdb-15ec5eb33b983e2900205cffd919cca52f8e1394.tar.bz2 | |
* configure, Makefile.in, aclocal.m4: Rebuild with current tools.
Diffstat (limited to 'gprof/aclocal.m4')
| -rw-r--r-- | gprof/aclocal.m4 | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/gprof/aclocal.m4 b/gprof/aclocal.m4 index 35400dd..8878e11 100644 --- a/gprof/aclocal.m4 +++ b/gprof/aclocal.m4 @@ -112,11 +112,12 @@ fi AC_SUBST($1)]) -# serial 24 AM_PROG_LIBTOOL +# serial 25 AM_PROG_LIBTOOL AC_DEFUN(AM_PROG_LIBTOOL, [AC_REQUIRE([AM_ENABLE_SHARED])dnl AC_REQUIRE([AM_ENABLE_STATIC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl AC_REQUIRE([AC_PROG_RANLIB])dnl AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AM_PROG_LD])dnl @@ -172,9 +173,13 @@ esac CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ DLLTOOL="$DLLTOOL" AS="$AS" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ +${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ || AC_MSG_ERROR([libtool configure failed]) + +# Redirect the config.log output again, so that the ltconfig log is not +# clobbered by the next message. +exec 5>>./config.log ]) # AM_ENABLE_SHARED - implement the --enable-shared flag @@ -185,10 +190,8 @@ AC_DEFUN(AM_ENABLE_SHARED, [define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(shared, changequote(<<, >>)dnl -<< --enable-shared build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT] +<< --enable-shared[=PKGS] build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT], changequote([, ])dnl -[ --enable-shared=PKGS only build shared libraries if the current package - appears as an element in the PKGS list], [p=${PACKAGE-default} case "$enableval" in yes) enable_shared=yes ;; @@ -224,10 +227,8 @@ AC_DEFUN(AM_ENABLE_STATIC, [define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(static, changequote(<<, >>)dnl -<< --enable-static build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT] +<< --enable-static[=PKGS] build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT], changequote([, ])dnl -[ --enable-static=PKGS only build shared libraries if the current package - appears as an element in the PKGS list], [p=${PACKAGE-default} case "$enableval" in yes) enable_static=yes ;; @@ -326,7 +327,10 @@ fi]) AC_DEFUN(AM_PROG_NM, [AC_MSG_CHECKING([for BSD-compatible nm]) AC_CACHE_VAL(ac_cv_path_NM, -[if test -z "$NM"; then +[if test -n "$NM"; then + # Let the user override the test. + ac_cv_path_NM="$NM" +else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do test -z "$ac_dir" && ac_dir=. @@ -346,8 +350,6 @@ AC_CACHE_VAL(ac_cv_path_NM, done IFS="$ac_save_ifs" test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm -else - ac_cv_path_NM="$NM" # Let the user override the test with a path. fi]) NM="$ac_cv_path_NM" AC_MSG_RESULT([$NM]) |