diff options
Diffstat (limited to 'libjava/configure.ac')
| -rw-r--r-- | libjava/configure.ac | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac index 22050ee..2b39801e 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1151,14 +1151,21 @@ CPPFLAGS="$CPPFLAGS -I`${PWDCMD-pwd}` -I`cd $srcdir && ${PWDCMD-pwd}`" 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 |