summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--boehm-gc/ChangeLog6
-rw-r--r--boehm-gc/acinclude.m419
-rw-r--r--boehm-gc/aclocal.m419
-rwxr-xr-xboehm-gc/configure18
4 files changed, 10 insertions, 52 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 62879da7987..a8bb7226ab8 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-26 Nathanael Nerode <neroden@gcc.gnu.org>
+
+ * acinclude.m4: Remove obsolete and bogus constructs.
+ * aclocal.m4: Regenerate.
+ * configure: Regnerate.
+
2004-02-23 Nathanael Nerode <neroden@gcc.gnu.org>
* acinclude.m4: De-precious CC and CXX so that the right flags
diff --git a/boehm-gc/acinclude.m4 b/boehm-gc/acinclude.m4
index 3ae1c1771c7..7ac39d2b292 100644
--- a/boehm-gc/acinclude.m4
+++ b/boehm-gc/acinclude.m4
@@ -41,21 +41,6 @@ AC_PROG_INSTALL
AM_MAINTAINER_MODE
-# We need AC_EXEEXT to keep automake happy in cygnus mode. However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT). Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables. So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-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
-
. [$]{srcdir}/configure.host
case [$]{gc_basedir} in
@@ -74,9 +59,7 @@ dnl gc_cflags="[$]{gc_cflags} -fno-builtin"
GC_CFLAGS=${gc_cflags}
AC_SUBST(GC_CFLAGS)
-]))
-
-))))
+])
sinclude(../libtool.m4)
dnl The line below arranges for aclocal not to bring a definition of
diff --git a/boehm-gc/aclocal.m4 b/boehm-gc/aclocal.m4
index 8c5eed0386f..98e62cd04a4 100644
--- a/boehm-gc/aclocal.m4
+++ b/boehm-gc/aclocal.m4
@@ -53,21 +53,6 @@ AC_PROG_INSTALL
AM_MAINTAINER_MODE
-# We need AC_EXEEXT to keep automake happy in cygnus mode. However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT). Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables. So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-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
-
. [$]{srcdir}/configure.host
case [$]{gc_basedir} in
@@ -86,9 +71,7 @@ dnl gc_cflags="[$]{gc_cflags} -fno-builtin"
GC_CFLAGS=${gc_cflags}
AC_SUBST(GC_CFLAGS)
-]))
-
-))))
+])
sinclude(../libtool.m4)
dnl The line below arranges for aclocal not to bring a definition of
diff --git a/boehm-gc/configure b/boehm-gc/configure
index dc4bc83815e..b5ff18c5714 100755
--- a/boehm-gc/configure
+++ b/boehm-gc/configure
@@ -3393,21 +3393,6 @@ fi
-# We need AC_EXEEXT to keep automake happy in cygnus mode. However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT). Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables. So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-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
-
. ${srcdir}/configure.host
case ${gc_basedir} in
@@ -3833,6 +3818,7 @@ deplibs_check_method=$lt_cv_deplibs_check_method
+
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# Only perform the check for file, if the check method requires it
@@ -4168,7 +4154,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4171 "configure"' > conftest.$ac_ext
+ echo '#line 4157 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?