git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libgcj/22622 (gnu/classpath/Configuration.java being grep'ed for before created) 

PR libgcj/22622:
	* configure: Rebuilt.
	* configure.ac: Correctly create Configuration.java (for
	temporary use).

From-SVN: r103362
This commit is contained in:
Tom Tromey 2005-08-22 22:39:11 +00:00 committed by Tom Tromey
parent 029e5fc0c5
commit 10cbe699ce
3 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -1,3 +1,10 @@
2005-08-22 Tom Tromey <tromey@redhat.com>
PR libgcj/22622:
* configure: Rebuilt.
* configure.ac: Correctly create Configuration.java (for
temporary use).
2005-08-22 Kelley Cook <kcook@gcc.gnu.org> 2005-08-22 Kelley Cook <kcook@gcc.gnu.org>
* Makefile.am (ACLOCAL_AMFLAGS): Also include "..". * Makefile.am (ACLOCAL_AMFLAGS): Also include "..".

15
libjava/configure vendored
View File

@ -13442,14 +13442,21 @@ CPPFLAGS="$CPPFLAGS -I`${PWDCMD-pwd}` -I`cd $srcdir && ${PWDCMD-pwd}`"
if test ! -f gnu/classpath/Configuration.java; then if test ! -f gnu/classpath/Configuration.java; then
test -d gnu || mkdir gnu test -d gnu || mkdir gnu
test -d gnu/classpath || mkdir gnu/classpath test -d gnu/classpath || mkdir gnu/classpath
sed -e "s,@LIBGCJDEBUG@,$LIBGCJDEBUG," \ # Note that it is not crucial that all the values here be correct.
-e "s,@TOOLKIT@,$TOOLKIT," \ sed -e "s,@prefix@,$prefix," \
< $srcdir/gnu/classpath/Configuration.java.in \ -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 > gnu/classpath/Configuration.java
# We do not want to redirect the output of the grep below to /dev/null, # 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 # 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. # 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
{ { echo "$as_me:$LINENO: error: configure.ac is missing the substitutions above" >&5 { { echo "$as_me:$LINENO: error: configure.ac is missing the substitutions above" >&5
echo "$as_me: error: configure.ac is missing the substitutions above" >&2;} echo "$as_me: error: configure.ac is missing the substitutions above" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }

15
libjava/configure.ac
View File

@ -1151,14 +1151,21 @@ CPPFLAGS="$CPPFLAGS -I`${PWDCMD-pwd}` -I`cd $srcdir && ${PWDCMD-pwd}`"
if test ! -f gnu/classpath/Configuration.java; then if test ! -f gnu/classpath/Configuration.java; then
test -d gnu || mkdir gnu test -d gnu || mkdir gnu
test -d gnu/classpath || mkdir gnu/classpath test -d gnu/classpath || mkdir gnu/classpath
sed -e "s,@LIBGCJDEBUG@,$LIBGCJDEBUG," \ # Note that it is not crucial that all the values here be correct.
-e "s,@TOOLKIT@,$TOOLKIT," \ sed -e "s,@prefix@,$prefix," \
< $srcdir/gnu/classpath/Configuration.java.in \ -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 > gnu/classpath/Configuration.java
# We do not want to redirect the output of the grep below to /dev/null, # 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 # 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. # 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]) AC_MSG_ERROR([configure.ac is missing the substitutions above])
fi fi
fi fi