diff options
Diffstat (limited to 'libjava/configure.ac')
| -rw-r--r-- | libjava/configure.ac | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac index d2f1c1058fa..55de5d6384a 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -162,13 +162,6 @@ AM_PROG_GCJ AM_PROG_CC_C_O AC_CONFIG_SUBDIRS(libltdl) -if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then - COMPPATH=. -else - COMPPATH=.. -fi -AC_SUBST(COMPPATH) - # The -no-testsuite modules omit the test subdir. AM_CONDITIONAL(TESTSUBDIR, test -d $srcdir/testsuite) @@ -218,6 +211,13 @@ AC_ARG_ENABLE(libgcj-multifile, esac],[enable_libgcj_multifile=no]) AM_CONDITIONAL(ONESTEP, test "$enable_libgcj_multifile" = yes) +AC_ARG_WITH(java-home, + AS_HELP_STRING([--with-java-home=DIRECTORY], + [value of java.home system property]), + [JAVA_HOME="${withval}"], [JAVA_HOME=""]) +AM_CONDITIONAL(JAVA_HOME_SET, test ! -z "$JAVA_HOME") +AC_SUBST(JAVA_HOME) + # What is the native OS API for MinGW? AC_ARG_WITH(win32-nlsapi, AS_HELP_STRING([--with-win32-nlsapi=ansi or unicows or unicode], @@ -1014,6 +1014,11 @@ else PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1) AC_SUBST(LIBART_CFLAGS) AC_SUBST(LIBART_LIBS) + + # We require the XTest Extension to support java.awt.Robot. + AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true], + [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])], + [${X_LIBS}]) fi # On Solaris, and maybe other architectures, the Boehm collector @@ -1034,7 +1039,7 @@ NATIVE=yes # Which gcj do we use? which_gcj=default -built_gcc_dir="`cd ${builddotdot}/../../gcc && ${PWDCMD-pwd}`" +built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`" if test -n "${with_cross_host}"; then # We are being configured with a cross compiler. We can't # use ac_exeext, because that is for the target platform. @@ -1073,8 +1078,8 @@ fi case "${which_gcj}" in built) GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/" - GCJH='$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh' - ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar' + GCJH='$(top_builddir)/$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh' + ZIP='$(top_builddir)/$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar' ;; cross) if test "x${with_newlib}" = "xyes"; then @@ -1084,14 +1089,14 @@ case "${which_gcj}" in else GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/" fi - ZIP=jar + ZIP='$(target_noncanonical)-fastjar' GCJH='$(target_noncanonical)-gcjh' ;; path) GCJ="gcj -B`${PWDCMD-pwd}`/" ## In this case, gcj is found outside the build tree. However, zip is ## found in the build tree. - ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar' + ZIP='$(top_builddir)/$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar' GCJH=gcjh ;; esac @@ -1202,6 +1207,9 @@ GCJVERSION=$gcjversion AC_SUBST(GCJVERSION) AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERSION", [Short GCJ version ID]) +AC_DEFINE(JV_VERSION, "1.4.2", [Compatibility version string]) +AC_DEFINE(JV_API_VERSION, "1.4", [API compatibility version string]) + TL_AC_GXX_INCLUDE_DIR # We check for sys/filio.h because Solaris 2.5 defines FIONREAD there. @@ -1405,6 +1413,12 @@ case " $CONFIG_FILES " in ac_file=Makefile . ${libgcj_basedir}/../config-ml.in ;; esac +for ac_multi_file in $CONFIG_FILES; do + case $ac_multi_file in + */Makefile) + grep "^MULTI[[^ ]]* =" Makefile >> "$ac_multi_file" ;; + esac +done ], srcdir=${srcdir} host=${host} |