diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index a8bb7226ab8..1f239d92b25 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,5 +1,8 @@ 2004-02-26 Nathanael Nerode + * configure.in: Remove more obsolete, bogus code. + * configure: Regenerate. + * acinclude.m4: Remove obsolete and bogus constructs. * aclocal.m4: Regenerate. * configure: Regnerate. diff --git a/boehm-gc/configure b/boehm-gc/configure index b5ff18c5714..928944aacc4 100755 --- a/boehm-gc/configure +++ b/boehm-gc/configure @@ -4726,16 +4726,6 @@ fi MAINT=$MAINTAINER_MODE_TRUE -# automake wants to see AC_EXEEXT. But we don't need it. And having -# it is actually a problem, because the compiler we're passed can't -# necessarily do a full link. So we fool automake here. -if false; then - # autoconf 2.50 runs AC_EXEEXT by default, and the macro expands - # to nothing, so nothing would remain between `then' and `fi' if it - # were not for the `:' below. - : - -fi echo "$as_me:$LINENO: checking for thread model used by GCC" >&5 echo $ECHO_N "checking for thread model used by GCC... $ECHO_C" >&6 @@ -5867,17 +5857,6 @@ if test "${with_cross_host+set}" = set; then fi; -# automake wants to see AC_EXEEXT. But we don't need it. And having -# it is actually a problem, because the compiler we're passed can't -# necessarily do a full link. So we fool automake here. -if false; then - # autoconf 2.50 runs AC_EXEEXT by default, and the macro expands - # to nothing, so nothing would remain between `then' and `fi' if it - # were not for the `:' below. - : - -fi - echo "$as_me:$LINENO: checking whether Solaris gcc optimization fix is necessary" >&5 echo $ECHO_N "checking whether Solaris gcc optimization fix is necessary... $ECHO_C" >&6 case "$host" in diff --git a/boehm-gc/configure.in b/boehm-gc/configure.in index 5d1c88f1bb8..e58ca15424c 100644 --- a/boehm-gc/configure.in +++ b/boehm-gc/configure.in @@ -81,16 +81,6 @@ AC_ARG_WITH(cross-host, [ --with-cross-host=HOST configuring with a cross compiler]) AM_MAINTAINER_MODE -# automake wants to see AC_EXEEXT. But we don't need it. And having -# it is actually a problem, because the compiler we're passed can't -# necessarily do a full link. So we fool automake here. -if false; then - # autoconf 2.50 runs AC_EXEEXT by default, and the macro expands - # to nothing, so nothing would remain between `then' and `fi' if it - # were not for the `:' below. - : - AC_EXEEXT -fi AC_MSG_CHECKING([for thread model used by GCC]) THREADS=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` @@ -214,7 +204,7 @@ AC_MSG_RESULT($THREADLIBS) esac AC_SUBST(THREADLIBS) -case "$host" in +case "$host" in powerpc-*-darwin*) powerpc_darwin=true ;; @@ -225,7 +215,7 @@ AM_CONDITIONAL(POWERPC_DARWIN,test x$powerpc_darwin = xtrue) # dyld calls anyway case "$host" in *-*-darwin*) ;; - *) + *) AC_CHECK_LIB(dl, dlopen, EXTRA_TEST_LIBS="$EXTRA_TEST_LIBS -ldl") ;; esac @@ -296,7 +286,7 @@ esac # some variations of Power PC, where trampolines don't contain # executable code. # -AC_MSG_CHECKING(which machine-dependent code should be used) +AC_MSG_CHECKING(which machine-dependent code should be used) machdep= case "$host" in alpha*-*-openbsd*) @@ -321,8 +311,8 @@ case "$host" in ;; mips-nec-sysv*|mips-unknown-sysv*) ;; - mips*-*-linux*) - ;; + mips*-*-linux*) + ;; mips-*-*) machdep="mips_sgi_mach_dep.lo" ;; @@ -361,7 +351,7 @@ ac_is_dgux=no AC_CHECK_HEADER(sys/dg_sys_info.h, [ac_is_dgux=yes;]) -AC_MSG_RESULT($ac_is_dgux) +AC_MSG_RESULT($ac_is_dgux) ## :GOTCHA: we do not check anything but sys/dg_sys_info.h if test $ac_is_dgux = yes; then if test "$enable_full_debug" = "yes"; then @@ -382,17 +372,6 @@ AC_ARG_WITH(target-subdir, AC_ARG_WITH(cross-host, [ --with-cross-host=HOST configuring with a cross compiler]) -# automake wants to see AC_EXEEXT. But we don't need it. And having -# it is actually a problem, because the compiler we're passed can't -# necessarily do a full link. So we fool automake here. -if false; then - # autoconf 2.50 runs AC_EXEEXT by default, and the macro expands - # to nothing, so nothing would remain between `then' and `fi' if it - # were not for the `:' below. - : - AC_EXEEXT -fi - dnl As of 4.13a2, the collector will not properly work on Solaris when dnl built with gcc and -O. So we remove -O in the appropriate case. dnl