This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: fix PR libgcj/22622
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 22 Aug 2005 16:31:23 -0600
- Subject: Patch: FYI: fix PR libgcj/22622
- Reply-to: tromey at redhat dot com
I'm checking this in on the trunk.
This fixes PR 22622. We weren't looking for Configuration.java.in in
the right place.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
PR libgcj/22622:
* configure: Rebuilt.
* configure.ac: Correctly create Configuration.java (for
temporary use).
Index: configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.ac,v
retrieving revision 1.36
diff -u -r1.36 configure.ac
--- configure.ac 19 Aug 2005 05:14:11 -0000 1.36
+++ configure.ac 22 Aug 2005 22:35:05 -0000
@@ -1151,14 +1151,21 @@
if test ! -f gnu/classpath/Configuration.java; then
test -d gnu || mkdir gnu
test -d gnu/classpath || mkdir gnu/classpath
- sed -e "s,@LIBGCJDEBUG@,$LIBGCJDEBUG," \
- -e "s,@TOOLKIT@,$TOOLKIT," \
- < $srcdir/gnu/classpath/Configuration.java.in \
+ # Note that it is not crucial that all the values here be correct.
+ sed -e "s,@prefix@,$prefix," \
+ -e "s,@VERSION@,$VERSION," \
+ -e "s,@LIBDEBUG@,false," \
+ -e "s,@INIT_LOAD_LIBRARY@,false," \
+ -e "s,@@,$LIBGCJDEBUG," \
+ -e "s,@default_toolkit@,$TOOLKIT," \
+ -e "s,@JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@,false," \
+ -e "s,@GTK_CAIRO_ENABLED@,false," \
+ < $srcdir/classpath/gnu/classpath/Configuration.java.in \
> gnu/classpath/Configuration.java
# We do not want to redirect the output of the grep below to /dev/null,
# but we add /dev/null to the input list so that grep will print the
# filename of Configuration.java in case it finds any matches.
- if grep @ gnu/classpath/Configuration.java /dev/null; then
+ if grep '@.*@' gnu/classpath/Configuration.java /dev/null; then
AC_MSG_ERROR([configure.ac is missing the substitutions above])
fi
fi