PatchSet 4174 Date: 2003/11/30 23:49:11 Author: dalibor Branch: HEAD Tag: (none) Log: Added support for GNU Crypto
Members: ChangeLog:1.1766->1.1767 Makefile.am:1.49->1.50 Makefile.in:1.117->1.118 aclocal.m4:1.71->1.72 configure:1.265->1.266 configure.in:1.231->1.232 gnu-crypto.m4:INITIAL->1.1 config/Makefile.in:1.91->1.92 developers/update-class-list:1.8->1.9 include/Makefile.in:1.126->1.127 kaffe/Makefile.in:1.83->1.84 kaffe/jvmpi/Makefile.in:1.8->1.9 kaffe/kaffe/Makefile.in:1.97->1.98 kaffe/kaffeh/Makefile.in:1.84->1.85 kaffe/kaffevm/Makefile.in:1.116->1.117 kaffe/kaffevm/gcj/Makefile.in:1.65->1.66 kaffe/kaffevm/intrp/Makefile.in:1.73->1.74 kaffe/kaffevm/jit/Makefile.in:1.79->1.80 kaffe/kaffevm/jit3/Makefile.in:1.49->1.50 kaffe/kaffevm/systems/Makefile.in:1.75->1.76 kaffe/kaffevm/systems/beos-native/Makefile.in:1.66->1.67 kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.72->1.73 kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.75->1.76 kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.45->1.46 kaffe/man/Makefile.in:1.73->1.74 kaffe/scripts/Makefile.in:1.106->1.107 kaffe/scripts/bat/Makefile.in:1.66->1.67 kaffe/scripts/compat/Makefile.in:1.89->1.90 kaffe/xprof/Makefile.in:1.41->1.42 libraries/Makefile.in:1.70->1.71 libraries/clib/Makefile.in:1.76->1.77 libraries/clib/awt/Makefile.in:1.83->1.84 libraries/clib/awt/X/Makefile.in:1.73->1.74 libraries/clib/awt/qt/Makefile.in:1.28->1.29 libraries/clib/io/Makefile.in:1.76->1.77 libraries/clib/management/Makefile.in:1.85->1.86 libraries/clib/math/Makefile.in:1.81->1.82 libraries/clib/native/Makefile.in:1.108->1.109 libraries/clib/net/Makefile.in:1.89->1.90 libraries/clib/nio/Makefile.in:1.2->1.3 libraries/clib/security/Makefile.in:1.49->1.50 libraries/clib/security/java.security:1.2->1.3 libraries/clib/zip/Makefile.in:1.83->1.84 libraries/extensions/Makefile.in:1.61->1.62 libraries/extensions/comm/Makefile.in:1.56->1.57 libraries/extensions/comm/javalib/Makefile.in:1.56->1.57 libraries/extensions/microsoft/Makefile.in:1.48->1.49 libraries/extensions/microsoft/clib/Makefile.in:1.51->1.52 libraries/extensions/microsoft/javalib/Makefile.in:1.49->1.50 libraries/extensions/pjava/Makefile.in:1.56->1.57 libraries/extensions/pjava/javalib/Makefile.in:1.56->1.57 libraries/extensions/servlet/Makefile.in:1.56->1.57 libraries/extensions/servlet/javalib/Makefile.in:1.56->1.57 libraries/extensions/sound/Makefile.in:1.24->1.25 libraries/extensions/sound/alsa/Makefile.in:1.26->1.27 libraries/extensions/sound/common/Makefile.in:1.26->1.27 libraries/extensions/sound/esd/Makefile.in:1.26->1.27 libraries/javalib/Makefile.in:1.193->1.194 replace/Makefile.in:1.20->1.21 test/Makefile.in:1.76->1.77 test/internal/Makefile.in:1.30->1.31 test/regression/Makefile.am:INITIAL->1.84 test/regression/Makefile.in:1.139->1.140 test/regression/TestGnuCrypto.java:INITIAL->1.1 test/regression/TestScript.in:1.40->1.41 test/regression/compile_time/Makefile.in:1.4->1.5 test/regression/run_time/Makefile.in:1.4->1.5 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.1766 kaffe/ChangeLog:1.1767 --- kaffe/ChangeLog:1.1766 Fri Nov 28 16:15:16 2003 +++ kaffe/ChangeLog Sun Nov 30 23:49:11 2003 @@ -1,3 +1,87 @@ +2003-11-29 Dalibor Topic <[EMAIL PROTECTED]> + + * Makefile.in, + aclocal.m4, + config/Makefile.in, + configure, + include/Makefile.in, + kaffe/Makefile.in, + kaffe/jvmpi/Makefile.in, + kaffe/kaffe/Makefile.in, + kaffe/kaffeh/Makefile.in, + kaffe/kaffevm/Makefile.in, + kaffe/kaffevm/gcj/Makefile.in, + kaffe/kaffevm/intrp/Makefile.in, + kaffe/kaffevm/jit/Makefile.in, + kaffe/kaffevm/jit3/Makefile.in, + kaffe/kaffevm/systems/Makefile.in, + kaffe/kaffevm/systems/beos-native/Makefile.in, + kaffe/kaffevm/systems/oskit-pthreads/Makefile.in, + kaffe/kaffevm/systems/unix-jthreads/Makefile.in, + kaffe/kaffevm/systems/unix-pthreads/Makefile.in, + kaffe/man/Makefile.in, + kaffe/scripts/Makefile.in, + kaffe/scripts/bat/Makefile.in, + kaffe/scripts/compat/Makefile.in, + kaffe/xprof/Makefile.in, + libraries/Makefile.in, + libraries/clib/Makefile.in, + libraries/clib/awt/Makefile.in, + libraries/clib/awt/X/Makefile.in, + libraries/clib/awt/qt/Makefile.in, + libraries/clib/io/Makefile.in, + libraries/clib/management/Makefile.in, + libraries/clib/math/Makefile.in, + libraries/clib/native/Makefile.in, + libraries/clib/net/Makefile.in, + libraries/clib/nio/Makefile.in, + libraries/clib/security/Makefile.in, + libraries/clib/zip/Makefile.in, + libraries/extensions/Makefile.in, + libraries/extensions/comm/Makefile.in, + libraries/extensions/comm/javalib/Makefile.in, + libraries/extensions/microsoft/Makefile.in, + libraries/extensions/microsoft/clib/Makefile.in, + libraries/extensions/microsoft/javalib/Makefile.in, + libraries/extensions/pjava/Makefile.in, + libraries/extensions/pjava/javalib/Makefile.in, + libraries/extensions/servlet/Makefile.in, + libraries/extensions/servlet/javalib/Makefile.in, + libraries/extensions/sound/Makefile.in, + libraries/extensions/sound/alsa/Makefile.in, + libraries/extensions/sound/common/Makefile.in, + libraries/extensions/sound/esd/Makefile.in, + libraries/javalib/Makefile.in, + replace/Makefile.in, + test/Makefile.in, + test/internal/Makefile.in, + test/regression/Makefile.in, + test/regression/TestScript.in, + test/regression/compile_time/Makefile.in, + test/regression/run_time/Makefile.in: + Regenerated. + + * libraries/clib/security/java.security: + Removed Sun's provider from list. Added GNU Crypto provider. + +2003-11-29 Raif S. Naffah <[EMAIL PROTECTED]> + + * Makefile.am + (BUILD_ENVIRONMENT-make): Added JAVAX_CRYPTO_JAR to BOOTCLASSPATH. + Added GNU_CRYPTO_JAR, JAVAX_SECURITY_JAR to CLASSPATH. + + * configure.in: Added --with-gnu-crypto. + + * developers/update-class-list: Added gnu/crypto to list of classes + not to update. + + * gnu-crypto.m4: New file. + + * test/regression/Makefile.am: + (TEST_GNU_CRYPTO) Added GNU Crypto test. + + * test/regression/TestGnuCrypto.java: New file. + 2003-11-28 Dalibor Topic <[EMAIL PROTECTED]> Reported by: Mark Wielaard <[EMAIL PROTECTED]> Index: kaffe/Makefile.am diff -u kaffe/Makefile.am:1.49 kaffe/Makefile.am:1.50 --- kaffe/Makefile.am:1.49 Tue Oct 28 16:49:54 2003 +++ kaffe/Makefile.am Sun Nov 30 23:49:12 2003 @@ -134,8 +134,8 @@ "DEBUG_ENV=$(DEBUG_ENV)" BUILD_ENVIRONMENT-make BUILD_ENVIRONMENT-make: Makefile - echo BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/rt.jar\''$(PATHSEP)'\'$(DNSJAVA_JAR)\; export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \ - echo CLASSPATH=.\''$(PATHSEP)'\'$(top_srcdir)/libraries/javalib/kjc.jar\''$(PATHSEP)'\'$(BCEL_JAR)\; export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \ + echo BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/rt.jar\''$(PATHSEP)'\'$(DNSJAVA_JAR)\'$(JAVAX_CRYPTO_JAR)\''$(PATHSEP)'\; export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \ + echo CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(top_srcdir)/libraries/javalib/kjc.jar\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\; export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \ echo KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}`for f in $(JAVA_LIBS); do echo "$$f" | sed 's%/[^/]*$$%%'; done | (tr '\012' ' '; echo) | sed -e 's/ $$//' -e "s/ /\'$(PATHSEP)\'/g"`\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \ echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA >> BUILD_ENVIRONMENT.new rm -f BUILD_ENVIRONMENT Index: kaffe/Makefile.in diff -u kaffe/Makefile.in:1.117 kaffe/Makefile.in:1.118 --- kaffe/Makefile.in:1.117 Sun Nov 23 17:46:32 2003 +++ kaffe/Makefile.in Sun Nov 30 23:49:12 2003 @@ -98,6 +98,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@ +GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@ HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@ HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@ HAVE_CONFIG_JIT_MD_H = @HAVE_CONFIG_JIT_MD_H@ @@ -119,6 +121,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JASMIN = @JASMIN@ +JAVAX_CRYPTO_JAR = @JAVAX_CRYPTO_JAR@ +JAVAX_SECURITY_JAR = @JAVAX_SECURITY_JAR@ JAVA_LIBS = @JAVA_LIBS@ JIKES = @JIKES@ JIKESPROG = @JIKESPROG@ @@ -183,6 +187,8 @@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ +USER_WANT_GNU_CRYPTO_FALSE = @USER_WANT_GNU_CRYPTO_FALSE@ +USER_WANT_GNU_CRYPTO_TRUE = @USER_WANT_GNU_CRYPTO_TRUE@ USE_COMPAT_IFADDRS_FALSE = @USE_COMPAT_IFADDRS_FALSE@ USE_COMPAT_IFADDRS_TRUE = @USE_COMPAT_IFADDRS_TRUE@ USE_JIT_FALSE = @USE_JIT_FALSE@ @@ -795,8 +801,8 @@ "DEBUG_ENV=$(DEBUG_ENV)" BUILD_ENVIRONMENT-make BUILD_ENVIRONMENT-make: Makefile - echo BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/rt.jar\''$(PATHSEP)'\'$(DNSJAVA_JAR)\; export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \ - echo CLASSPATH=.\''$(PATHSEP)'\'$(top_srcdir)/libraries/javalib/kjc.jar\''$(PATHSEP)'\'$(BCEL_JAR)\; export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \ + echo BOOTCLASSPATH=\$${BOOTCLASSPATH}\''$(PATHSEP)'\'$(top_builddir)/libraries/javalib/rt.jar\''$(PATHSEP)'\'$(DNSJAVA_JAR)\'$(JAVAX_CRYPTO_JAR)\''$(PATHSEP)'\; export BOOTCLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' > BUILD_ENVIRONMENT.new; \ + echo CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(top_srcdir)/libraries/javalib/kjc.jar\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\; export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new; \ echo KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}`for f in $(JAVA_LIBS); do echo "$$f" | sed 's%/[^/]*$$%%'; done | (tr '\012' ' '; echo) | sed -e 's/ $$//' -e "s/ /\'$(PATHSEP)\'/g"`\; export KAFFELIBRARYPATH >> BUILD_ENVIRONMENT.new; \ echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA >> BUILD_ENVIRONMENT.new rm -f BUILD_ENVIRONMENT Index: kaffe/aclocal.m4 diff -u kaffe/aclocal.m4:1.71 kaffe/aclocal.m4:1.72 --- kaffe/aclocal.m4:1.71 Sun Nov 23 17:46:32 2003 +++ kaffe/aclocal.m4 Sun Nov 30 23:49:12 2003 @@ -8722,3 +8722,138 @@ AU_DEFUN([fp_WITH_DMALLOC], [AM_WITH_DMALLOC]) +# ---------------------------------------------------------------------------- +# $Id: aclocal.m4,v 1.72 2003/11/30 23:49:12 dalibor Exp $ +# +# Copyright (C) 2003 Free Software Foundation, Inc. +# +# This file is part of GNU Crypto. +# +# GNU Crypto is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Crypto is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; see the file COPYING. If not, write to the +# +# Free Software Foundation Inc., +# 59 Temple Place - Suite 330, +# Boston, MA 02111-1307 +# USA +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give +# you permission to link this library with independent modules to +# produce an executable, regardless of the license terms of these +# independent modules, and to copy and distribute the resulting +# executable under terms of your choice, provided that you also meet, +# for each linked independent module, the terms and conditions of the +# license of that module. An independent module is a module which is +# not derived from or based on this library. If you modify this +# library, you may extend this exception to your version of the +# library, but you are not obligated to do so. If you do not wish to +# do so, delete this exception statement from your version. +# ---------------------------------------------------------------------------- +# +# GNU Crypto m4 macro for use by VM Providers +# +# $Revision: 1.72 $ +# + +# process --with-gnu-crypto configure option. +# test if the GNU Crypto package is installed. if no argument was specified +# with the option, this macro looks for a 'share/gnu-crypto.jar' file and +# a 'lib/lib-gnu-crypto.so' in the following places, in this order: +# /usr/local/gnu-crypto, /usr/local, /usr, /opt/gnu-crypto, and /opt. +# otherwise those two files are looked up under the designated location. +# in total, the following variables are set: +# +# USER_WANT_GNU_CRYPTO: an automake conditional; true if with-gnu-crypto is set, +# GNU_CRYPTO_HOME: the installation directory of GNU Crypto, +# GNU_CRYPTO_JAR: the fully qualified path to gnu-crypto.jar, +# JAVAX_CRYPTO_JAR: the fully qualified path to javax-crypto.jar, +# JAVAX_SECURITY_JAR: the fully qualified path to javax-security.jar. +# ----------------------------------------------------------------------------- +AC_DEFUN([CHECK_GNU_CRYPTO],[ +AC_ARG_WITH([gnu-crypto], + AC_HELP_STRING([--with-gnu-crypto], + [path to GNU Crypto install directory. if unspecified, /usr/local/gnu-crypto, /usr/local, /usr, /opt/gnu-crypto, and /opt are considered, in that order]), + + [if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then + AC_MSG_CHECKING([${withval}]) + _CHECK_GNU_CRYPTO_HOME(${withval}) + if test x$GNU_CRYPTO_HOME = x ; then + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find designated GNU Crypto install directory]) + else + AC_MSG_RESULT(yes) + with_gnu_crypto=true + fi + elif test "x${withval}" != xno; then + AC_MSG_NOTICE([no value supplied --with-gnu-crypto. will look in default locations]) + _FIND_GNU_CRYPTO_HOME([/usr/local/gnu-crypto /usr/local /usr /opt/gnu-crypto /opt]) + if test x$GNU_CRYPTO_HOME = x ; then + AC_MSG_ERROR([cannot find GNU Crypto install directory. install it and/or specify its location using --with-gnu-crypto]) + fi + with_gnu_crypto=true + else + with_gnu_crypto=false + fi], + [with_gnu_crypto=false]) +GNU_CRYPTO_HOME=`(cd ${GNU_CRYPTO_HOME}; pwd)` +AC_SUBST(GNU_CRYPTO_HOME) +if test -r ${GNU_CRYPTO_HOME}/share/gnu-crypto.jar ; then + GNU_CRYPTO_JAR=${GNU_CRYPTO_HOME}/share/gnu-crypto.jar + AC_SUBST(GNU_CRYPTO_JAR) +fi +if test -r ${GNU_CRYPTO_HOME}/share/javax-crypto.jar ; then + JAVAX_CRYPTO_JAR=${GNU_CRYPTO_HOME}/share/javax-crypto.jar + AC_SUBST(JAVAX_CRYPTO_JAR) +fi +if test -r ${GNU_CRYPTO_HOME}/share/javax-security.jar ; then + JAVAX_SECURITY_JAR=${GNU_CRYPTO_HOME}/share/javax-security.jar + AC_SUBST(JAVAX_SECURITY_JAR) +fi +AM_CONDITIONAL(USER_WANT_GNU_CRYPTO, test "x${with_gnu_crypto}" = xtrue) +])# CHECK_GNU_CRYPTO + + +# given a list of arguments, this macro tries repeatedly and for each element +# of the input list, to (a) assert that the argument is indeed a directory, +# and (b) it contains under it both 'lib/lib-gnu-crypto.so' and +# 'share/gnu-crypto.jar' files. +# ----------------------------------------------------------------------------- +AC_DEFUN(_FIND_GNU_CRYPTO_HOME,[ +AC_MSG_CHECKING([for GNU Crypto installation directory]) +for _F in $1 ; do + _CHECK_GNU_CRYPTO_HOME(${_F}) + if test x$GNU_CRYPTO_HOME != x ; then + break + fi +done +if test x${GNU_CRYPTO_HOME} = x ; then + AC_MSG_RESULT([not found]) +else + AC_MSG_RESULT([${GNU_CRYPTO_HOME}]) +fi])# _FIND_GNU_CRYPTO_HOME + + +# given a directory as an input, this macro checks if the two files +# 'lib/lib-gnu-crypto.so' and 'share/gnu-crypto.jar' exist under it. if they +# do, then GNU_CRYPTO_DIR is set to that argument. +# ----------------------------------------------------------------------------- +AC_DEFUN([_CHECK_GNU_CRYPTO_HOME], +[if test -r $1/lib/lib-gnu-crypto.so || test -r $1/share/gnu-crypto.jar ; then + GNU_CRYPTO_HOME=$1 +fi])# _CHECK_GNU_CRYPTO_HOME + Index: kaffe/configure diff -u kaffe/configure:1.265 kaffe/configure:1.266 --- kaffe/configure:1.265 Sun Nov 23 17:46:33 2003 +++ kaffe/configure Sun Nov 30 23:49:12 2003 @@ -467,7 +467,7 @@ #endif" ac_subdirs_all="$ac_subdirs_all libltdl" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD REGEN_FORWARD CONFIG_MD_H KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE DNSJAVA_JAR HAVE_DNSJAVA_TRUE HAVE_DNSJAVA_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR JIKESPROG JIKES KAFFEVM_TRAMPOLINES_C KVER JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JIKES_TRUE HAVE_JIKES_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS VM_LIBS NET_LIBS ZIP_LIBS MATH_LIBS SECURITY_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS LIBICONV LTLIBICONV USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK AWT_DIR COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS PROFILE USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG subdirs LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD REGEN_FORWARD CONFIG_MD_H KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE DNSJAVA_JAR HAVE_DNSJAVA_TRUE HAVE_DNSJAVA_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR JIKESPROG JIKES KAFFEVM_TRAMPOLINES_C KVER JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JIKES_TRUE HAVE_JIKES_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS VM_LIBS NET_LIBS ZIP_LIBS MATH_LIBS SECURITY_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS LIBICONV LTLIBICONV USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK AWT_DIR COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS GNU_CRYPTO_HOME GNU_CRYPTO_JAR JAVAX_CRYPTO_JAR JAVAX_SECURITY_JAR USER_WANT_GNU_CRYPTO_TRUE USER_WANT_GNU_CRYPTO_FALSE PROFILE USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG subdirs LTLIBOBJS' ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag' # Initialize some variables set by options. @@ -1090,6 +1090,10 @@ --with-extensions the extensions (like the servlet API) to include [default=none] --with-dmalloc use dmalloc, as in http://www.dmalloc.com/dmalloc.tar.gz + --with-gnu-crypto path to GNU Crypto install directory. if + unspecified, /usr/local/gnu-crypto, /usr/local, + /usr, /opt/gnu-crypto, and /opt are considered, in + that order --with-class-library-profile=PROFILE specify class library profile --with-rt-jar=ABS.PATH use precompiled kaffe class library @@ -4303,7 +4307,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4306 "configure"' > conftest.$ac_ext + echo '#line 4310 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5411,7 +5415,7 @@ # Provide some information about the compiler. -echo "$as_me:5414:" \ +echo "$as_me:5418:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6444,11 +6448,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6447: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6451: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6451: \$? = $ac_status" >&5 + echo "$as_me:6455: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6676,11 +6680,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6679: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6683: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6683: \$? = $ac_status" >&5 + echo "$as_me:6687: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6743,11 +6747,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6746: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6750: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6750: \$? = $ac_status" >&5 + echo "$as_me:6754: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8861,7 +8865,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8864 "configure" +#line 8868 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -8959,7 +8963,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8962 "configure" +#line 8966 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11111,11 +11115,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11114: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11118: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11118: \$? = $ac_status" >&5 + echo "$as_me:11122: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11178,11 +11182,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11181: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11185: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11185: \$? = $ac_status" >&5 + echo "$as_me:11189: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12507,7 +12511,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12510 "configure" +#line 12514 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12605,7 +12609,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12608 "configure" +#line 12612 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13427,11 +13431,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13430: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13434: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13434: \$? = $ac_status" >&5 + echo "$as_me:13438: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13494,11 +13498,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13497: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13501: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13501: \$? = $ac_status" >&5 + echo "$as_me:13505: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15456,11 +15460,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15459: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15463: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15463: \$? = $ac_status" >&5 + echo "$as_me:15467: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15688,11 +15692,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15691: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15695: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15695: \$? = $ac_status" >&5 + echo "$as_me:15699: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15755,11 +15759,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15758: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15762: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15762: \$? = $ac_status" >&5 + echo "$as_me:15766: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17873,7 +17877,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 17876 "configure" +#line 17880 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17971,7 +17975,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 17974 "configure" +#line 17978 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -45334,6 +45338,88 @@ + + +# Check whether --with-gnu-crypto or --without-gnu-crypto was given. +if test "${with_gnu_crypto+set}" = set; then + withval="$with_gnu_crypto" + if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then + echo "$as_me:$LINENO: checking ${withval}" >&5 +echo $ECHO_N "checking ${withval}... $ECHO_C" >&6 + if test -r ${withval}/lib/lib-gnu-crypto.so || test -r ${withval}/share/gnu-crypto.jar ; then + GNU_CRYPTO_HOME=${withval} +fi + if test x$GNU_CRYPTO_HOME = x ; then + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: cannot find designated GNU Crypto install directory" >&5 +echo "$as_me: error: cannot find designated GNU Crypto install directory" >&2;} + { (exit 1); exit 1; }; } + else + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + with_gnu_crypto=true + fi + elif test "x${withval}" != xno; then + { echo "$as_me:$LINENO: no value supplied --with-gnu-crypto. will look in default locations" >&5 +echo "$as_me: no value supplied --with-gnu-crypto. will look in default locations" >&6;} + +echo "$as_me:$LINENO: checking for GNU Crypto installation directory" >&5 +echo $ECHO_N "checking for GNU Crypto installation directory... $ECHO_C" >&6 +for _F in /usr/local/gnu-crypto /usr/local /usr /opt/gnu-crypto /opt ; do + if test -r ${_F}/lib/lib-gnu-crypto.so || test -r ${_F}/share/gnu-crypto.jar ; then + GNU_CRYPTO_HOME=${_F} +fi + if test x$GNU_CRYPTO_HOME != x ; then + break + fi +done +if test x${GNU_CRYPTO_HOME} = x ; then + echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6 +else + echo "$as_me:$LINENO: result: ${GNU_CRYPTO_HOME}" >&5 +echo "${ECHO_T}${GNU_CRYPTO_HOME}" >&6 +fi + if test x$GNU_CRYPTO_HOME = x ; then + { { echo "$as_me:$LINENO: error: cannot find GNU Crypto install directory. install it and/or specify its location using --with-gnu-crypto" >&5 +echo "$as_me: error: cannot find GNU Crypto install directory. install it and/or specify its location using --with-gnu-crypto" >&2;} + { (exit 1); exit 1; }; } + fi + with_gnu_crypto=true + else + with_gnu_crypto=false + fi +else + with_gnu_crypto=false +fi; +GNU_CRYPTO_HOME=`(cd ${GNU_CRYPTO_HOME}; pwd)` + +if test -r ${GNU_CRYPTO_HOME}/share/gnu-crypto.jar ; then + GNU_CRYPTO_JAR=${GNU_CRYPTO_HOME}/share/gnu-crypto.jar + +fi +if test -r ${GNU_CRYPTO_HOME}/share/javax-crypto.jar ; then + JAVAX_CRYPTO_JAR=${GNU_CRYPTO_HOME}/share/javax-crypto.jar + +fi +if test -r ${GNU_CRYPTO_HOME}/share/javax-security.jar ; then + JAVAX_SECURITY_JAR=${GNU_CRYPTO_HOME}/share/javax-security.jar + +fi + + +if test "x${with_gnu_crypto}" = xtrue; then + USER_WANT_GNU_CRYPTO_TRUE= + USER_WANT_GNU_CRYPTO_FALSE='#' +else + USER_WANT_GNU_CRYPTO_TRUE='#' + USER_WANT_GNU_CRYPTO_FALSE= +fi + + + + # Check whether --with-class_library_profile or --without-class_library_profile was given. if test "${with_class_library_profile+set}" = set; then withval="$with_class_library_profile" @@ -46224,6 +46310,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${USER_WANT_GNU_CRYPTO_TRUE}" && test -z "${USER_WANT_GNU_CRYPTO_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"USER_WANT_GNU_CRYPTO\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"USER_WANT_GNU_CRYPTO\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${USE_PRECOMPILED_RT_JAR_TRUE}" && test -z "${USE_PRECOMPILED_RT_JAR_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"USE_PRECOMPILED_RT_JAR\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -46994,6 +47087,12 @@ s,@COND_PURE_JAVA_MATH_FALSE@,$COND_PURE_JAVA_MATH_FALSE,;t t s,@MATH_LIB@,$MATH_LIB,;t t s,@INCLUDED_EXTENSIONS@,$INCLUDED_EXTENSIONS,;t t +s,@GNU_CRYPTO_HOME@,$GNU_CRYPTO_HOME,;t t +s,@GNU_CRYPTO_JAR@,$GNU_CRYPTO_JAR,;t t +s,@JAVAX_CRYPTO_JAR@,$JAVAX_CRYPTO_JAR,;t t +s,@JAVAX_SECURITY_JAR@,$JAVAX_SECURITY_JAR,;t t +s,@USER_WANT_GNU_CRYPTO_TRUE@,$USER_WANT_GNU_CRYPTO_TRUE,;t t +s,@USER_WANT_GNU_CRYPTO_FALSE@,$USER_WANT_GNU_CRYPTO_FALSE,;t t s,@PROFILE@,$PROFILE,;t t s,@USE_PRECOMPILED_RT_JAR_TRUE@,$USE_PRECOMPILED_RT_JAR_TRUE,;t t s,@USE_PRECOMPILED_RT_JAR_FALSE@,$USE_PRECOMPILED_RT_JAR_FALSE,;t t Index: kaffe/configure.in diff -u kaffe/configure.in:1.231 kaffe/configure.in:1.232 --- kaffe/configure.in:1.231 Sun Nov 23 17:46:37 2003 +++ kaffe/configure.in Sun Nov 30 23:49:17 2003 @@ -1435,6 +1435,12 @@ AM_WITH_DMALLOC dnl ----------------------------------------------------------------------- +dnl Pull in definitions from gnu-crypto.m4 +dnl ----------------------------------------------------------------------- + +CHECK_GNU_CRYPTO + +dnl ----------------------------------------------------------------------- dnl Support for different class library profiles dnl ----------------------------------------------------------------------- AC_ARG_WITH(class_library_profile, [ --with-class-library-profile=PROFILE specify class library profile]) =================================================================== Checking out kaffe/gnu-crypto.m4 RCS: /home/cvs/kaffe/kaffe/gnu-crypto.m4,v VERS: 1.1 *************** --- /dev/null Sun Aug 4 19:57:58 2002 +++ kaffe/gnu-crypto.m4 Sun Nov 30 23:51:42 2003 @@ -0,0 +1,134 @@ +# ---------------------------------------------------------------------------- +# $Id: gnu-crypto.m4,v 1.1 2003/11/30 23:49:17 dalibor Exp $ +# +# Copyright (C) 2003 Free Software Foundation, Inc. +# +# This file is part of GNU Crypto. +# +# GNU Crypto is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Crypto is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; see the file COPYING. If not, write to the +# +# Free Software Foundation Inc., +# 59 Temple Place - Suite 330, +# Boston, MA 02111-1307 +# USA +# +# Linking this library statically or dynamically with other modules is +# making a combined work based on this library. Thus, the terms and +# conditions of the GNU General Public License cover the whole +# combination. +# +# As a special exception, the copyright holders of this library give +# you permission to link this library with independent modules to +# produce an executable, regardless of the license terms of these +# independent modules, and to copy and distribute the resulting +# executable under terms of your choice, provided that you also meet, +# for each linked independent module, the terms and conditions of the +# license of that module. An independent module is a module which is +# not derived from or based on this library. If you modify this +# library, you may extend this exception to your version of the +# library, but you are not obligated to do so. If you do not wish to +# do so, delete this exception statement from your version. +# ---------------------------------------------------------------------------- +# +# GNU Crypto m4 macro for use by VM Providers +# +# $Revision: 1.1 $ +# + +# process --with-gnu-crypto configure option. +# test if the GNU Crypto package is installed. if no argument was specified +# with the option, this macro looks for a 'share/gnu-crypto.jar' file and +# a 'lib/lib-gnu-crypto.so' in the following places, in this order: +# /usr/local/gnu-crypto, /usr/local, /usr, /opt/gnu-crypto, and /opt. +# otherwise those two files are looked up under the designated location. +# in total, the following variables are set: +# +# USER_WANT_GNU_CRYPTO: an automake conditional; true if with-gnu-crypto is set, +# GNU_CRYPTO_HOME: the installation directory of GNU Crypto, +# GNU_CRYPTO_JAR: the fully qualified path to gnu-crypto.jar, +# JAVAX_CRYPTO_JAR: the fully qualified path to javax-crypto.jar, +# JAVAX_SECURITY_JAR: the fully qualified path to javax-security.jar. +# ----------------------------------------------------------------------------- +AC_DEFUN([CHECK_GNU_CRYPTO],[ +AC_ARG_WITH([gnu-crypto], + AC_HELP_STRING([--with-gnu-crypto], + [path to GNU Crypto install directory. if unspecified, /usr/local/gnu-crypto, /usr/local, /usr, /opt/gnu-crypto, and /opt are considered, in that order]), + + [if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then + AC_MSG_CHECKING([${withval}]) + _CHECK_GNU_CRYPTO_HOME(${withval}) + if test x$GNU_CRYPTO_HOME = x ; then + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find designated GNU Crypto install directory]) + else + AC_MSG_RESULT(yes) + with_gnu_crypto=true + fi + elif test "x${withval}" != xno; then + AC_MSG_NOTICE([no value supplied --with-gnu-crypto. will look in default locations]) + _FIND_GNU_CRYPTO_HOME([/usr/local/gnu-crypto /usr/local /usr /opt/gnu-crypto /opt]) + if test x$GNU_CRYPTO_HOME = x ; then + AC_MSG_ERROR([cannot find GNU Crypto install directory. install it and/or specify its location using --with-gnu-crypto]) + fi + with_gnu_crypto=true + else + with_gnu_crypto=false + fi], + [with_gnu_crypto=false]) +GNU_CRYPTO_HOME=`(cd ${GNU_CRYPTO_HOME}; pwd)` +AC_SUBST(GNU_CRYPTO_HOME) +if test -r ${GNU_CRYPTO_HOME}/share/gnu-crypto.jar ; then + GNU_CRYPTO_JAR=${GNU_CRYPTO_HOME}/share/gnu-crypto.jar + AC_SUBST(GNU_CRYPTO_JAR) +fi +if test -r ${GNU_CRYPTO_HOME}/share/javax-crypto.jar ; then + JAVAX_CRYPTO_JAR=${GNU_CRYPTO_HOME}/share/javax-crypto.jar + AC_SUBST(JAVAX_CRYPTO_JAR) +fi +if test -r ${GNU_CRYPTO_HOME}/share/javax-security.jar ; then + JAVAX_SECURITY_JAR=${GNU_CRYPTO_HOME}/share/javax-security.jar + AC_SUBST(JAVAX_SECURITY_JAR) +fi +AM_CONDITIONAL(USER_WANT_GNU_CRYPTO, test "x${with_gnu_crypto}" = xtrue) +])# CHECK_GNU_CRYPTO + + +# given a list of arguments, this macro tries repeatedly and for each element +# of the input list, to (a) assert that the argument is indeed a directory, +# and (b) it contains under it both 'lib/lib-gnu-crypto.so' and +# 'share/gnu-crypto.jar' files. +# ----------------------------------------------------------------------------- +AC_DEFUN(_FIND_GNU_CRYPTO_HOME,[ +AC_MSG_CHECKING([for GNU Crypto installation directory]) +for _F in $1 ; do + _CHECK_GNU_CRYPTO_HOME(${_F}) + if test x$GNU_CRYPTO_HOME != x ; then + break + fi +done +if test x${GNU_CRYPTO_HOME} = x ; then + AC_MSG_RESULT([not found]) +else + AC_MSG_RESULT([${GNU_CRYPTO_HOME}]) +fi])# _FIND_GNU_CRYPTO_HOME + + +# given a directory as an input, this macro checks if the two files +# 'lib/lib-gnu-crypto.so' and 'share/gnu-crypto.jar' exist under it. if they +# do, then GNU_CRYPTO_DIR is set to that argument. +# ----------------------------------------------------------------------------- +AC_DEFUN([_CHECK_GNU_CRYPTO_HOME], +[if test -r $1/lib/lib-gnu-crypto.so || test -r $1/share/gnu-crypto.jar ; then + GNU_CRYPTO_HOME=$1 +fi])# _CHECK_GNU_CRYPTO_HOME Index: kaffe/config/Makefile.in diff -u kaffe/config/Makefile.in:1.91 kaffe/config/Makefile.in:1.92 --- kaffe/config/Makefile.in:1.91 Sun Nov 23 17:46:39 2003 +++ kaffe/config/Makefile.in Sun Nov 30 23:49:17 2003 @@ -95,6 +95,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@ +GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@ HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@ HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@ HAVE_CONFIG_JIT_MD_H = @HAVE_CONFIG_JIT_MD_H@ @@ -116,6 +118,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JASMIN = @JASMIN@ +JAVAX_CRYPTO_JAR = @JAVAX_CRYPTO_JAR@ +JAVAX_SECURITY_JAR = @JAVAX_SECURITY_JAR@ JAVA_LIBS = @JAVA_LIBS@ JIKES = @JIKES@ JIKESPROG = @JIKESPROG@ @@ -180,6 +184,8 @@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ +USER_WANT_GNU_CRYPTO_FALSE = @USER_WANT_GNU_CRYPTO_FALSE@ +USER_WANT_GNU_CRYPTO_TRUE = @USER_WANT_GNU_CRYPTO_TRUE@ USE_COMPAT_IFADDRS_FALSE = @USE_COMPAT_IFADDRS_FALSE@ USE_COMPAT_IFADDRS_TRUE = @USE_COMPAT_IFADDRS_TRUE@ USE_JIT_FALSE = @USE_JIT_FALSE@ Index: kaffe/developers/update-class-list diff -u kaffe/developers/update-class-list:1.8 kaffe/developers/update-class-list:1.9 --- kaffe/developers/update-class-list:1.8 Sat Jun 7 01:34:58 2003 +++ kaffe/developers/update-class-list Sun Nov 30 23:49:18 2003 @@ -19,6 +19,7 @@ omitted_packages="\ java/awt/win32 \ +gnu/crypto \ " echo "WARNING: Omitted packages: $omitted_packages" Index: kaffe/include/Makefile.in diff -u kaffe/include/Makefile.in:1.126 kaffe/include/Makefile.in:1.127 --- kaffe/include/Makefile.in:1.126 Sun Nov 23 17:46:40 2003 +++ kaffe/include/Makefile.in Sun Nov 30 23:49:18 2003 @@ -97,6 +97,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@ +GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@ HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@ HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@ HAVE_CONFIG_JIT_MD_H = @HAVE_CONFIG_JIT_MD_H@ @@ -118,6 +120,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JASMIN = @JASMIN@ +JAVAX_CRYPTO_JAR = @JAVAX_CRYPTO_JAR@ +JAVAX_SECURITY_JAR = @JAVAX_SECURITY_JAR@ JAVA_LIBS = @JAVA_LIBS@ JIKES = @JIKES@ JIKESPROG = @JIKESPROG@ @@ -182,6 +186,8 @@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ +USER_WANT_GNU_CRYPTO_FALSE = @USER_WANT_GNU_CRYPTO_FALSE@ +USER_WANT_GNU_CRYPTO_TRUE = @USER_WANT_GNU_CRYPTO_TRUE@ USE_COMPAT_IFADDRS_FALSE = @USE_COMPAT_IFADDRS_FALSE@ USE_COMPAT_IFADDRS_TRUE = @USE_COMPAT_IFADDRS_TRUE@ USE_JIT_FALSE = @USE_JIT_FALSE@ Index: kaffe/kaffe/Makefile.in diff -u kaffe/kaffe/Makefile.in:1.83 kaffe/kaffe/Makefile.in:1.84 --- kaffe/kaffe/Makefile.in:1.83 Sun Nov 23 17:46:40 2003 +++ kaffe/kaffe/Makefile.in Sun Nov 30 23:49:19 2003 @@ -95,6 +95,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@ +GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@ HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@ HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@ HAVE_CONFIG_JIT_MD_H = @HAVE_CONFIG_JIT_MD_H@ @@ -116,6 +118,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JASMIN = @JASMIN@ +JAVAX_CRYPTO_JAR = @JAVAX_CRYPTO_JAR@ +JAVAX_SECURITY_JAR = @JAVAX_SECURITY_JAR@ JAVA_LIBS = @JAVA_LIBS@ JIKES = @JIKES@ JIKESPROG = @JIKESPROG@ @@ -180,6 +184,8 @@ THREAD_DIR = @THREAD_DIR@ THREAD_SYSTEM = @THREAD_SYSTEM@ UIC = @UIC@ +USER_WANT_GNU_CRYPTO_FALSE = @USER_WANT_GNU_CRYPTO_FALSE@ +USER_WANT_GNU_CRYPTO_TRUE = @USER_WANT_GNU_CRYPTO_TRUE@ USE_COMPAT_IFADDRS_FALSE = @USE_COMPAT_IFADDRS_FALSE@ USE_COMPAT_IFADDRS_TRUE = @USE_COMPAT_IFADDRS_TRUE@ USE_JIT_FALSE = @USE_JIT_FALSE@ Index: kaffe/kaffe/jvmpi/Makefile.in diff -u kaffe/kaffe/jvmpi/Makefile.in:1.8 kaffe/kaffe/jvmpi/Makefile.in:1.9 --- kaffe/kaffe/jvmpi/Makefile.in:1.8 Sun Nov 23 17:46:41 2003 +++ kaffe/kaffe/jvmpi/Makefile.in Sun Nov 30 23:49:19 2003 @@ -87,6 +87,8 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +GNU_CRYPTO_HOME = @GNU_CRYPTO_HOME@ +GNU_CRYPTO_JAR = @GNU_CRYPTO_JAR@ HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@ HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@ HAVE_CONFIG_JIT_MD_H = @HAVE_CONFIG_JIT_MD_H@ @@ -108,6 +110,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ *** Patch too long, truncated *** _______________________________________________ kaffe mailing list [EMAIL PROTECTED] http://kaffe.org/cgi-bin/mailman/listinfo/kaffe