From 50fb79778f49e57f1f5d72a05e296d94b6c1c05e Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sun, 29 Jun 1997 03:21:56 +0000 Subject: [PATCH] * aclocal.m4, configure, Makefile.in: Rebuild with automake 1.2. --- gprof/ChangeLog | 4 ++ gprof/Makefile.in | 2 +- gprof/aclocal.m4 | 33 ++++++++--- gprof/configure | 145 ++++++++++++++-------------------------------- 4 files changed, 74 insertions(+), 110 deletions(-) diff --git a/gprof/ChangeLog b/gprof/ChangeLog index 6ed62b40d2..134b650eff 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 28 23:20:42 1997 Ian Lance Taylor + + * aclocal.m4, configure, Makefile.in: Rebuild with automake 1.2. + Mon Jun 16 15:31:39 1997 Ian Lance Taylor * Makefile.am (INCLUDES): Add -DDEBUG. diff --git a/gprof/Makefile.in b/gprof/Makefile.in index efabebf1d3..e15f98d646 100644 --- a/gprof/Makefile.in +++ b/gprof/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.1p from Makefile.am +# Makefile.in generated automatically by automake 1.2 from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation diff --git a/gprof/aclocal.m4 b/gprof/aclocal.m4 index 619693b5b4..d5e10efc4d 100644 --- a/gprof/aclocal.m4 +++ b/gprof/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.1n +dnl aclocal.m4 generated automatically by aclocal 1.2 # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. @@ -15,6 +15,10 @@ PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] AC_SUBST(VERSION) +dnl test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +fi ifelse([$3],, AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION")) @@ -76,7 +80,8 @@ AC_DEFUN(AM_MISSING_PROG, [AC_MSG_CHECKING(for working $2) # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. -if ($2 --version) > /dev/null 2>&1; then +# Redirect stdin to placate older versions of autoconf. Sigh. +if ($2 --version) < /dev/null > /dev/null 2>&1; then $1=$2 AC_MSG_RESULT(found) else @@ -113,13 +118,23 @@ AC_DEFUN(AM_MAINTAINER_MODE, # Otherwise set it to "". dnl AM_CYGWIN32() +dnl You might think we can do this by checking for a cygwin32-specific +dnl cpp define. We can't, because cross-compilers that target +dnl cygwin32 don't use the .exe suffix. I don't know why. AC_DEFUN(AM_CYGWIN32, -[AC_MSG_CHECKING(for Cygwin32 environment) -AC_EGREP_CPP(lose, [ -#ifdef __CYGWIN32__ -lose -#endif], [EXEEXT=.exe -AC_MSG_RESULT(yes)], [EXEEXT= -AC_MSG_RESULT(no)]) +[AC_CACHE_CHECK(for Cygwin32 environment, am_cv_cygwin32, +[cat > conftest.$ac_ext << 'EOF' +int main () { +/* Nothing. */ +return 0; } +EOF +if AC_TRY_EVAL(ac_link) && test -s conftest.exe; then + am_cv_cygwin32=yes +else + am_cv_cygwin32=no +fi +rm -f conftest*]) +EXEEXT= +test "$am_cv_cygwin32" = yes && EXEEXT=.exe AC_SUBST(EXEEXT)]) diff --git a/gprof/configure b/gprof/configure index a1c4487675..9316acdfcd 100755 --- a/gprof/configure +++ b/gprof/configure @@ -701,6 +701,9 @@ PACKAGE=gprof VERSION=2.8.1 +if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then + { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } +fi cat >> confdefs.h <> confdefs.h <&6 -echo "configure:714: checking whether build environment is sane" >&5 +echo "configure:717: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -757,10 +760,11 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:761: checking for working aclocal" >&5 +echo "configure:764: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. -if (aclocal --version) > /dev/null 2>&1; then +# Redirect stdin to placate older versions of autoconf. Sigh. +if (aclocal --version) < /dev/null > /dev/null 2>&1; then ACLOCAL=aclocal echo "$ac_t""found" 1>&6 else @@ -769,10 +773,11 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:773: checking for working autoconf" >&5 +echo "configure:777: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. -if (autoconf --version) > /dev/null 2>&1; then +# Redirect stdin to placate older versions of autoconf. Sigh. +if (autoconf --version) < /dev/null > /dev/null 2>&1; then AUTOCONF=autoconf echo "$ac_t""found" 1>&6 else @@ -781,10 +786,11 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:785: checking for working automake" >&5 +echo "configure:790: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. -if (automake --version) > /dev/null 2>&1; then +# Redirect stdin to placate older versions of autoconf. Sigh. +if (automake --version) < /dev/null > /dev/null 2>&1; then AUTOMAKE=automake echo "$ac_t""found" 1>&6 else @@ -793,10 +799,11 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:797: checking for working autoheader" >&5 +echo "configure:803: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. -if (autoheader --version) > /dev/null 2>&1; then +# Redirect stdin to placate older versions of autoconf. Sigh. +if (autoheader --version) < /dev/null > /dev/null 2>&1; then AUTOHEADER=autoheader echo "$ac_t""found" 1>&6 else @@ -805,10 +812,11 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:809: checking for working makeinfo" >&5 +echo "configure:816: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. -if (makeinfo --version) > /dev/null 2>&1; then +# Redirect stdin to placate older versions of autoconf. Sigh. +if (makeinfo --version) < /dev/null > /dev/null 2>&1; then MAKEINFO=makeinfo echo "$ac_t""found" 1>&6 else @@ -817,7 +825,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:821: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:829: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -858,7 +866,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:862: checking for $ac_word" >&5 +echo "configure:870: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -887,7 +895,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:891: checking for $ac_word" >&5 +echo "configure:899: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -935,7 +943,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:939: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:947: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -945,11 +953,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -969,12 +977,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:973: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:981: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:978: checking whether we are using GNU C" >&5 +echo "configure:986: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -983,7 +991,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -998,7 +1006,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1002: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1010: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1036,7 +1044,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1040: checking for a BSD compatible install" >&5 +echo "configure:1048: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1087,7 +1095,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1091: checking for POSIXized ISC" >&5 +echo "configure:1099: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1206,7 +1214,7 @@ esac # automake --cygnus requires these for some reason. echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1210: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1218: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1223,89 +1231,27 @@ fi fi -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1228: checking how to run the C preprocessor" >&5 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then +echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6 +echo "configure:1236: checking for Cygwin32 environment" >&5 +if eval "test \"`echo '$''{'am_cv_cygwin32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < -Syntax Error + cat > conftest.$ac_ext << 'EOF' +int main () { +/* Nothing. */ +return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` -if test -z "$ac_err"; then - : +if { (eval echo configure:1245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest.exe; then + am_cv_cygwin32=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp -fi -rm -f conftest* + am_cv_cygwin32=no fi rm -f conftest* - ac_cv_prog_CPP="$CPP" -fi - CPP="$ac_cv_prog_CPP" -else - ac_cv_prog_CPP="$CPP" -fi -echo "$ac_t""$CPP" 1>&6 - -echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6 -echo "configure:1289: checking for Cygwin32 environment" >&5 -cat > conftest.$ac_ext <&5 | - egrep "lose" >/dev/null 2>&1; then - rm -rf conftest* - EXEEXT=.exe -echo "$ac_t""yes" 1>&6 -else - rm -rf conftest* - EXEEXT= -echo "$ac_t""no" 1>&6 fi -rm -f conftest* +echo "$ac_t""$am_cv_cygwin32" 1>&6 +EXEEXT= +test "$am_cv_cygwin32" = yes && EXEEXT=.exe trap '' 1 2 15 @@ -1483,7 +1429,6 @@ s%@BFDLIB@%$BFDLIB%g s%@HLDFLAGS@%$HLDFLAGS%g s%@HLDENV@%$HLDENV%g s%@MAINT@%$MAINT%g -s%@CPP@%$CPP%g s%@EXEEXT@%$EXEEXT%g CEOF -- 2.34.1