diff options
author | Matthias Klose <doko@gcc.gnu.org> | 2008-06-28 13:29:13 +0000 |
---|---|---|
committer | Matthias Klose <doko@gcc.gnu.org> | 2008-06-28 13:29:13 +0000 |
commit | e0441a5bfb29083a532307ba2b1fd6d6d13944ba (patch) | |
tree | 602cd7aa7c947386134690d8e0f6b53abcdeacb9 /libjava/classpath/configure | |
parent | 15c151967dd1cde61b79d26374f608f63a29d411 (diff) | |
download | gcc-e0441a5bfb29083a532307ba2b1fd6d6d13944ba.zip gcc-e0441a5bfb29083a532307ba2b1fd6d6d13944ba.tar.gz gcc-e0441a5bfb29083a532307ba2b1fd6d6d13944ba.tar.bz2 |
Import GNU Classpath (classpath-0_97_2-release).
libjava/
2008-06-28 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (classpath-0_97_2-release).
* Regenerate class and header files.
* Regenerate auto* files.
* gcj/javaprims.h: Define jobjectRefType.
* jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
(_Jv_JNIFunctions): Initialize GetObjectRefType.
* gnu/classpath/jdwp/VMVirtualMachine.java,
java/security/VMSecureRandom.java: Merge from classpath.
* HACKING: Fix typo.
* ChangeLog-2007: New file.
* configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.
libjava/classpath/
2008-06-28 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Disable check for JAVAC, when
not configured with --enable-java-maintainer-mode.
* aclocal.m4, configure: Regenerate.
* native/jni/gstreamer-peer/Makefile.am: Do not link with
libclasspathnative.
* native/jni/gstreamer-peer/Makefile.in: Regenerate.
* tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
JCOMPILER, drop flags not understood by gcj.
From-SVN: r137223
Diffstat (limited to 'libjava/classpath/configure')
-rwxr-xr-x | libjava/classpath/configure | 2190 |
1 files changed, 407 insertions, 1783 deletions
diff --git a/libjava/classpath/configure b/libjava/classpath/configure index 6a10d6c..966fcbd 100755 --- a/libjava/classpath/configure +++ b/libjava/classpath/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for GNU Classpath 0.96-pre. +# Generated by GNU Autoconf 2.59 for GNU Classpath 0.97.2. # # Report bugs to <classpath@gnu.org>. # @@ -418,8 +418,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='GNU Classpath' PACKAGE_TARNAME='classpath' -PACKAGE_VERSION='0.96-pre' -PACKAGE_STRING='GNU Classpath 0.96-pre' +PACKAGE_VERSION='0.97.2' +PACKAGE_STRING='GNU Classpath 0.97.2' PACKAGE_BUGREPORT='classpath@gnu.org' ac_unique_file="java/lang/System.java" @@ -461,7 +461,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE GENINSRC_TRUE GENINSRC_FALSE multi_basedir LIBVERSION CLASSPATH_MODULE CLASSPATH_CONVENIENCE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CREATE_COLLECTIONS_TRUE CREATE_COLLECTIONS_FALSE CREATE_JNI_LIBRARIES_TRUE CREATE_JNI_LIBRARIES_FALSE CREATE_CORE_JNI_LIBRARIES_TRUE CREATE_CORE_JNI_LIBRARIES_FALSE CREATE_GCONF_PEER_LIBRARIES_TRUE CREATE_GCONF_PEER_LIBRARIES_FALSE CREATE_GSTREAMER_PEER_LIBRARIES_TRUE CREATE_GSTREAMER_PEER_LIBRARIES_FALSE default_toolkit CREATE_XMLJ_LIBRARY_TRUE CREATE_XMLJ_LIBRARY_FALSE 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 CPP EGREP CREATE_ALSA_LIBRARIES_TRUE CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE CREATE_GTK_PEER_LIBRARIES_FALSE CREATE_QT_PEER_LIBRARIES_TRUE CREATE_QT_PEER_LIBRARIES_FALSE CREATE_PLUGIN_TRUE CREATE_PLUGIN_FALSE toolexeclibdir nativeexeclibdir glibjdir VM_BINARY CREATE_JNI_HEADERS_TRUE CREATE_JNI_HEADERS_FALSE CREATE_WRAPPERS_TRUE CREATE_WRAPPERS_FALSE LN_S LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM AR ac_ct_AR RANLIB ac_ct_RANLIB lt_ECHO CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP PERL COLLECTIONS_PREFIX LIBMAGIC LIBICONV LTLIBICONV WARNING_CFLAGS EXTRA_CFLAGS STRICT_WARNING_CFLAGS ERROR_CFLAGS PKG_CONFIG XML_CFLAGS XML_LIBS XSLT_CFLAGS XSLT_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CFLAGS GTK_LIBS FREETYPE2_CFLAGS FREETYPE2_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS CAIRO_CFLAGS CAIRO_LIBS XTEST_LIBS GCONF_CFLAGS GCONF_LIBS GDK_CFLAGS GDK_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS GSTREAMER_BASE_CFLAGS GSTREAMER_BASE_LIBS GSTREAMER_PLUGINS_BASE_CFLAGS GSTREAMER_PLUGINS_BASE_LIBS GST_PLUGIN_LDFLAGS GSTREAMER_FILE_READER GSTREAMER_MIXER_PROVIDER QT_CFLAGS QT_LIBS MOC MOZILLA_CFLAGS MOZILLA_LIBS GLIB_CFLAGS GLIB_LIBS PLUGIN_DIR USER_JAVAH CLASSPATH_INCLUDES GCJ JIKES JIKESENCODING JIKESWARNINGS KJC ECJ JAVAC FOUND_GCJ_TRUE FOUND_GCJ_FALSE FOUND_JIKES_TRUE FOUND_JIKES_FALSE FOUND_ECJ_TRUE FOUND_ECJ_FALSE FOUND_JAVAC_TRUE FOUND_JAVAC_FALSE FOUND_KJC_TRUE FOUND_KJC_FALSE USER_CLASSLIB USER_SPECIFIED_CLASSLIB_TRUE USER_SPECIFIED_CLASSLIB_FALSE vm_classes MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBDEBUG INIT_LOAD_LIBRARY ECJ_JAR JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION REMOVE MKDIR CP DATE FIND ZIP FASTJAR INSTALL_GLIBJ_ZIP_TRUE INSTALL_GLIBJ_ZIP_FALSE INSTALL_CLASS_FILES_TRUE INSTALL_CLASS_FILES_FALSE BUILD_CLASS_FILES_TRUE BUILD_CLASS_FILES_FALSE EXAMPLESDIR GJDOC CREATE_API_DOCS_TRUE CREATE_API_DOCS_FALSE JAY JAY_SKELETON REGEN_PARSERS_TRUE REGEN_PARSERS_FALSE USE_PREBUILT_GLIBJ_ZIP_TRUE USE_PREBUILT_GLIBJ_ZIP_FALSE PATH_TO_GLIBJ_ZIP USE_ESCHER_TRUE USE_ESCHER_FALSE PATH_TO_ESCHER ENABLE_LOCAL_SOCKETS_TRUE ENABLE_LOCAL_SOCKETS_FALSE DEFAULT_PREFS_PEER LIBOBJS 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE GENINSRC_TRUE GENINSRC_FALSE multi_basedir LIBVERSION CLASSPATH_MODULE CLASSPATH_CONVENIENCE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CREATE_COLLECTIONS_TRUE CREATE_COLLECTIONS_FALSE CREATE_JNI_LIBRARIES_TRUE CREATE_JNI_LIBRARIES_FALSE CREATE_CORE_JNI_LIBRARIES_TRUE CREATE_CORE_JNI_LIBRARIES_FALSE CREATE_GCONF_PEER_LIBRARIES_TRUE CREATE_GCONF_PEER_LIBRARIES_FALSE CREATE_GSTREAMER_PEER_LIBRARIES_TRUE CREATE_GSTREAMER_PEER_LIBRARIES_FALSE default_toolkit CREATE_XMLJ_LIBRARY_TRUE CREATE_XMLJ_LIBRARY_FALSE 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 CPP EGREP CREATE_ALSA_LIBRARIES_TRUE CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE CREATE_GTK_PEER_LIBRARIES_FALSE CREATE_QT_PEER_LIBRARIES_TRUE CREATE_QT_PEER_LIBRARIES_FALSE CREATE_PLUGIN_TRUE CREATE_PLUGIN_FALSE toolexeclibdir nativeexeclibdir glibjdir VM_BINARY CREATE_JNI_HEADERS_TRUE CREATE_JNI_HEADERS_FALSE CREATE_WRAPPERS_TRUE CREATE_WRAPPERS_FALSE LN_S LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM AR ac_ct_AR RANLIB ac_ct_RANLIB lt_ECHO CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP PERL COLLECTIONS_PREFIX LIBMAGIC LIBICONV LTLIBICONV WARNING_CFLAGS EXTRA_CFLAGS STRICT_WARNING_CFLAGS ERROR_CFLAGS PKG_CONFIG XML_CFLAGS XML_LIBS XSLT_CFLAGS XSLT_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CFLAGS GTK_LIBS FREETYPE2_CFLAGS FREETYPE2_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS CAIRO_CFLAGS CAIRO_LIBS XTEST_LIBS GCONF_CFLAGS GCONF_LIBS GDK_CFLAGS GDK_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS GSTREAMER_BASE_CFLAGS GSTREAMER_BASE_LIBS GSTREAMER_PLUGINS_BASE_CFLAGS GSTREAMER_PLUGINS_BASE_LIBS GST_PLUGIN_LDFLAGS GSTREAMER_FILE_READER GSTREAMER_MIXER_PROVIDER QT_CFLAGS QT_LIBS MOC MOZILLA_CFLAGS MOZILLA_LIBS GLIB_CFLAGS GLIB_LIBS PLUGIN_DIR USER_JAVAH CLASSPATH_INCLUDES vm_classes MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBDEBUG INIT_LOAD_LIBRARY ECJ_JAR JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION REMOVE MKDIR CP DATE FIND ZIP FASTJAR INSTALL_GLIBJ_ZIP_TRUE INSTALL_GLIBJ_ZIP_FALSE INSTALL_CLASS_FILES_TRUE INSTALL_CLASS_FILES_FALSE BUILD_CLASS_FILES_TRUE BUILD_CLASS_FILES_FALSE EXAMPLESDIR TOOLSDIR GJDOC CREATE_API_DOCS_TRUE CREATE_API_DOCS_FALSE JAY JAY_SKELETON REGEN_PARSERS_TRUE REGEN_PARSERS_FALSE USE_PREBUILT_GLIBJ_ZIP_TRUE USE_PREBUILT_GLIBJ_ZIP_FALSE PATH_TO_GLIBJ_ZIP JAVAC JAVAC_MEM_OPT USE_ESCHER_TRUE USE_ESCHER_FALSE PATH_TO_ESCHER ENABLE_LOCAL_SOCKETS_TRUE ENABLE_LOCAL_SOCKETS_FALSE DEFAULT_PREFS_PEER LIBOBJS LTLIBOBJS' ac_subst_files='' ac_pwd=`pwd` @@ -943,7 +943,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU Classpath 0.96-pre to adapt to many kinds of systems. +\`configure' configures GNU Classpath 0.97.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1014,7 +1014,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Classpath 0.96-pre:";; + short | recursive ) echo "Configuration of GNU Classpath 0.97.2:";; esac cat <<\_ACEOF @@ -1059,7 +1059,8 @@ Optional Features: default=no --disable-plugin compile gcjwebplugin (disabled by --disable-plugin) default=yes - --enable-regen-headers automatically regenerate JNI headers default=no + --enable-regen-headers automatically regenerate JNI headers default=yes if + headers don't exist --enable-tool-wrappers create tool wrapper binaries default=no --enable-static[=PKGS] build static libraries [default=no] @@ -1077,6 +1078,7 @@ Optional Features: will the VM explicitly invoke java.lang.System's static initialization methods default=no --enable-examples enable build of the examples default=yes + --enable-tools enable build of the tools default=yes --enable-portable-native-sync synchronize VM threads portably --enable-local-sockets enables local (AF_LOCAL) socket API default: no @@ -1100,12 +1102,6 @@ Optional Packages: --with-qt4dir=DIR Qt4 installation directory used for OS-X. For other systems use pkg-config. --with-javah specify path or name of a javah-like program - --with-gcj bytecode compilation with gcj - --with-jikes bytecode compilation with jikes - --with-kjc bytecode compilation with kjc - --with-ecj bytecode compilation with ecj - --with-javac bytecode compilation with javac - --with-classpath specify path to a classes.zip like file --with-vm-classes specify path to VM override source files --with-ecj-jar=ABS.PATH specify jar file containing the Eclipse Java Compiler @@ -1113,8 +1109,7 @@ Optional Packages: --with-glibj define what to install (zip|flat|both|none|build) [default=zip] --with-gjdoc generate documentation using gjdoc (default is NO) - --with-jay Regenerate the parsers with jay must be given the - path to the jay executable + --with-jay=DIR|PATH Regenerate the parsers with jay --with-glibj-zip=ABS.PATH use prebuilt glibj.zip class library --with-escher=ABS.PATH specify path to escher dir or JAR for X peers @@ -1230,7 +1225,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -GNU Classpath configure 0.96-pre +GNU Classpath configure 0.97.2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1244,7 +1239,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU Classpath $as_me 0.96-pre, which was +It was created by GNU Classpath $as_me 0.97.2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -2105,7 +2100,7 @@ fi # Define the identity of the package. PACKAGE='classpath' - VERSION='0.96-pre' + VERSION='0.97.2' cat >>confdefs.h <<_ACEOF @@ -4852,10 +4847,14 @@ if test "${enable_regen_headers+set}" = set; then case "${enableval}" in yes) REGENERATE_JNI_HEADERS=yes ;; no) REGENERATE_JNI_HEADERS=no ;; - *) REGENERATE_JNI_HEADERS=no ;; + *) REGENERATE_JNI_HEADERS=yes ;; esac else - REGENERATE_JNI_HEADERS=no + if test -e include/java_lang_VMSystem.h; then + REGENERATE_JNI_HEADERS=no ; + else + REGENERATE_JNI_HEADERS=yes ; + fi fi; @@ -5753,13 +5752,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5756: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5755: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5759: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5758: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5762: output\"" >&5) + (eval echo "\"\$as_me:5761: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6803,7 +6802,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6806 "configure"' > conftest.$ac_ext + echo '#line 6805 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7435,11 +7434,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7438: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7437: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7442: \$? = $ac_status" >&5 + echo "$as_me:7441: \$? = $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 other than the usual output. @@ -7757,11 +7756,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7760: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7759: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7764: \$? = $ac_status" >&5 + echo "$as_me:7763: \$? = $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 other than the usual output. @@ -7862,11 +7861,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7865: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7864: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7869: \$? = $ac_status" >&5 + echo "$as_me:7868: \$? = $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 @@ -7917,11 +7916,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7920: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7919: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7924: \$? = $ac_status" >&5 + echo "$as_me:7923: \$? = $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 @@ -10769,7 +10768,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10772 "configure" +#line 10771 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10869,7 +10868,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10872 "configure" +#line 10871 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15312,11 +15311,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15315: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15314: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15319: \$? = $ac_status" >&5 + echo "$as_me:15318: \$? = $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 other than the usual output. @@ -15411,11 +15410,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15414: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15413: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15418: \$? = $ac_status" >&5 + echo "$as_me:15417: \$? = $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 @@ -15463,11 +15462,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15466: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15465: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15470: \$? = $ac_status" >&5 + echo "$as_me:15469: \$? = $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 @@ -17107,6 +17106,10 @@ fi + + + + for ac_header in unistd.h sys/types.h sys/config.h sys/ioctl.h \ asm/ioctls.h \ inttypes.h stdint.h utime.h sys/utime.h sys/filio.h \ @@ -17117,7 +17120,9 @@ for ac_header in unistd.h sys/types.h sys/config.h sys/ioctl.h \ sys/mman.h \ magic.h \ sys/event.h sys/epoll.h \ - ifaddrs.h + ifaddrs.h \ + netinet/in_systm.h netinet/ip.h net/if.h \ + sys/loadavg.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -17535,6 +17540,7 @@ fi + for ac_func in ftruncate fsync select \ gethostname socket strerror fork pipe execve open close \ lseek fstat read readv write writev htonl memset htons connect \ @@ -17543,11 +17549,12 @@ for ac_func in ftruncate fsync select \ gethostbyname_r localtime_r \ strerror_r \ fcntl \ + statvfs \ mmap munmap mincore msync madvise getpagesize sysconf \ lstat readlink \ inet_aton inet_addr inet_pton \ getifaddrs kqueue kevent epoll_create \ - readdir_r getloadavg + getloadavg do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -19945,7 +19952,7 @@ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. + # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -19953,7 +19960,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <X11/Xlib.h> +#include <X11/Intrinsic.h> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -19980,7 +19987,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then + if test -r "$ac_dir/X11/Intrinsic.h"; then ac_x_includes=$ac_dir break fi @@ -19994,7 +20001,7 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lX11 $LIBS" + LIBS="-lXt $LIBS" if test x$gcc_no_link = xyes; then { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} @@ -20006,11 +20013,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <X11/Xlib.h> +#include <X11/Intrinsic.h> int main () { -XrmInitialize () +XtMalloc (0) ; return 0; } @@ -21323,7 +21330,7 @@ fi echo "$as_me: error: GTK+ peers requested but no X library available" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5 + echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5 echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6 if test "${ac_cv_lib_Xtst_XTestQueryExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -21393,15 +21400,18 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_Xtst_XTestQueryExtension" >&5 echo "${ECHO_T}$ac_cv_lib_Xtst_XTestQueryExtension" >&6 if test $ac_cv_lib_Xtst_XTestQueryExtension = yes; then - XTEST_LIBS="$XTEST_LIBS -lX11 -lXtst" + +cat >>confdefs.h <<\_ACEOF +#define HAVE_XTEST 1 +_ACEOF +XTEST_LIBS="$XTEST_LIBS -X11 -lXtst" else - { { echo "$as_me:$LINENO: error: libXtst NOT found, required for GdkRobot" >&5 -echo "$as_me: error: libXtst NOT found, required for GdkRobot" >&2;} - { (exit 1); exit 1; }; } + true fi + succeeded=no if test -z "$PKG_CONFIG"; then @@ -22165,7 +22175,7 @@ echo "$as_me: error: Library requirements (gdk-2.0 >= 2.8) not met; consider adj USE_GCONF_PREFS_PEER=$enable_default_preferences_peer if test "$USE_GCONF_PREFS_PEER" = ""; then - DEFAULT_PREFS_PEER=gnu.java.util.prefs.GConfBasedFactory + DEFAULT_PREFS_PEER=gnu.java.util.prefs.GConfBasedFactory fi fi @@ -22479,6 +22489,107 @@ echo "$as_me: error: Library requirements (gstreamer-plugins-base-$GST_MAJORMINO GST_PLUGIN_LDFLAGS='-module -avoid-version -Wno-unused-parameter -no-undefined' + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG + +if test -n "$PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo "$as_me:$LINENO: checking for gdk-2.0 >= 2.8" >&5 +echo $ECHO_N "checking for gdk-2.0 >= 2.8... $ECHO_C" >&6 + + if $PKG_CONFIG --exists "gdk-2.0 >= 2.8" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking GDK_CFLAGS" >&5 +echo $ECHO_N "checking GDK_CFLAGS... $ECHO_C" >&6 + GDK_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0 >= 2.8"` + echo "$as_me:$LINENO: result: $GDK_CFLAGS" >&5 +echo "${ECHO_T}$GDK_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking GDK_LIBS" >&5 +echo $ECHO_N "checking GDK_LIBS... $ECHO_C" >&6 + GDK_LIBS=`$PKG_CONFIG --libs "gdk-2.0 >= 2.8"` + echo "$as_me:$LINENO: result: $GDK_LIBS" >&5 +echo "${ECHO_T}$GDK_LIBS" >&6 + else + GDK_CFLAGS="" + GDK_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + GDK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-2.0 >= 2.8"` + echo $GDK_PKG_ERRORS + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + : + else + { { echo "$as_me:$LINENO: error: Library requirements (gdk-2.0 >= 2.8) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (gdk-2.0 >= 2.8) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } + fi + + + + GSTREAMER_FILE_READER=gnu.javax.sound.sampled.gstreamer.io.GstAudioFileReader GSTREAMER_MIXER_PROVIDER=gnu.javax.sound.sampled.gstreamer.GStreamerMixerProvider fi @@ -23805,7 +23916,7 @@ fi fi else - for ac_prog in gjavah gcjh-wrapper-4.1 gcjh-4.1 gcjh javah + for ac_prog in gjavah gjavah-4.3 gjavah-4.2 gjavah-4.1 gcjh-wrapper-4.1 gcjh-4.1 javah do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -23904,7 +24015,7 @@ fi fi else - for ac_prog in gjavah gcjh-wrapper-4.1 gcjh-4.1 gcjh javah + for ac_prog in gjavah gjavah-4.3 gjavah-4.2 gjavah-4.1 gcjh-wrapper-4.1 gcjh-4.1 javah do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -24006,7 +24117,7 @@ fi fi else - for ac_prog in gjavah gcjh-wrapper-4.1 gcjh-4.1 gcjh javah + for ac_prog in gjavah gjavah-4.3 gjavah-4.2 gjavah-4.1 gcjh-wrapper-4.1 gcjh-4.1 javah do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -24091,1623 +24202,6 @@ echo "$as_me: WARNING: no" >&2;} fi - user_specified_javac= - - - -# Check whether --with-gcj or --without-gcj was given. -if test "${with_gcj+set}" = set; then - withval="$with_gcj" - - if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then - - if test "x${withval}" != x; then - if test -f "${withval}"; then - GCJ="${withval}" - else - # Extract the first word of ""${withval}"", so it can be a program name with args. -set dummy "${withval}"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GCJ in - [\\/]* | ?:[\\/]*) - ac_cv_path_GCJ="$GCJ" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GCJ="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -GCJ=$ac_cv_path_GCJ - -if test -n "$GCJ"; then - echo "$as_me:$LINENO: result: $GCJ" >&5 -echo "${ECHO_T}$GCJ" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - else - # Extract the first word of ""gcj"", so it can be a program name with args. -set dummy "gcj"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GCJ in - [\\/]* | ?:[\\/]*) - ac_cv_path_GCJ="$GCJ" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GCJ="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -GCJ=$ac_cv_path_GCJ - -if test -n "$GCJ"; then - echo "$as_me:$LINENO: result: $GCJ" >&5 -echo "${ECHO_T}$GCJ" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - if test "x$GCJ" != x; then - echo "$as_me:$LINENO: checking gcj version 4.0" >&5 -echo $ECHO_N "checking gcj version 4.0... $ECHO_C" >&6 - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -#if __GNUC__ <= 3 - #error GCJ 4.0.0 or higher is required - #endif - -_ACEOF - $GCJ -E conftest.c > /dev/null - gcj_4_result=$? - if test "x$gcj_4_result" = "x0"; then - echo "$as_me:$LINENO: result: 4.0 or higher found" >&5 -echo "${ECHO_T}4.0 or higher found" >&6 - else - { echo "$as_me:$LINENO: WARNING: 4.0 or higher required" >&5 -echo "$as_me: WARNING: 4.0 or higher required" >&2;} - fi - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - fi - - else - if test "x${withval}" != xno; then - - if test "x" != x; then - if test -f ""; then - GCJ="" - else - # Extract the first word of """", so it can be a program name with args. -set dummy ""; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GCJ in - [\\/]* | ?:[\\/]*) - ac_cv_path_GCJ="$GCJ" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GCJ="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -GCJ=$ac_cv_path_GCJ - -if test -n "$GCJ"; then - echo "$as_me:$LINENO: result: $GCJ" >&5 -echo "${ECHO_T}$GCJ" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - else - # Extract the first word of ""gcj"", so it can be a program name with args. -set dummy "gcj"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GCJ in - [\\/]* | ?:[\\/]*) - ac_cv_path_GCJ="$GCJ" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GCJ="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -GCJ=$ac_cv_path_GCJ - -if test -n "$GCJ"; then - echo "$as_me:$LINENO: result: $GCJ" >&5 -echo "${ECHO_T}$GCJ" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - if test "x$GCJ" != x; then - echo "$as_me:$LINENO: checking gcj version 4.0" >&5 -echo $ECHO_N "checking gcj version 4.0... $ECHO_C" >&6 - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -#if __GNUC__ <= 3 - #error GCJ 4.0.0 or higher is required - #endif - -_ACEOF - $GCJ -E conftest.c > /dev/null - gcj_4_result=$? - if test "x$gcj_4_result" = "x0"; then - echo "$as_me:$LINENO: result: 4.0 or higher found" >&5 -echo "${ECHO_T}4.0 or higher found" >&6 - else - { echo "$as_me:$LINENO: WARNING: 4.0 or higher required" >&5 -echo "$as_me: WARNING: 4.0 or higher required" >&2;} - fi - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - fi - - fi - fi - user_specified_javac=gcj - -else - - - if test "x" != x; then - if test -f ""; then - GCJ="" - else - # Extract the first word of """", so it can be a program name with args. -set dummy ""; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GCJ in - [\\/]* | ?:[\\/]*) - ac_cv_path_GCJ="$GCJ" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GCJ="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -GCJ=$ac_cv_path_GCJ - -if test -n "$GCJ"; then - echo "$as_me:$LINENO: result: $GCJ" >&5 -echo "${ECHO_T}$GCJ" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - else - # Extract the first word of ""gcj"", so it can be a program name with args. -set dummy "gcj"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GCJ in - [\\/]* | ?:[\\/]*) - ac_cv_path_GCJ="$GCJ" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GCJ="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -GCJ=$ac_cv_path_GCJ - -if test -n "$GCJ"; then - echo "$as_me:$LINENO: result: $GCJ" >&5 -echo "${ECHO_T}$GCJ" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - if test "x$GCJ" != x; then - echo "$as_me:$LINENO: checking gcj version 4.0" >&5 -echo $ECHO_N "checking gcj version 4.0... $ECHO_C" >&6 - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -#if __GNUC__ <= 3 - #error GCJ 4.0.0 or higher is required - #endif - -_ACEOF - $GCJ -E conftest.c > /dev/null - gcj_4_result=$? - if test "x$gcj_4_result" = "x0"; then - echo "$as_me:$LINENO: result: 4.0 or higher found" >&5 -echo "${ECHO_T}4.0 or higher found" >&6 - else - { echo "$as_me:$LINENO: WARNING: 4.0 or higher required" >&5 -echo "$as_me: WARNING: 4.0 or higher required" >&2;} - fi - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - fi - - -fi; - - - - -# Check whether --with-jikes or --without-jikes was given. -if test "${with_jikes+set}" = set; then - withval="$with_jikes" - - if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then - - if test "x${withval}" != x; then - if test -f "${withval}"; then - JIKES="${withval}" - else - # Extract the first word of ""${withval}"", so it can be a program name with args. -set dummy "${withval}"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_JIKES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $JIKES in - [\\/]* | ?:[\\/]*) - ac_cv_path_JIKES="$JIKES" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_JIKES="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -JIKES=$ac_cv_path_JIKES - -if test -n "$JIKES"; then - echo "$as_me:$LINENO: result: $JIKES" >&5 -echo "${ECHO_T}$JIKES" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - else - # Extract the first word of ""jikes"", so it can be a program name with args. -set dummy "jikes"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_JIKES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $JIKES in - [\\/]* | ?:[\\/]*) - ac_cv_path_JIKES="$JIKES" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_JIKES="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -JIKES=$ac_cv_path_JIKES - -if test -n "$JIKES"; then - echo "$as_me:$LINENO: result: $JIKES" >&5 -echo "${ECHO_T}$JIKES" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - if test "x$JIKES" != "x"; then - echo "$as_me:$LINENO: checking jikes version" >&5 -echo $ECHO_N "checking jikes version... $ECHO_C" >&6 - JIKES_VERSION=`$JIKES --version | awk '/^Jikes Compiler/' | cut -d ' ' -f 5` - JIKES_VERSION_MAJOR=`echo "$JIKES_VERSION" | cut -d '.' -f 1` - JIKES_VERSION_MINOR=`echo "$JIKES_VERSION" | cut -d '.' -f 2` - if expr "$JIKES_VERSION_MAJOR" = 1 > /dev/null; then - if expr "$JIKES_VERSION_MINOR" \< 19 > /dev/null; then - JIKES="" - fi - fi - if test "x$JIKES" != "x"; then - echo "$as_me:$LINENO: result: $JIKES_VERSION" >&5 -echo "${ECHO_T}$JIKES_VERSION" >&6 - else - { echo "$as_me:$LINENO: WARNING: $JIKES_VERSION: jikes 1.19 or higher required" >&5 -echo "$as_me: WARNING: $JIKES_VERSION: jikes 1.19 or higher required" >&2;} - fi - - JIKESENCODING= - if test -n "`$JIKES --help 2>&1 | grep encoding`"; then - JIKESENCODING='-encoding UTF-8' - fi - - - JIKESWARNINGS="+Pno-switchcheck" - if test "x$JIKES_VERSION_MAJOR" = x"1" ; then - if ! test "x$JIKES_VERSION_MINOR" = x"19"; then - JIKESWARNINGS="$JIKESWARNINGS +Pno-shadow" - fi - fi - - - fi - - else - if test "x${withval}" != xno; then - - if test "x" != x; then - if test -f ""; then - JIKES="" - else - # Extract the first word of """", so it can be a program name with args. -set dummy ""; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_JIKES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $JIKES in - [\\/]* | ?:[\\/]*) - ac_cv_path_JIKES="$JIKES" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_JIKES="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -JIKES=$ac_cv_path_JIKES - -if test -n "$JIKES"; then - echo "$as_me:$LINENO: result: $JIKES" >&5 -echo "${ECHO_T}$JIKES" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - else - # Extract the first word of ""jikes"", so it can be a program name with args. -set dummy "jikes"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_JIKES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $JIKES in - [\\/]* | ?:[\\/]*) - ac_cv_path_JIKES="$JIKES" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_JIKES="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -JIKES=$ac_cv_path_JIKES - -if test -n "$JIKES"; then - echo "$as_me:$LINENO: result: $JIKES" >&5 -echo "${ECHO_T}$JIKES" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - if test "x$JIKES" != "x"; then - echo "$as_me:$LINENO: checking jikes version" >&5 -echo $ECHO_N "checking jikes version... $ECHO_C" >&6 - JIKES_VERSION=`$JIKES --version | awk '/^Jikes Compiler/' | cut -d ' ' -f 5` - JIKES_VERSION_MAJOR=`echo "$JIKES_VERSION" | cut -d '.' -f 1` - JIKES_VERSION_MINOR=`echo "$JIKES_VERSION" | cut -d '.' -f 2` - if expr "$JIKES_VERSION_MAJOR" = 1 > /dev/null; then - if expr "$JIKES_VERSION_MINOR" \< 19 > /dev/null; then - JIKES="" - fi - fi - if test "x$JIKES" != "x"; then - echo "$as_me:$LINENO: result: $JIKES_VERSION" >&5 -echo "${ECHO_T}$JIKES_VERSION" >&6 - else - { echo "$as_me:$LINENO: WARNING: $JIKES_VERSION: jikes 1.19 or higher required" >&5 -echo "$as_me: WARNING: $JIKES_VERSION: jikes 1.19 or higher required" >&2;} - fi - - JIKESENCODING= - if test -n "`$JIKES --help 2>&1 | grep encoding`"; then - JIKESENCODING='-encoding UTF-8' - fi - - - JIKESWARNINGS="+Pno-switchcheck" - if test "x$JIKES_VERSION_MAJOR" = x"1" ; then - if ! test "x$JIKES_VERSION_MINOR" = x"19"; then - JIKESWARNINGS="$JIKESWARNINGS +Pno-shadow" - fi - fi - - - fi - - fi - fi - user_specified_javac=jikes - -else - - - if test "x" != x; then - if test -f ""; then - JIKES="" - else - # Extract the first word of """", so it can be a program name with args. -set dummy ""; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_JIKES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $JIKES in - [\\/]* | ?:[\\/]*) - ac_cv_path_JIKES="$JIKES" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_JIKES="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -JIKES=$ac_cv_path_JIKES - -if test -n "$JIKES"; then - echo "$as_me:$LINENO: result: $JIKES" >&5 -echo "${ECHO_T}$JIKES" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - else - # Extract the first word of ""jikes"", so it can be a program name with args. -set dummy "jikes"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_JIKES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $JIKES in - [\\/]* | ?:[\\/]*) - ac_cv_path_JIKES="$JIKES" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_JIKES="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -JIKES=$ac_cv_path_JIKES - -if test -n "$JIKES"; then - echo "$as_me:$LINENO: result: $JIKES" >&5 -echo "${ECHO_T}$JIKES" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - if test "x$JIKES" != "x"; then - echo "$as_me:$LINENO: checking jikes version" >&5 -echo $ECHO_N "checking jikes version... $ECHO_C" >&6 - JIKES_VERSION=`$JIKES --version | awk '/^Jikes Compiler/' | cut -d ' ' -f 5` - JIKES_VERSION_MAJOR=`echo "$JIKES_VERSION" | cut -d '.' -f 1` - JIKES_VERSION_MINOR=`echo "$JIKES_VERSION" | cut -d '.' -f 2` - if expr "$JIKES_VERSION_MAJOR" = 1 > /dev/null; then - if expr "$JIKES_VERSION_MINOR" \< 19 > /dev/null; then - JIKES="" - fi - fi - if test "x$JIKES" != "x"; then - echo "$as_me:$LINENO: result: $JIKES_VERSION" >&5 -echo "${ECHO_T}$JIKES_VERSION" >&6 - else - { echo "$as_me:$LINENO: WARNING: $JIKES_VERSION: jikes 1.19 or higher required" >&5 -echo "$as_me: WARNING: $JIKES_VERSION: jikes 1.19 or higher required" >&2;} - fi - - JIKESENCODING= - if test -n "`$JIKES --help 2>&1 | grep encoding`"; then - JIKESENCODING='-encoding UTF-8' - fi - - - JIKESWARNINGS="+Pno-switchcheck" - if test "x$JIKES_VERSION_MAJOR" = x"1" ; then - if ! test "x$JIKES_VERSION_MINOR" = x"19"; then - JIKESWARNINGS="$JIKESWARNINGS +Pno-shadow" - fi - fi - - - fi - - -fi; - - - - -# Check whether --with-kjc or --without-kjc was given. -if test "${with_kjc+set}" = set; then - withval="$with_kjc" - - if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then - - if test "x${withval}" != x; then - if test -f "${withval}"; then - KJC="${withval}" - else - # Extract the first word of ""${withval}"", so it can be a program name with args. -set dummy "${withval}"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_KJC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $KJC in - [\\/]* | ?:[\\/]*) - ac_cv_path_KJC="$KJC" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_KJC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -KJC=$ac_cv_path_KJC - -if test -n "$KJC"; then - echo "$as_me:$LINENO: result: $KJC" >&5 -echo "${ECHO_T}$KJC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - else - # Extract the first word of ""kJC"", so it can be a program name with args. -set dummy "kJC"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_KJC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $KJC in - [\\/]* | ?:[\\/]*) - ac_cv_path_KJC="$KJC" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_KJC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -KJC=$ac_cv_path_KJC - -if test -n "$KJC"; then - echo "$as_me:$LINENO: result: $KJC" >&5 -echo "${ECHO_T}$KJC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - - else - if test "x${withval}" != xno; then - - if test "x" != x; then - if test -f ""; then - KJC="" - else - # Extract the first word of """", so it can be a program name with args. -set dummy ""; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_KJC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $KJC in - [\\/]* | ?:[\\/]*) - ac_cv_path_KJC="$KJC" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_KJC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -KJC=$ac_cv_path_KJC - -if test -n "$KJC"; then - echo "$as_me:$LINENO: result: $KJC" >&5 -echo "${ECHO_T}$KJC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - else - # Extract the first word of ""kJC"", so it can be a program name with args. -set dummy "kJC"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_KJC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $KJC in - [\\/]* | ?:[\\/]*) - ac_cv_path_KJC="$KJC" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_KJC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -KJC=$ac_cv_path_KJC - -if test -n "$KJC"; then - echo "$as_me:$LINENO: result: $KJC" >&5 -echo "${ECHO_T}$KJC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - - fi - fi - user_specified_javac=kjc - -else - - - if test "x" != x; then - if test -f ""; then - KJC="" - else - # Extract the first word of """", so it can be a program name with args. -set dummy ""; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_KJC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $KJC in - [\\/]* | ?:[\\/]*) - ac_cv_path_KJC="$KJC" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_KJC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -KJC=$ac_cv_path_KJC - -if test -n "$KJC"; then - echo "$as_me:$LINENO: result: $KJC" >&5 -echo "${ECHO_T}$KJC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - else - # Extract the first word of ""kJC"", so it can be a program name with args. -set dummy "kJC"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_KJC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $KJC in - [\\/]* | ?:[\\/]*) - ac_cv_path_KJC="$KJC" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_KJC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -KJC=$ac_cv_path_KJC - -if test -n "$KJC"; then - echo "$as_me:$LINENO: result: $KJC" >&5 -echo "${ECHO_T}$KJC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - - -fi; - - - - -# Check whether --with-ecj or --without-ecj was given. -if test "${with_ecj+set}" = set; then - withval="$with_ecj" - - if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then - - if test "x${withval}" != x; then - if test -f "${withval}"; then - ECJ="${withval}" - else - # Extract the first word of ""${withval}"", so it can be a program name with args. -set dummy "${withval}"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_ECJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $ECJ in - [\\/]* | ?:[\\/]*) - ac_cv_path_ECJ="$ECJ" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ECJ="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -ECJ=$ac_cv_path_ECJ - -if test -n "$ECJ"; then - echo "$as_me:$LINENO: result: $ECJ" >&5 -echo "${ECHO_T}$ECJ" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - else - # Extract the first word of ""ecj"", so it can be a program name with args. -set dummy "ecj"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_ECJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $ECJ in - [\\/]* | ?:[\\/]*) - ac_cv_path_ECJ="$ECJ" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ECJ="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -ECJ=$ac_cv_path_ECJ - -if test -n "$ECJ"; then - echo "$as_me:$LINENO: result: $ECJ" >&5 -echo "${ECHO_T}$ECJ" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - - else - if test "x${withval}" != xno; then - - if test "x" != x; then - if test -f ""; then - ECJ="" - else - # Extract the first word of """", so it can be a program name with args. -set dummy ""; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_ECJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $ECJ in - [\\/]* | ?:[\\/]*) - ac_cv_path_ECJ="$ECJ" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ECJ="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -ECJ=$ac_cv_path_ECJ - -if test -n "$ECJ"; then - echo "$as_me:$LINENO: result: $ECJ" >&5 -echo "${ECHO_T}$ECJ" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - else - # Extract the first word of ""ecj"", so it can be a program name with args. -set dummy "ecj"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_ECJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $ECJ in - [\\/]* | ?:[\\/]*) - ac_cv_path_ECJ="$ECJ" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ECJ="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -ECJ=$ac_cv_path_ECJ - -if test -n "$ECJ"; then - echo "$as_me:$LINENO: result: $ECJ" >&5 -echo "${ECHO_T}$ECJ" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - - fi - fi - user_specified_javac=ecj - -else - - - if test "x" != x; then - if test -f ""; then - ECJ="" - else - # Extract the first word of """", so it can be a program name with args. -set dummy ""; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_ECJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $ECJ in - [\\/]* | ?:[\\/]*) - ac_cv_path_ECJ="$ECJ" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ECJ="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -ECJ=$ac_cv_path_ECJ - -if test -n "$ECJ"; then - echo "$as_me:$LINENO: result: $ECJ" >&5 -echo "${ECHO_T}$ECJ" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - else - # Extract the first word of ""ecj"", so it can be a program name with args. -set dummy "ecj"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_ECJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $ECJ in - [\\/]* | ?:[\\/]*) - ac_cv_path_ECJ="$ECJ" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ECJ="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -ECJ=$ac_cv_path_ECJ - -if test -n "$ECJ"; then - echo "$as_me:$LINENO: result: $ECJ" >&5 -echo "${ECHO_T}$ECJ" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - - -fi; - - - - -# Check whether --with-javac or --without-javac was given. -if test "${with_javac+set}" = set; then - withval="$with_javac" - - if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then - - if test "x${withval}" != x; then - JAVAC="${withval}" - else - # Extract the first word of ""javac"", so it can be a program name with args. -set dummy "javac"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_JAVAC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $JAVAC in - [\\/]* | ?:[\\/]*) - ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -JAVAC=$ac_cv_path_JAVAC - -if test -n "$JAVAC"; then - echo "$as_me:$LINENO: result: $JAVAC" >&5 -echo "${ECHO_T}$JAVAC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - - else - if test "x${withval}" != xno; then - - if test "x" != x; then - JAVAC="" - else - # Extract the first word of ""javac"", so it can be a program name with args. -set dummy "javac"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_JAVAC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $JAVAC in - [\\/]* | ?:[\\/]*) - ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -JAVAC=$ac_cv_path_JAVAC - -if test -n "$JAVAC"; then - echo "$as_me:$LINENO: result: $JAVAC" >&5 -echo "${ECHO_T}$JAVAC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - - fi - fi - user_specified_javac=javac - -else - - - if test "x" != x; then - JAVAC="" - else - # Extract the first word of ""javac"", so it can be a program name with args. -set dummy "javac"; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_JAVAC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $JAVAC in - [\\/]* | ?:[\\/]*) - ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - ;; -esac -fi -JAVAC=$ac_cv_path_JAVAC - -if test -n "$JAVAC"; then - echo "$as_me:$LINENO: result: $JAVAC" >&5 -echo "${ECHO_T}$JAVAC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - - -fi; - - - - if test "x${user_specified_javac}" = x; then - - -if test "x${GCJ}" != x; then - FOUND_GCJ_TRUE= - FOUND_GCJ_FALSE='#' -else - FOUND_GCJ_TRUE='#' - FOUND_GCJ_FALSE= -fi - - - -if test "x${JIKES}" != x; then - FOUND_JIKES_TRUE= - FOUND_JIKES_FALSE='#' -else - FOUND_JIKES_TRUE='#' - FOUND_JIKES_FALSE= -fi - - - -if test "x${ECJ}" != x; then - FOUND_ECJ_TRUE= - FOUND_ECJ_FALSE='#' -else - FOUND_ECJ_TRUE='#' - FOUND_ECJ_FALSE= -fi - - - -if test "x${JAVAC}" != x; then - FOUND_JAVAC_TRUE= - FOUND_JAVAC_FALSE='#' -else - FOUND_JAVAC_TRUE='#' - FOUND_JAVAC_FALSE= -fi - - else - - -if test "x${user_specified_javac}" = xgcj; then - FOUND_GCJ_TRUE= - FOUND_GCJ_FALSE='#' -else - FOUND_GCJ_TRUE='#' - FOUND_GCJ_FALSE= -fi - - - -if test "x${user_specified_javac}" = xjikes; then - FOUND_JIKES_TRUE= - FOUND_JIKES_FALSE='#' -else - FOUND_JIKES_TRUE='#' - FOUND_JIKES_FALSE= -fi - - - -if test "x${user_specified_javac}" = xecj; then - FOUND_ECJ_TRUE= - FOUND_ECJ_FALSE='#' -else - FOUND_ECJ_TRUE='#' - FOUND_ECJ_FALSE= -fi - - - -if test "x${user_specified_javac}" = xjavac; then - FOUND_JAVAC_TRUE= - FOUND_JAVAC_FALSE='#' -else - FOUND_JAVAC_TRUE='#' - FOUND_JAVAC_FALSE= -fi - - fi - - -if test "x${user_specified_javac}" = xkjc; then - FOUND_KJC_TRUE= - FOUND_KJC_FALSE='#' -else - FOUND_KJC_TRUE='#' - FOUND_KJC_FALSE= -fi - - - ## GCJ LOCAL - if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${ECJ}" = x \ - && test "x${JAVAC}" = x && test "x${user_specified_javac}" != xkjc - then - { { echo "$as_me:$LINENO: error: cannot find javac, try --with-ecj" >&5 -echo "$as_me: error: cannot find javac, try --with-ecj" >&2;} - { (exit 1); exit 1; }; } - fi - ## END GCJ LOCAL - - - - -# Check whether --with-classpath or --without-classpath was given. -if test "${with_classpath+set}" = set; then - withval="$with_classpath" - - if test "x${withval}" = xyes; then - # set user classpath to CLASSPATH from env - echo "$as_me:$LINENO: checking for classlib" >&5 -echo $ECHO_N "checking for classlib... $ECHO_C" >&6 - USER_CLASSLIB=${CLASSPATH} - - echo "$as_me:$LINENO: result: ${USER_CLASSLIB}" >&5 -echo "${ECHO_T}${USER_CLASSLIB}" >&6 - conditional_with_classlib=true - elif test "x${withval}" != x && test "x${withval}" != xno; then - # set user classpath to specified value - echo "$as_me:$LINENO: checking for classlib" >&5 -echo $ECHO_N "checking for classlib... $ECHO_C" >&6 - USER_CLASSLIB=${withval} - - echo "$as_me:$LINENO: result: ${withval}" >&5 -echo "${ECHO_T}${withval}" >&6 - conditional_with_classlib=true - fi - -else - conditional_with_classlib=false -fi; - - -if test "x${conditional_with_classlib}" = xtrue; then - USER_SPECIFIED_CLASSLIB_TRUE= - USER_SPECIFIED_CLASSLIB_FALSE='#' -else - USER_SPECIFIED_CLASSLIB_TRUE='#' - USER_SPECIFIED_CLASSLIB_FALSE= -fi - - # Check whether --with-vm-classes or --without-vm-classes was given. if test "${with_vm_classes+set}" = set; then @@ -26023,8 +24517,10 @@ echo $ECHO_N "checking for user supplied fastjar... $ECHO_C" >&6 echo "${ECHO_T}${FASTJAR}" >&6 else - # Extract the first word of "fastjar", so it can be a program name with args. -set dummy fastjar; ac_word=$2 + for ac_prog in fastjar gjar jar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FASTJAR+set}" = set; then @@ -26062,6 +24558,9 @@ else echo "${ECHO_T}no" >&6 fi + test -n "$FASTJAR" && break +done + fi; if test x"${FASTJAR}" != x; then ZIP="" @@ -26153,6 +24652,24 @@ fi; fi + # Check whether --enable-tools or --disable-tools was given. +if test "${enable_tools+set}" = set; then + enableval="$enable_tools" + case "${enableval}" in + yes) TOOLSDIR="tools" ;; + no) TOOLSDIR="" ;; + *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-tools" >&5 +echo "$as_me: error: bad value ${enableval} for --enable-tools" >&2;} + { (exit 1); exit 1; }; } ;; + esac +else + TOOLSDIR="tools" +fi; + if test "x${use_zip}" = xno && test "x${install_class_files}" = xno; then + TOOLSDIR="" + fi + + @@ -26260,8 +24777,33 @@ fi if test "${with_jay+set}" = set; then withval="$with_jay" - if test -d "${withval}"; then + echo "$as_me:$LINENO: checking whether to regenerate parsers with jay" >&5 +echo $ECHO_N "checking whether to regenerate parsers with jay... $ECHO_C" >&6 + JAY_FOUND=no + JAY_DIR_PATH= + if test "x${withval}" = xno; then + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + elif test "x${withval}" = xyes; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + JAY_DIR_PATH="/usr/share/jay" + elif test -d "${withval}"; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 JAY_DIR_PATH="${withval}" + elif test -f "${withval}"; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + JAY_DIR_PATH=`dirname "${withval}"` + JAY="${withval}" + else + { { echo "$as_me:$LINENO: error: jay not found at ${withval}" >&5 +echo "$as_me: error: jay not found at ${withval}" >&2;} + { (exit 1); exit 1; }; } + fi + + if test "x${JAY_DIR_PATH}" != x; then # Extract the first word of "jay", so it can be a program name with args. set dummy jay; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -26275,7 +24817,8 @@ else ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in ${JAY_DIR_PATH} +as_dummy="${JAY_DIR_PATH}:${PATH}" +for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -26303,17 +24846,12 @@ echo "${ECHO_T}no" >&6 fi if test "x${JAY}" = xno; then - { { echo "$as_me:$LINENO: error: \"jay executable not found\"" >&5 -echo "$as_me: error: \"jay executable not found\"" >&2;} + { { echo "$as_me:$LINENO: error: jay executable not found" >&5 +echo "$as_me: error: jay executable not found" >&2;} { (exit 1); exit 1; }; }; fi - else - JAY_DIR_PATH=`dirname "${withval}"` - JAY="${withval}" - - fi - JAY_SKELETON="${JAY_DIR_PATH}/skeleton" - as_ac_File=`echo "ac_cv_file_${JAY_SKELETON}" | $as_tr_sh` + JAY_SKELETON="${JAY_DIR_PATH}/skeleton" + as_ac_File=`echo "ac_cv_file_${JAY_SKELETON}" | $as_tr_sh` echo "$as_me:$LINENO: checking for ${JAY_SKELETON}" >&5 echo $ECHO_N "checking for ${JAY_SKELETON}... $ECHO_C" >&6 if eval "test \"\${$as_ac_File+set}\" = set"; then @@ -26334,15 +24872,20 @@ echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { echo "$as_me:$LINENO: error: \"Expected skeleton file in \`dirname ${withval}\`\"" >&5 -echo "$as_me: error: \"Expected skeleton file in \`dirname ${withval}\`\"" >&2;} + { { echo "$as_me:$LINENO: error: Expected skeleton file in ${JAY_DIR_PATH}" >&5 +echo "$as_me: error: Expected skeleton file in ${JAY_DIR_PATH}" >&2;} { (exit 1); exit 1; }; } fi - JAY_FOUND=yes + JAY_FOUND=yes + fi else + echo "$as_me:$LINENO: checking whether to regenerate parsers with jay" >&5 +echo $ECHO_N "checking whether to regenerate parsers with jay... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 JAY_FOUND=no fi; @@ -29306,6 +27849,173 @@ fi +# Check for javac if we need to build either the class library, +# the examples or the tools +if test "x${use_glibj_zip}" = xfalse || \ + test "x${EXAMPLESDIR}" != x || \ + test "x${TOOLSDIR}" != x && \ + test "x${build_class_files}" != xno; then + +if test "x$JAVAPREFIX" = x; then + test "x$JAVAC" = x && for ac_prog in "ecj$EXEEXT -warn:-deprecation,serial,unusedImport" "ecj-3.3$EXEEXT -warn:-deprecation,serial,unusedImport" "ecj-3.2$EXEEXT -warn:-deprecation,serial,unusedImport" "javac$EXEEXT -Xlint:unchecked" "gcj$EXEEXT -C" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_JAVAC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$JAVAC"; then + ac_cv_prog_JAVAC="$JAVAC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_JAVAC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +JAVAC=$ac_cv_prog_JAVAC +if test -n "$JAVAC"; then + echo "$as_me:$LINENO: result: $JAVAC" >&5 +echo "${ECHO_T}$JAVAC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$JAVAC" && break +done + +else + test "x$JAVAC" = x && for ac_prog in "ecj$EXEEXT -warn:-deprecation,serial,unusedImport" "ecj-3.3$EXEEXT -warn:-deprecation,serial,unusedImport" "ecj-3.2$EXEEXT -warn:-deprecation,serial,unusedImport" "javac$EXEEXT -Xlint:unchecked" "gcj$EXEEXT -C" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_JAVAC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$JAVAC"; then + ac_cv_prog_JAVAC="$JAVAC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_JAVAC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +JAVAC=$ac_cv_prog_JAVAC +if test -n "$JAVAC"; then + echo "$as_me:$LINENO: result: $JAVAC" >&5 +echo "${ECHO_T}$JAVAC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$JAVAC" && break +done +test -n "$JAVAC" || JAVAC="$JAVAPREFIX" + +fi +test "x$JAVAC" = x && { { echo "$as_me:$LINENO: error: no acceptable Java compiler found in \$PATH" >&5 +echo "$as_me: error: no acceptable Java compiler found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +if test "$enable_java_maintainer_mode" = yes; then + +echo "$as_me:$LINENO: checking if $JAVAC works" >&5 +echo $ECHO_N "checking if $JAVAC works... $ECHO_C" >&6 +if test "${ac_cv_prog_javac_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +JAVA_TEST=Object.java +CLASS_TEST=Object.class +cat << \EOF > $JAVA_TEST +/* #line 27957 "configure" */ +package java.lang; + +public class Object +{ + static <T> void doStuff() + { + } +} +EOF +if { ac_try='$JAVAC $JAVA_TEST' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null 2>&1; then + ac_cv_prog_javac_works=yes +else + { { echo "$as_me:$LINENO: error: The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" >&5 +echo "$as_me: error: The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" >&2;} + { (exit 1); exit 1; }; } + echo "configure: failed program was:" >&5 + cat $JAVA_TEST >&5 +fi +rm -f $JAVA_TEST $CLASS_TEST + +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_javac_works" >&5 +echo "${ECHO_T}$ac_cv_prog_javac_works" >&6 + +fi + + + JAVA_TEST=Test.java + CLASS_TEST=Test.class + cat << \EOF > $JAVA_TEST + /* #line 27993 "configure" */ + public class Test + { + public static void main(String args) + { + System.out.println("Hello World"); + } + } +EOF + echo "$as_me:$LINENO: checking whether javac supports -J" >&5 +echo $ECHO_N "checking whether javac supports -J... $ECHO_C" >&6 + $JAVAC $JAVACFLAGS -J-Xmx768M -sourcepath '' $JAVA_TEST + javac_result=$? + if test "x$javac_result" = "x0"; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + JAVAC_MEM_OPT="-J-Xmx768M" + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi + rm -f $JAVA_TEST $CLASS_TEST + + +fi + # Check whether --with-escher or --without-escher was given. if test "${with_escher+set}" = set; then @@ -29630,7 +28340,7 @@ fi - ac_config_files="$ac_config_files Makefile doc/Makefile doc/api/Makefile external/Makefile external/sax/Makefile external/w3c_dom/Makefile external/relaxngDatatype/Makefile external/jsr166/Makefile gnu/classpath/Configuration.java gnu/java/security/Configuration.java include/Makefile native/Makefile native/fdlibm/Makefile native/jawt/Makefile native/jni/Makefile native/jni/classpath/Makefile native/jni/java-io/Makefile native/jni/java-lang/Makefile native/jni/java-net/Makefile native/jni/java-nio/Makefile native/jni/java-util/Makefile native/jni/gtk-peer/Makefile native/jni/gconf-peer/Makefile native/jni/gstreamer-peer/Makefile native/jni/qt-peer/Makefile native/jni/xmlj/Makefile native/jni/midi-alsa/Makefile native/jni/midi-dssi/Makefile native/jni/native-lib/Makefile native/plugin/Makefile resource/Makefile resource/META-INF/services/java.util.prefs.PreferencesFactory resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader resource/META-INF/services/javax.sound.sampled.spi.MixerProvider scripts/Makefile scripts/classpath.spec lib/Makefile lib/gen-classlist.sh lib/copy-vmresources.sh tools/Makefile examples/Makefile examples/Makefile.jawt examples/Makefile.java2d" + ac_config_files="$ac_config_files Makefile doc/Makefile doc/api/Makefile external/Makefile external/sax/Makefile external/w3c_dom/Makefile external/relaxngDatatype/Makefile external/jsr166/Makefile gnu/classpath/Configuration.java gnu/java/security/Configuration.java include/Makefile native/Makefile native/fdlibm/Makefile native/jawt/Makefile native/jni/Makefile native/jni/classpath/Makefile native/jni/java-io/Makefile native/jni/java-lang/Makefile native/jni/java-net/Makefile native/jni/java-nio/Makefile native/jni/java-util/Makefile native/jni/gtk-peer/Makefile native/jni/gconf-peer/Makefile native/jni/gstreamer-peer/Makefile native/jni/qt-peer/Makefile native/jni/xmlj/Makefile native/jni/midi-alsa/Makefile native/jni/midi-dssi/Makefile native/jni/native-lib/Makefile native/plugin/Makefile resource/Makefile resource/META-INF/services/java.util.prefs.PreferencesFactory resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader resource/META-INF/services/javax.sound.sampled.spi.MixerProvider scripts/Makefile scripts/classpath.spec lib/Makefile lib/gen-classlist.sh lib/copy-vmresources.sh scripts/check_jni_methods.sh tools/Makefile examples/Makefile examples/Makefile.jawt examples/Makefile.java2d" if test "x${COMPILE_WRAPPERS}" = xno @@ -29898,76 +28608,6 @@ echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${FOUND_GCJ_TRUE}" && test -z "${FOUND_GCJ_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"FOUND_GCJ\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"FOUND_GCJ\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${FOUND_JIKES_TRUE}" && test -z "${FOUND_JIKES_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"FOUND_JIKES\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"FOUND_JIKES\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${FOUND_ECJ_TRUE}" && test -z "${FOUND_ECJ_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"FOUND_ECJ\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"FOUND_ECJ\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${FOUND_JAVAC_TRUE}" && test -z "${FOUND_JAVAC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"FOUND_JAVAC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"FOUND_JAVAC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${FOUND_GCJ_TRUE}" && test -z "${FOUND_GCJ_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"FOUND_GCJ\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"FOUND_GCJ\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${FOUND_JIKES_TRUE}" && test -z "${FOUND_JIKES_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"FOUND_JIKES\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"FOUND_JIKES\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${FOUND_ECJ_TRUE}" && test -z "${FOUND_ECJ_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"FOUND_ECJ\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"FOUND_ECJ\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${FOUND_JAVAC_TRUE}" && test -z "${FOUND_JAVAC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"FOUND_JAVAC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"FOUND_JAVAC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${FOUND_KJC_TRUE}" && test -z "${FOUND_KJC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"FOUND_KJC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"FOUND_KJC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${USER_SPECIFIED_CLASSLIB_TRUE}" && test -z "${USER_SPECIFIED_CLASSLIB_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"USER_SPECIFIED_CLASSLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"USER_SPECIFIED_CLASSLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -30302,7 +28942,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by GNU Classpath $as_me 0.96-pre, which was +This file was extended by GNU Classpath $as_me 0.97.2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -30368,7 +29008,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -GNU Classpath config.status 0.96-pre +GNU Classpath config.status 0.97.2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -30880,6 +29520,7 @@ do "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "lib/gen-classlist.sh" ) CONFIG_FILES="$CONFIG_FILES lib/gen-classlist.sh" ;; "lib/copy-vmresources.sh" ) CONFIG_FILES="$CONFIG_FILES lib/copy-vmresources.sh" ;; + "scripts/check_jni_methods.sh" ) CONFIG_FILES="$CONFIG_FILES scripts/check_jni_methods.sh" ;; "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; "examples/Makefile.jawt" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile.jawt" ;; @@ -31165,26 +29806,6 @@ s,@GLIB_LIBS@,$GLIB_LIBS,;t t s,@PLUGIN_DIR@,$PLUGIN_DIR,;t t s,@USER_JAVAH@,$USER_JAVAH,;t t s,@CLASSPATH_INCLUDES@,$CLASSPATH_INCLUDES,;t t -s,@GCJ@,$GCJ,;t t -s,@JIKES@,$JIKES,;t t -s,@JIKESENCODING@,$JIKESENCODING,;t t -s,@JIKESWARNINGS@,$JIKESWARNINGS,;t t -s,@KJC@,$KJC,;t t -s,@ECJ@,$ECJ,;t t -s,@JAVAC@,$JAVAC,;t t -s,@FOUND_GCJ_TRUE@,$FOUND_GCJ_TRUE,;t t -s,@FOUND_GCJ_FALSE@,$FOUND_GCJ_FALSE,;t t -s,@FOUND_JIKES_TRUE@,$FOUND_JIKES_TRUE,;t t -s,@FOUND_JIKES_FALSE@,$FOUND_JIKES_FALSE,;t t -s,@FOUND_ECJ_TRUE@,$FOUND_ECJ_TRUE,;t t -s,@FOUND_ECJ_FALSE@,$FOUND_ECJ_FALSE,;t t -s,@FOUND_JAVAC_TRUE@,$FOUND_JAVAC_TRUE,;t t -s,@FOUND_JAVAC_FALSE@,$FOUND_JAVAC_FALSE,;t t -s,@FOUND_KJC_TRUE@,$FOUND_KJC_TRUE,;t t -s,@FOUND_KJC_FALSE@,$FOUND_KJC_FALSE,;t t -s,@USER_CLASSLIB@,$USER_CLASSLIB,;t t -s,@USER_SPECIFIED_CLASSLIB_TRUE@,$USER_SPECIFIED_CLASSLIB_TRUE,;t t -s,@USER_SPECIFIED_CLASSLIB_FALSE@,$USER_SPECIFIED_CLASSLIB_FALSE,;t t s,@vm_classes@,$vm_classes,;t t s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t @@ -31207,6 +29828,7 @@ s,@INSTALL_CLASS_FILES_FALSE@,$INSTALL_CLASS_FILES_FALSE,;t t s,@BUILD_CLASS_FILES_TRUE@,$BUILD_CLASS_FILES_TRUE,;t t s,@BUILD_CLASS_FILES_FALSE@,$BUILD_CLASS_FILES_FALSE,;t t s,@EXAMPLESDIR@,$EXAMPLESDIR,;t t +s,@TOOLSDIR@,$TOOLSDIR,;t t s,@GJDOC@,$GJDOC,;t t s,@CREATE_API_DOCS_TRUE@,$CREATE_API_DOCS_TRUE,;t t s,@CREATE_API_DOCS_FALSE@,$CREATE_API_DOCS_FALSE,;t t @@ -31217,6 +29839,8 @@ s,@REGEN_PARSERS_FALSE@,$REGEN_PARSERS_FALSE,;t t s,@USE_PREBUILT_GLIBJ_ZIP_TRUE@,$USE_PREBUILT_GLIBJ_ZIP_TRUE,;t t s,@USE_PREBUILT_GLIBJ_ZIP_FALSE@,$USE_PREBUILT_GLIBJ_ZIP_FALSE,;t t s,@PATH_TO_GLIBJ_ZIP@,$PATH_TO_GLIBJ_ZIP,;t t +s,@JAVAC@,$JAVAC,;t t +s,@JAVAC_MEM_OPT@,$JAVAC_MEM_OPT,;t t s,@USE_ESCHER_TRUE@,$USE_ESCHER_TRUE,;t t s,@USE_ESCHER_FALSE@,$USE_ESCHER_FALSE,;t t s,@PATH_TO_ESCHER@,$PATH_TO_ESCHER,;t t |