This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
autoconf 2.50 updates - libjava
- To: gcc-patches at gcc dot gnu dot org, java-patches at gcc dot gnu dot org
- Subject: autoconf 2.50 updates - libjava
- From: "Zack Weinberg" <zackw at stanford dot edu>
- Date: Sat, 26 May 2001 12:04:26 -0700
Continuing to break things up by directory. libjava isn't set up for
cross compilation, which makes life easier (no LIB_AC_PROG_CC to deal
with). These are pretty straightforward.
--
zw The phrase causes storage to be reserved, doesn't mean that it causes
storage to be reserved. This is a fundamental misunderstanding of
Standardese.
-- Mike Stump
* aclocal.m4 (LIBGCJ_CONFIGURE): Don't call AC_CANONICAL_HOST
or AC_CANONICAL_BUILD here (configure.in has already done
AC_CANONICAL_SYSTEM for us).
* configure.host: Rename AM_RUNTESTFLAGS to GCJ_RUNTESTFLAGS.
* configure.in: Call AC_CONFIG_SUBDIRS conditionally and with
a literal argument, instead of unconditionally with a variable
argument. Use 3-arg form of AC_DEFINE for JV_HASH_SYNCHRONIZATION.
* configure, include/config.h.in: Regenerate.
* libltdl/aclocal.m4: Break dependency loop between
AC_LTDL_SYMBOL_USCORE and AC_LTDL_DLSYM_USCORE.
* libltdl/configure: Regenerate.
* testsuite/Makefile.am: Set RUNTESTFLAGS from @GCJ_RUNTESTFLAGS@
to match configure.host.
* testsuite/Makefile.in: Regenerate (by hand).
===================================================================
Index: aclocal.m4
--- aclocal.m4 2000/09/14 08:01:12 1.14
+++ aclocal.m4 2001/05/26 18:59:39
@@ -35,8 +35,6 @@ else
fi
AC_SUBST(libgcj_basedir)
-AC_CANONICAL_HOST
-
dnl This shouldn't be needed, as long as top-level dependencies are
dnl defined correctly and shared-library paths are set up so that
dnl execution tests succeed. FIXME.
@@ -50,12 +48,6 @@ dnl version is pulled out to make it a b
version=0.0.7
dnl Still use "libjava" here to placate dejagnu.
AM_INIT_AUTOMAKE(libjava, $version)
-
-# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD). If we dont
-# run it explicitly here, it will be run implicitly before
-# LIBGCJ_CONFIGURE, which doesn't work because that means that it will
-# be run before AC_CANONICAL_HOST.
-AC_CANONICAL_BUILD
AC_CHECK_TOOL(AS, as)
AC_CHECK_TOOL(AR, ar)
===================================================================
Index: configure.host
--- configure.host 2001/05/24 05:40:36 1.20
+++ configure.host 2001/05/26 18:59:39
@@ -39,7 +39,10 @@ case "${target_optspace}:${host}" in
;;
esac
-AM_RUNTESTFLAGS=
+# This can't be called RUNTESTFLAGS, or automake pukes.
+# It can't be called AM_RUNTESTFLAGS either, or autoconf 2.50 pukes.
+# Aaargh.
+GCJ_RUNTESTFLAGS=
# Set any host dependent compiler flags.
# THIS TABLE IS SORTED. KEEP IT THAT WAY.
@@ -53,7 +56,7 @@ case "${host}" in
mips-tx39-*|mipstx39-unknown-*)
libgcj_flags="${libgcj_flags} -G 0"
LDFLAGS="$LDFLAGS -Tjmr3904dram.ld"
- AM_RUNTESTFLAGS="--target_board=jmr3904-sim"
+ GCJ_RUNTESTFLAGS="--target_board=jmr3904-sim"
# Use "Ecos" processes since they are a no-op.
PROCESS=Ecos
enable_java_net_default=no
===================================================================
Index: configure.in
--- configure.in 2001/05/24 18:03:47 1.87
+++ configure.in 2001/05/26 18:59:39
@@ -31,7 +31,9 @@ AC_SUBST(INCLTDL)
AC_SUBST(LIBLTDL)
AC_SUBST(DIRLTDL)
AM_PROG_LIBTOOL
-AC_CONFIG_SUBDIRS($DIRLTDL)
+if test -z "${with_cross_host}"; then
+ AC_CONFIG_SUBDIRS(libltdl)
+fi
if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then
COMPPATH=.
@@ -357,7 +359,8 @@ HASH_SYNC_SPEC=
# Hash synchronization is only useful with posix threads right now.
if test "$enable_hash_synchronization" = yes && test "$THREADS" = "posix"; then
HASH_SYNC_SPEC=-fhash-synchronization
- AC_DEFINE(JV_HASH_SYNCHRONIZATION)
+ AC_DEFINE(JV_HASH_SYNCHRONIZATION, 1,
+[Define if libjava should use a global hash table for monitor locks.])
fi
AC_SUBST(HASH_SYNC_SPEC)
@@ -668,8 +671,7 @@ gcjvers="`$GCJ -v 2>&1 | sed -n 's/^.*ve
changequote([,])
AC_DEFINE_UNQUOTED(GCJVERSION, "$gcjvers")
AC_SUBST(GCJVERSION)
-
-AC_SUBST(AM_RUNTESTFLAGS)
+AC_SUBST(GCJ_RUNTESTFLAGS)
dnl Work around a g++ bug. Reported to gcc-bugs@gcc.gnu.org on Jan 22, 2000.
AC_MSG_CHECKING([for g++ -ffloat-store bug])
===================================================================
Index: libltdl/aclocal.m4
--- libltdl/aclocal.m4 2000/09/10 08:04:40 1.2
+++ libltdl/aclocal.m4 2001/05/26 18:59:39
@@ -848,7 +848,7 @@ AC_REQUIRE([AC_LTDL_SYSSEARCHPATH])dnl
AC_REQUIRE([AC_LTDL_OBJDIR])dnl
AC_REQUIRE([AC_LTDL_DLPREOPEN])dnl
AC_REQUIRE([AC_LTDL_DLLIB])dnl
-AC_REQUIRE([AC_LTDL_SYMBOL_USCORE])dnl
+AC_REQUIRE([AC_LTDL_DLSYM_USCORE])dnl
])
AC_DEFUN(AC_LTDL_ENABLE_INSTALL,
@@ -1192,7 +1192,6 @@ fi
rm -rf conftest*
])
AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
-AC_LTDL_DLSYM_USCORE
])
AC_DEFUN(AC_LTDL_DLSYM_USCORE,
===================================================================
Index: testsuite/Makefile.am
--- testsuite/Makefile.am 2001/04/04 23:38:53 1.2
+++ testsuite/Makefile.am 2001/05/26 18:59:40
@@ -11,5 +11,5 @@ RUNTEST = `if [ -f $(top_srcdir)/../deja
echo $(top_srcdir)/../dejagnu/runtest ; \
else echo runtest; fi`
-RUNTESTFLAGS = @AM_RUNTESTFLAGS@
+RUNTESTFLAGS = @GCJ_RUNTESTFLAGS@
===================================================================
Index: testsuite/Makefile.in
--- testsuite/Makefile.in 2001/05/24 05:40:37 1.29
+++ testsuite/Makefile.in 2001/05/26 18:59:40
@@ -134,7 +134,7 @@ RUNTEST = `if [ -f $(top_srcdir)/../deja
else echo runtest; fi`
-RUNTESTFLAGS = @AM_RUNTESTFLAGS@
+RUNTESTFLAGS = @GCJ_RUNTESTFLAGS@
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = ../include/config.h ../gcj/libgcj-config.h
CONFIG_CLEAN_FILES =