configure.in, [...]: Ported to automake 1.9.

2004-08-19  Thomas Fitzsimmons  <fitzsim@redhat.com>
	    Michael Koch  <konqueror@gmx.de>

	* configure.in,
	Makefile.am: Ported to automake 1.9.
	* Makefile.in:
	aclocal.m4
	configure
	gcj/Makefile.in
	include/Makefile.in
	testsuite/Makefile.in
	include/config.h.in:
	Regenerated.
	* gcc/doc/install.texi: Update entry about automake for libjava.

From-SVN: r86258

ChangeLog

+2004-08-19  Michael Koch  <konqueror@gmx.de>
+
+	* gcc/doc/install.texi: Update entry about automake for libjava.
+
 2004-08-17  Robert Millan  <robertmh@gnu.org>
 
 	* configure.in: In noconfigdirs check, match GNU/k*BSD with GNU/Linux
@@ -41,6 +45,7 @@
 	in the recursive `make', instead of hardwiring `all'.
 	(Autogenerated TARGET-* variables): New.
 
+>>>>>>> 1.967
 2004-08-13  Brian Booth  <bbooth@redhat.com>
 
 	* MAINTAINERS: Remove myself from write-after-approval.

gcc/doc/install.texi

@@ -313,7 +313,7 @@ to regenerate @file{configure} and @file{config.in} files.  Most
 directories require autoconf 2.59 (exactly), but the toplevel
 still requires autoconf 2.13 (exactly).
 
-@item automake versions 1.4-gcj and 1.8.5
+@item automake versions 1.8.5 and 1.9.1
 
 Necessary when modifying a @file{Makefile.am} file to regenerate its
 associated @file{Makefile.in}.
@@ -323,9 +323,7 @@ file.  Specifically this applies to the @file{gcc}, @file{intl},
 @file{libiberty}, @file{libobjc} directories as well as any
 of their subdirectories.
 
-The Java directory @file{libjava} requires a modified version of
-automake 1.4 downloadable from
-@uref{ftp://gcc.gnu.org/pub/java/automake-gcj-1.4.tar.gz}.
+The Java directory @file{libjava} requires a automake 1.9.1.
 
 Every other directory requires automake 1.8.5.
 

libjava/ChangeLog

+2004-08-19  Thomas Fitzsimmons  <fitzsim@redhat.com>
+	    Michael Koch  <konqueror@gmx.de>
+
+	* configure.in,
+	Makefile.am: Ported to automake 1.9.
+	* Makefile.in:
+	aclocal.m4
+	configure
+	gcj/Makefile.in
+	include/Makefile.in
+	testsuite/Makefile.in
+	include/config.h.in:
+	Regenerated.
+
 2004-08-19  Tom Tromey  <tromey@redhat.com>
 
 	* java/net/DatagramSocket.java: Fixed typo.

libjava/configure.in

 dnl # Process this with autoconf to create configure
 AC_PREREQ(2.59)
-AC_INIT(java/lang/System.java)
+# Still use "libjava" here to placate dejagnu.
+AC_INIT([libjava], [version-unused],, [libjava])
+
+AC_CONFIG_SRCDIR(java/lang/System.java)
 
 # We use these options to decide which functions to include.
 AC_ARG_WITH(target-subdir,
@@ -32,13 +35,6 @@ fi
 libgcj_basedir=$srcdir/$toprel/./libjava
 AC_SUBST(libgcj_basedir)
 
-AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
-if :; then :; else
-  # This overrides the previous occurrence for automake, but not for
-  # autoconf, which is exactly what we want.
-  AC_CONFIG_AUX_DIR(..)
-fi
-
 AC_CANONICAL_SYSTEM
 _GCC_TOPLEV_NONCANONICAL_BUILD
 _GCC_TOPLEV_NONCANONICAL_TARGET
@@ -112,10 +108,7 @@ AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(LDFLAGS)
 
-# version is pulled out to make it a bit easier to change using sed.
-version=0.0.7
-# Still use "libjava" here to placate dejagnu.
-AM_INIT_AUTOMAKE(libjava, $version)
+AM_INIT_AUTOMAKE([1.9.0])
 
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
@@ -163,6 +156,8 @@ AC_SUBST(INCLTDL)
 AC_SUBST(LIBLTDL)
 AC_SUBST(DIRLTDL)
 AM_PROG_LIBTOOL
+AM_PROG_GCJ
+AM_PROG_CC_C_O
 AC_CONFIG_SUBDIRS(libltdl)
 
 if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then
@@ -382,24 +377,20 @@ AC_ARG_WITH(ecos,
 TARGET_ECOS="$with_ecos"
 )
 
-EXTRA_CC_FILES=
-AC_SUBST(EXTRA_CC_FILES)
+supply_backtrace=no
 
-PLATFORMOBJS=
 PLATFORM_INNER_NAT_HDRS=
 case "$TARGET_ECOS" in
    no) case "$host" in
       *mingw*)
             PLATFORM=Win32
 	    PLATFORMNET=Win32
-            PLATFORMOBJS=win32.lo
 	    PLATFORMH=win32.h
         CHECK_FOR_BROKEN_MINGW_LD
       ;;
       *)
             PLATFORM=Posix
 	    PLATFORMNET=Posix
