* ltcf-gcj.sh (lt_simple_link_test_code): Remove stray `(0)'.

* libtool.m4 (_AC_LIBTOOL_GCJ): Pass $CPPFLAGS on.

diff --git a/ChangeLog b/ChangeLog
index aefacdf08983e7dba69d4e0db77b1e56e5c847df..2f8fa70ff571cb5081283ea7d04b80830a86800f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-24  Alexandre Oliva  <aoliva@redhat.com>
+
+       * ltcf-gcj.sh (lt_simple_link_test_code): Remove stray `(0)'.
+       * libtool.m4 (_AC_LIBTOOL_GCJ): Pass $CPPFLAGS on.
+
 2000-11-07  Philip Blundell  <pb@futuretv.com>
 
        * Makefile.in (ETC_SUPPORT): Also add configbuild.* and configdev.*.

diff --git a/libtool.m4 b/libtool.m4
index d732789657d8a1d6651793f8c2a74587cb5fce91..cb004e223ab6a018ac8fdf34de54d7e7db1391f4 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1,5 +1,6 @@
 ## libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
-## Copyright (C) 1996-1999,2000 Free Software Foundation, Inc.
+## Copyright 1996, 1997, 1998, 1999, 2000, 2001
+## Free Software Foundation, Inc.
 ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -802,7 +803,7 @@ lt_save_CC="$CC"
 lt_save_CFLAGS="$CFLAGS"
 dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
 dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="" \
+AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
 MAGIC_CMD="$MAGIC_CMD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
 LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
 AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \

diff --git a/ltcf-gcj.sh b/ltcf-gcj.sh
index acb30c0ace15aac641af77c837cfab99a8de6eda..f82163dc1472de4a70a035808a2858ef404ebdfe 100644 (file)
--- a/ltcf-gcj.sh
+++ b/ltcf-gcj.sh
@@ -2,7 +2,7 @@
 
 # ltcf-gcj.sh - Create a GCJ compiler specific configuration
 #
-# Copyright (C) 1996-1999,2000 Free Software Foundation, Inc.
+# Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # Original GCJ support by:
@@ -38,7 +38,7 @@ objext=o
 lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {} (0); }'
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
 
 ## Linker Characteristics
 case "$host_os" in