PatchSet 7523
Date: 2007/08/07 20:21:44
Author: robilad
Branch: HEAD
Tag: (none)
Log:
2007-08-07 Dalibor Topic <[EMAIL PROTECTED]>
* configure.ac, kaffe/kaffe/version.c (printShortVersion): Updated
copyright year.
* configure.ac: Simplified java compiler checking. Error out if no
compiler
is selected. Fixes bug #87. Added comment for zlib detection. Cleaned up
comments for classpath configure invocation.
Members:
ChangeLog:1.5021->1.5022
configure:1.592->1.593
configure.ac:1.266->1.267
kaffe/kaffe/version.c:1.18->1.19
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5021 kaffe/ChangeLog:1.5022
--- kaffe/ChangeLog:1.5021 Tue Aug 7 19:04:41 2007
+++ kaffe/ChangeLog Tue Aug 7 20:21:44 2007
@@ -1,5 +1,14 @@
2007-08-07 Dalibor Topic <[EMAIL PROTECTED]>
+ * configure.ac, kaffe/kaffe/version.c (printShortVersion): Updated
+ copyright year.
+
+ * configure.ac: Simplified java compiler checking. Error out if no
compiler
+ is selected. Fixes bug #87. Added comment for zlib detection. Cleaned up
+ comments for classpath configure invocation.
+
+2007-08-07 Dalibor Topic <[EMAIL PROTECTED]>
+
* FAQ/FAQ.win32: Updated for Kazayuki Shudo's PIC patch.
2007-08-07 Kazuyuki Shudo <[EMAIL PROTECTED]>
Index: kaffe/configure
diff -u kaffe/configure:1.592 kaffe/configure:1.593
--- kaffe/configure:1.592 Tue Aug 7 13:38:17 2007
+++ kaffe/configure Tue Aug 7 20:21:45 2007
@@ -9,7 +9,7 @@
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
#
-# Copyright 1996 - 2006 Kaffe.org project contributors. All rights reserved.
+# Copyright 1996 - 2007 Kaffe.org project contributors. All rights reserved.
# Portions Copyright 1996 - 2002 Transvirtual Technologies, Inc.
# Portions Copyright by various third parties, see file THIRDPARTY for details.
#
@@ -1910,7 +1910,7 @@
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
-Copyright 1996 - 2006 Kaffe.org project contributors. All rights reserved.
+Copyright 1996 - 2007 Kaffe.org project contributors. All rights reserved.
Portions Copyright 1996 - 2002 Transvirtual Technologies, Inc.
Portions Copyright by various third parties, see file THIRDPARTY for details.
@@ -26636,6 +26636,9 @@
+{ echo "$as_me:$LINENO: checking whether to use jikes" >&5
+echo $ECHO_N "checking whether to use jikes... $ECHO_C" >&6; }
+
# Check whether --with-jikes was given.
if test "${with_jikes+set}" = set; then
withval=$with_jikes;
@@ -26649,40 +26652,27 @@
use_jikes="no"
fi
+{ echo "$as_me:$LINENO: result: $use_jikes" >&5
+echo "${ECHO_T}$use_jikes" >&6; }
if test x"$use_ecj" = x"no" ; then
if test x"$use_jikes" = x"no"; then
use_jikes="yes";
- JIKESPROG="jikes";
+ { echo "$as_me:$LINENO: No java compiler selected, picking jikes." >&5
+echo "$as_me: No java compiler selected, picking jikes." >&6;}
fi
fi
-{ echo "$as_me:$LINENO: checking whether to use jikes" >&5
-echo $ECHO_N "checking whether to use jikes... $ECHO_C" >&6; }
-
case $use_jikes in
yes)
if test x"$JIKESPROG" = x"" ; then
- if test x$use_glibj_zip = xtrue ; then
- { echo "$as_me:$LINENO: WARNING: No jikes compiler found. It is
required to build the regression tests. Recommended is jikes version 1.21 or
higher." >&5
-echo "$as_me: WARNING: No jikes compiler found. It is required to build the
regression tests. Recommended is jikes version 1.21 or higher." >&2;}
- else
- { { echo "$as_me:$LINENO: error: No jikes compiler found. It is
required to build Kaffe's class library. Recommended is jikes version 1.21 or
higher." >&5
-echo "$as_me: error: No jikes compiler found. It is required to build Kaffe's
class library. Recommended is jikes version 1.21 or higher." >&2;}
+ { { echo "$as_me:$LINENO: error: No jikes compiler found. Please
install jikes version 1.21 or higher." >&5
+echo "$as_me: error: No jikes compiler found. Please install jikes version
1.21 or higher." >&2;}
{ (exit 1); exit 1; }; }
- fi
fi
JAVA_COMPILER="$JIKESPROG +Pno-switchcheck +Pno-shadow +E"
- msg_use_jikes="yes ($JAVA_COMPILER)"
- ;;
-no)
- msg_use_jikes="no"
- ;;
esac
-{ echo "$as_me:$LINENO: result: $msg_use_jikes" >&5
-echo "${ECHO_T}$msg_use_jikes" >&6; }
-
if test x"$use_ecj" = x"yes" -a x"$use_jikes" = x"yes"; then
{ { echo "$as_me:$LINENO: error: You can not chose jikes and ecj at the
same time." >&5
@@ -26690,16 +26680,6 @@
{ (exit 1); exit 1; }; }
fi
-if test x"$JAVA_COMPILER" = x; then
- if test x$use_glibj_zip = xtrue ; then
- { echo "$as_me:$LINENO: WARNING: You need a java compiler to
build kaffe's regression tests, or to pass a different external java compiler
to configure script." >&5
-echo "$as_me: WARNING: You need a java compiler to build kaffe's regression
tests, or to pass a different external java compiler to configure script." >&2;}
- else
- { { echo "$as_me:$LINENO: error: You need a java compiler to
build kaffe's class library, or to pass a different external java compiler to
configure script." >&5
-echo "$as_me: error: You need a java compiler to build kaffe's class library,
or to pass a different external java compiler to configure script." >&2;}
- { (exit 1); exit 1; }; }
- fi
-fi
{ echo "$as_me:$LINENO: checking which java compiler" >&5
echo $ECHO_N "checking which java compiler... $ECHO_C" >&6; }
{ echo "$as_me:$LINENO: result: $JAVA_COMPILER" >&5
@@ -48352,7 +48332,6 @@
# Preset the compiler to jikes, since GNU Classpath's default is gcj.
# Unfortunately, many gcj versions are incapable of compiling GNU
# Classpath, while many versions of jikes seem to make it through. :/
-# This should be preset to gcjx, once gcjx is merged in.
if test x"$use_jikes" = x"yes"; then
ac_configure_args="$ac_configure_args --with-jikes=${JIKESPROG}"
@@ -48371,7 +48350,6 @@
fi
ac_configure_args="$ac_configure_args --with-vm=${prefix}/bin/kaffe"
-#ac_configure_args="$ac_configure_args --disable-core-jni"
ac_configure_args="$ac_configure_args --disable-examples"
ac_configure_args="$ac_configure_args --with-glibj-dir=${jrelibdir}"
ac_configure_args="$ac_configure_args --with-native-libdir=${nativedir}"
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.266 kaffe/configure.ac:1.267
--- kaffe/configure.ac:1.266 Tue Aug 7 13:38:18 2007
+++ kaffe/configure.ac Tue Aug 7 20:21:45 2007
@@ -10,7 +10,7 @@
# GPLed portions has been taken from the GPL-d configure.ac
# file of gimp-print project
-AC_COPYRIGHT([Copyright 1996 - 2006 Kaffe.org project contributors. All rights
reserved.
+AC_COPYRIGHT([Copyright 1996 - 2007 Kaffe.org project contributors. All rights
reserved.
Portions Copyright 1996 - 2002 Transvirtual Technologies, Inc.
Portions Copyright by various third parties, see file THIRDPARTY for details.
@@ -881,6 +881,8 @@
dnl =========================================================================
AC_CHECK_PROG(JIKESPROG, jikes, jikes)
+
+AC_MSG_CHECKING([whether to use jikes])
AC_ARG_WITH([jikes],
AS_HELP_STRING([--with-jikes<=JIKES>],
[Define to use jikes compiler @<:@default=yes@:>@.
If yes, use jikes +Pno-switchcheck +Pno-shadow +E]),
@@ -892,35 +894,23 @@
fi
use_jikes="yes"],
[use_jikes="no"])
+AC_MSG_RESULT($use_jikes)
if test x"$use_ecj" = x"no" ; then
if test x"$use_jikes" = x"no"; then
use_jikes="yes";
- JIKESPROG="jikes";
+ AC_MSG_NOTICE([No java compiler selected, picking jikes.])
fi
fi
-AC_MSG_CHECKING([whether to use jikes])
-
case $use_jikes in
yes)
if test x"$JIKESPROG" = x"" ; then
- if test x$use_glibj_zip = xtrue ; then
- AC_MSG_WARN([No jikes compiler found. It is required to build the
regression tests. Recommended is jikes version 1.21 or higher.])
- else
- AC_MSG_ERROR([No jikes compiler found. It is required to build
Kaffe's class library. Recommended is jikes version 1.21 or higher.])
- fi
+ AC_MSG_ERROR([No jikes compiler found. Please install jikes version
1.21 or higher.])
fi
JAVA_COMPILER="$JIKESPROG +Pno-switchcheck +Pno-shadow +E"
- msg_use_jikes="yes ($JAVA_COMPILER)"
- ;;
-no)
- msg_use_jikes="no"
- ;;
esac
-AC_MSG_RESULT($msg_use_jikes)
-
dnl =========================================================================
dnl Set the java compiler variable.
dnl =========================================================================
@@ -929,13 +919,6 @@
AC_MSG_ERROR([You can not chose jikes and ecj at the same time.])
fi
-if test x"$JAVA_COMPILER" = x; then
- if test x$use_glibj_zip = xtrue ; then
- AC_MSG_WARN([You need a java compiler to build kaffe's
regression tests, or to pass a different external java compiler to configure
script.])
- else
- AC_MSG_ERROR([You need a java compiler to build kaffe's class
library, or to pass a different external java compiler to configure script.])
- fi
-fi
AC_MSG_CHECKING([which java compiler])
AC_MSG_RESULT($JAVA_COMPILER)
@@ -2248,6 +2231,9 @@
AM_CONDITIONAL([COND_DIRECT_THREADING], [test x"$enable_direct_threading" =
x"yes"])
+dnl ------------------------------------------------------------
+dnl Ensure system installation of zlib can be used for the build
+dnl ------------------------------------------------------------
if test x"$ac_cv_header_zlib_h" != x"yes" ; then
AC_MSG_ERROR([Can't find or can't use system zlib.h])
fi
@@ -2424,7 +2410,7 @@
dnl Update args for classpath
dnl -------------------------
-dnl First we remove eventually CFLAGS from the configure call.
+dnl First we remove eventual CFLAGS from the configure call.
dnl ac_configure_args=`echo "$ac_configure_args" | sed "s%'CFLAGS=.*'%%g"`
dnl Then we add it again for config.status
dnl ac_configure_args="$ac_configure_args 'CFLAGS=${CFLAGS}'"
@@ -2434,7 +2420,6 @@
# Preset the compiler to jikes, since GNU Classpath's default is gcj.
# Unfortunately, many gcj versions are incapable of compiling GNU
# Classpath, while many versions of jikes seem to make it through. :/
-# This should be preset to gcjx, once gcjx is merged in.
if test x"$use_jikes" = x"yes"; then
ac_configure_args="$ac_configure_args --with-jikes=${JIKESPROG}"
@@ -2453,7 +2438,6 @@
fi
ac_configure_args="$ac_configure_args --with-vm=${prefix}/bin/kaffe"
-#ac_configure_args="$ac_configure_args --disable-core-jni"
ac_configure_args="$ac_configure_args --disable-examples"
ac_configure_args="$ac_configure_args --with-glibj-dir=${jrelibdir}"
ac_configure_args="$ac_configure_args --with-native-libdir=${nativedir}"
Index: kaffe/kaffe/kaffe/version.c
diff -u kaffe/kaffe/kaffe/version.c:1.18 kaffe/kaffe/kaffe/version.c:1.19
--- kaffe/kaffe/kaffe/version.c:1.18 Sat Sep 2 19:05:50 2006
+++ kaffe/kaffe/kaffe/version.c Tue Aug 7 20:21:46 2007
@@ -43,7 +43,7 @@
fprintf(versionfd, "java full version \"kaffe-1.4.2\"\n\n");
fprintf(versionfd, "%s VM \"%s\"\n\n", PACKAGE, PACKAGE_VERSION);
fprintf(versionfd, "%s",
- _("Copyright (c) 1996-2006 Kaffe.org project
contributors (please see\n"
+ _("Copyright (c) 1996-2007 Kaffe.org project
contributors (please see\n"
" the source code for a full list of contributors).
All rights reserved.\n"
"Portions Copyright (c) 1996-2002 Transvirtual
Technologies, Inc.\n\n"
"The Kaffe virtual machine is free software, licensed
under the terms of\n"
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