-            PLATFORMOBJS=posix.lo
 	    PLATFORMH=posix.h
 	    PLATFORM_INNER_NAT_HDRS='java/lang/ConcreteProcess$$ProcessManager.h'
       ;;
@@ -409,11 +400,9 @@ case "$TARGET_ECOS" in
       PLATFORM=Ecos
       PLATFORMNET=NoNet
       AC_DEFINE(ECOS, 1, [Define if you're running eCos.])
-      PLATFORMOBJS=posix.lo
       PLATFORMH=posix.h
       ;;
 esac
-AC_SUBST(PLATFORMOBJS)
 AC_SUBST(PLATFORM_INNER_NAT_HDRS)
 AC_CONFIG_LINKS(include/platform.h:include/$PLATFORMH)
 
@@ -426,6 +415,9 @@ AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1,
 AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1,
                                            [Define if you have u_int32_t]))
 
+AM_CONDITIONAL(USING_WIN32_PLATFORM, test "$PLATFORM" = Win32)
+AM_CONDITIONAL(USING_POSIX_PLATFORM, test "$PLATFORM" = Posix)
+AM_CONDITIONAL(USING_ECOS_PLATFORM, test "$PLATFORM" = Ecos)
 
 # These may not be defined in a non-ANS conformant embedded system.
 # FIXME: Should these case a runtime exception in that case?
@@ -569,7 +561,6 @@ AC_ARG_ENABLE(java-gc,
 GCLIBS=
 GCINCS=
 GCDEPS=
-GCOBJS=
 GCSPEC=
 JC1GCSPEC=
 GCTESTSPEC=
@@ -587,7 +578,6 @@ case "$GC" in
     ;;
  no)
     AC_MSG_RESULT(none)
-    GCOBJS=nogc.lo
     GCHDR=no-gc.h
     ;;
  *)
@@ -597,11 +587,12 @@ esac
 AC_SUBST(GCLIBS)
 AC_SUBST(GCINCS)
 AC_SUBST(GCDEPS)
-AC_SUBST(GCOBJS)
 AC_SUBST(GCSPEC)
 AC_SUBST(JC1GCSPEC)
 AC_SUBST(GCTESTSPEC)
 AC_CONFIG_LINKS(include/java-gc.h:include/$GCHDR)
+AM_CONDITIONAL(USING_BOEHMGC, test "$GC" = boehm)
+AM_CONDITIONAL(USING_NOGC, test "$GC" = no)
 
 
 AC_MSG_CHECKING([for thread model used by GCC])
@@ -635,7 +626,6 @@ THREADLDFLAGS=
 THREADLIBS=
 THREADINCS=
 THREADDEPS=
-THREADOBJS=
 THREADH=
 THREADSPEC=
 case "$THREADS" in
@@ -674,7 +664,6 @@ case "$THREADS" in
 	THREADSPEC=-lpthread
 	;;
     esac
-    THREADOBJS=posix-threads.lo
     THREADH=posix-threads.h
     # MIT pthreads doesn't seem to have the mutexattr functions.
     # But for now we don't check for it.  We just assume you aren't
@@ -690,12 +679,10 @@ case "$THREADS" in
     ;;
 
  win32)
-    THREADOBJS=win32-threads.lo
     THREADH=win32-threads.h
     ;;
 
  none)
-    THREADOBJS=no-threads.lo
     THREADH=no-threads.h
     ;;
 esac
@@ -703,10 +690,12 @@ AC_CONFIG_LINKS(include/java-threads.h:include/$THREADH)
 AC_SUBST(THREADLIBS)
 AC_SUBST(THREADINCS)
 AC_SUBST(THREADDEPS)
-AC_SUBST(THREADOBJS)
 AC_SUBST(THREADSPEC)
 AC_SUBST(THREADLDFLAGS)
 AC_SUBST(THREADCXXFLAGS)
+AM_CONDITIONAL(USING_POSIX_THREADS, test "$THREADS" = posix)
+AM_CONDITIONAL(USING_WIN32_THREADS, test "$THREADS" = win32)
+AM_CONDITIONAL(USING_NO_THREADS, test "$THREADS" = none)
 
 if test -d sysdep; then true; else mkdir sysdep; fi
 AC_CONFIG_LINKS(sysdep/locks.h:sysdep/$sysdeps_dir/locks.h)
@@ -772,7 +761,7 @@ else
        mips*-*-linux*)
          # Has broken backtrace(), but we supply our own.
          if test -d sysdep; then true; else mkdir -p sysdep; fi
-         EXTRA_CC_FILES="${EXTRA_CC_FILES} sysdep/dwarf2-backtrace.cc"
+	 supply_backtrace=yes
          AC_DEFINE(HAVE_BACKTRACE, 1,
            [Define if your platform has a working backtrace() function.])
          ;;
@@ -1020,6 +1009,7 @@ else
       AC_CHECK_LIB(dl, main, SYSTEMSPEC="$SYSTEMSPEC -ldl")
    fi
 fi
+AM_CONDITIONAL(SUPPLY_BACKTRACE, test "$supply_backtrace" = yes)
 
 if test -z "${with_multisubdir}"; then
    builddotdot=.

libjava/include/config.h.in

@@ -375,6 +375,9 @@
 /* Define if getuid() and friends are missing. */
 #undef NO_GETUID
 
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
 /* Name of package */
 #undef PACKAGE