INTEGRATION: CWS gcj1 (1.60.4); FILE MERGED
2005/01/07 08:59:08 cmc 1.60.4.6: RESYNC: (1.60-1.63); FILE MERGED 2005/01/06 14:10:09 cmc 1.60.4.5: #i38188# don't poke CLASSPATH with gcj and require javadoc 2004/12/10 23:23:40 cmc 1.60.4.4: #i34439# backout AC_path_PROG idocy 2004/12/10 08:47:24 cmc 1.60.4.3: #i38188# little tweak 2004/12/03 08:47:20 cmc 1.60.4.2: #i38188# don't need xsltproc with gcj, search seperately for javadoc, and don't get too excited if it is missing 2004/12/01 08:24:12 cmc 1.60.4.1: #i38188# convert --enable-java/--disable-java into --with[out]java=foo where --without-java is like --disable-java, --with-java is like --enable-java, and --with-java=foo where foo is specified overrides the default java interpreter, e.g. --with-java=gij
This commit is contained in:
Oliver Bolte
parent
f3b5c7e0dc
commit
e2ecbf12ae
1 changed files with 267 additions and 117 deletions
384
config_office/configure
vendored
384
config_office/configure
vendored
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in Revision: 1.74.4.28 .
|
||||
# From configure.in Revision .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59.
|
||||
#
|
||||
|
|
@ -309,7 +309,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 AWK SED OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH HAVE_GCC_VISIBILITY_FEATURE RPM GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL SOLAR_JAVA JAVAC JAVA XSLTPROC JAVA_HOME JDK XMKMF PERL DMAKE BUILD_DMAKE EPM SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_NAS NAS_INCLUDES NEON_CONFIG SYSTEM_NEON NEON_LIBS NEON_CFLAGS PSDK_HOME DIRECTXSDK_HOME EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN WITH_MOZILLA WITH_OPENLDAP MOZILLA_CFLAGS MOZILLA_LIBS MOZILLABASE_CFLAGS MOZILLABASE_LIBS SYSTEM_MOZILLA WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK CUSTOM_IMAGE_SETS LOCAL_SOLENV UPD SOURCEVERSION LOCAL_SOLVER 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 AWK SED OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH HAVE_GCC_VISIBILITY_FEATURE RPM GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVADOC JAVA_HOME JDK XSLTPROC XMKMF PERL DMAKE BUILD_DMAKE EPM SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_NAS NAS_INCLUDES NEON_CONFIG SYSTEM_NEON NEON_LIBS NEON_CFLAGS PSDK_HOME DIRECTXSDK_HOME EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN WITH_MOZILLA WITH_OPENLDAP MOZILLA_CFLAGS MOZILLA_LIBS MOZILLABASE_CFLAGS MOZILLABASE_LIBS SYSTEM_MOZILLA WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK CUSTOM_IMAGE_SETS LOCAL_SOLENV UPD SOURCEVERSION LOCAL_SOLVER LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -927,10 +927,6 @@ Optional Features:
|
|||
|
||||
--disable-rpath: Disable the use of relative paths in shared libraries
|
||||
|
||||
--disable-java Build without Java support. Use if there is no supported JDK
|
||||
for your platform. The build will have no support for Java
|
||||
components, applets, accessibility or XML filters.
|
||||
|
||||
--enable-check-only Use this option option if you just want to check your
|
||||
environment. This option stops the generation of an
|
||||
????env.set
|
||||
|
|
@ -1016,6 +1012,11 @@ Optional Packages:
|
|||
|
||||
Usage: --with-gxx-include-path=<absolute path to g++ include dir>
|
||||
|
||||
--with-java Build without Java support. If you use --without-java then
|
||||
the build will have no support for Java components, applets,
|
||||
accessibility or XML filters. Use --with-java=gij to enable gij/gcj
|
||||
as java/javac replacements
|
||||
|
||||
--with-ant-home If you have installed Jakarta Ant on your system,
|
||||
please supply the path here.
|
||||
Note that this is not the location of the Ant binary
|
||||
|
|
@ -1840,10 +1841,13 @@ if test "${with_gxx_include_path+set}" = set; then
|
|||
withval="$with_gxx_include_path"
|
||||
|
||||
fi;
|
||||
# Check whether --enable-java or --disable-java was given.
|
||||
if test "${enable_java+set}" = set; then
|
||||
enableval="$enable_java"
|
||||
|
||||
# Check whether --with-java or --without-java was given.
|
||||
if test "${with_java+set}" = set; then
|
||||
withval="$with_java"
|
||||
WITH_JAVA=$withval
|
||||
else
|
||||
WITH_JAVA=java
|
||||
fi;
|
||||
|
||||
# Check whether --with-ant-home or --without-ant-home was given.
|
||||
|
|
@ -6240,30 +6244,36 @@ fi
|
|||
|
||||
echo "$as_me:$LINENO: checking whether to build with Java support" >&5
|
||||
echo $ECHO_N "checking whether to build with Java support... $ECHO_C" >&6
|
||||
if test "$enable_java" != "no"; then
|
||||
if test "$WITH_JAVA" != "no"; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
SOLAR_JAVA="TRUE"
|
||||
NEEDXSLTPROC="no"
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
SOLAR_JAVA=""
|
||||
NEEDXSLTPROC="yes"
|
||||
|
||||
{ echo "$as_me:$LINENO: WARNING: building without java will mean some features will not be available" >&5
|
||||
echo "$as_me: WARNING: building without java will mean some features will not be available" >&2;}
|
||||
echo "building without java will mean some features will not be available" >>warn
|
||||
fi
|
||||
|
||||
|
||||
if test "$enable_java" != "no"; then
|
||||
if test "$SOLAR_JAVA" != ""; then
|
||||
JAVA_HOME=; export JAVA_HOME
|
||||
if test -z "$with_jdk_home"; then
|
||||
# Extract the first word of "javac", so it can be a program name with args.
|
||||
set dummy javac; ac_word=$2
|
||||
# Extract the first word of "$WITH_JAVA", so it can be a program name with args.
|
||||
set dummy $WITH_JAVA; 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
|
||||
if test "${ac_cv_path_JAVAINTERPRETER+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $JAVAC in
|
||||
case $JAVAINTERPRETER in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path.
|
||||
ac_cv_path_JAVAINTERPRETER="$JAVAINTERPRETER" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
|
|
@ -6273,7 +6283,7 @@ do
|
|||
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"
|
||||
ac_cv_path_JAVAINTERPRETER="$as_dir/$ac_word$ac_exec_ext"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
|
|
@ -6283,91 +6293,35 @@ done
|
|||
;;
|
||||
esac
|
||||
fi
|
||||
JAVAC=$ac_cv_path_JAVAC
|
||||
JAVAINTERPRETER=$ac_cv_path_JAVAINTERPRETER
|
||||
|
||||
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
|
||||
|
||||
# Extract the first word of "java", so it can be a program name with args.
|
||||
set dummy java; 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_JAVA+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $JAVA in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_JAVA="$JAVA" # 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_JAVA="$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
|
||||
JAVA=$ac_cv_path_JAVA
|
||||
|
||||
if test -n "$JAVA"; then
|
||||
echo "$as_me:$LINENO: result: $JAVA" >&5
|
||||
echo "${ECHO_T}$JAVA" >&6
|
||||
if test -n "$JAVAINTERPRETER"; then
|
||||
echo "$as_me:$LINENO: result: $JAVAINTERPRETER" >&5
|
||||
echo "${ECHO_T}$JAVAINTERPRETER" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
else
|
||||
_javac_path="$with_jdk_home/bin/javac"
|
||||
if test -x "$_javac_path"; then
|
||||
JAVAC=$_javac_path
|
||||
else
|
||||
_javac_path="$with_jdk_home/gcj"
|
||||
if test -x "$_javac_path"; then
|
||||
JAVAC=$_javac_path
|
||||
else
|
||||
{ { echo "$as_me:$LINENO: error: $_javac_path not found set with_jdk_home" >&5
|
||||
echo "$as_me: error: $_javac_path not found set with_jdk_home" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
fi
|
||||
|
||||
_java_path="$with_jdk_home/bin/java"
|
||||
_java_path="$with_jdk_home/bin/$WITH_JAVA"
|
||||
if test -x "$_java_path"; then
|
||||
JAVA=$_java_path
|
||||
JAVAINTERPRETER=$_java_path
|
||||
else
|
||||
_java_path="$with_jdk_home/gij"
|
||||
if test -x "$_java_path"; then
|
||||
JAVA=$_java_path
|
||||
else
|
||||
{ { echo "$as_me:$LINENO: error: $_java_path not found set with_jdk_home" >&5
|
||||
{ { echo "$as_me:$LINENO: error: $_java_path not found set with_jdk_home" >&5
|
||||
echo "$as_me: error: $_java_path not found set with_jdk_home" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$SOLAR_JAVA" != ""; then
|
||||
echo "$as_me:$LINENO: checking the installed JDK" >&5
|
||||
echo $ECHO_N "checking the installed JDK... $ECHO_C" >&6
|
||||
if test "$JAVA"; then
|
||||
if test "$JAVAINTERPRETER"; then
|
||||
if test `$JAVAINTERPRETER -version 2>&1 | grep -c "Kaffe"` -gt 0; then
|
||||
|
||||
if test `$JAVA -version 2>&1 | grep -c "Kaffe"` -gt 0; then
|
||||
|
||||
KAFFE_VER=`$JAVA -version 2>&1 | $EGREP " Version:" | $SED -r "s/.* Version: ([0-9\.]*).*/\1/"`
|
||||
KAFFE_VER=`$JAVAINTERPRETER -version 2>&1 | $EGREP " Version:" | $SED -r "s/.* Version: ([0-9\.]*).*/\1/"`
|
||||
if test -z "$KAFFE_VER"; then
|
||||
{ { echo "$as_me:$LINENO: error: looks like Kaffe but version detection failed" >&5
|
||||
echo "$as_me: error: looks like Kaffe but version detection failed" >&2;}
|
||||
|
|
@ -6387,28 +6341,17 @@ echo "${ECHO_T}checked (Kaffe $KAFFE_VER)" >&6
|
|||
{ echo "$as_me:$LINENO: WARNING: EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >&5
|
||||
echo "$as_me: WARNING: EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >&2;}
|
||||
echo "EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >>warn
|
||||
JAVA_HOME=`echo $JAVAC | $SED -n "s,//*bin//*javac,,p"`
|
||||
elif test `$JAVAC -v 2>&1 | grep -c "gcc version"` -gt 0; then
|
||||
|
||||
|
||||
GCJ_VER=`$JAVAC -dumpversion 2>&1`
|
||||
if test -z "$GCJ_VER"; then
|
||||
{ { echo "$as_me:$LINENO: error: looks like gcj but version detection failed" >&5
|
||||
echo "$as_me: error: looks like gcj but version detection failed" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
_gcj_ver=$GCJ_VER
|
||||
|
||||
JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
|
||||
elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then
|
||||
JDK=gcj
|
||||
echo "$as_me:$LINENO: result: checked (gcj $GCJ_VER)" >&5
|
||||
echo "${ECHO_T}checked (gcj $GCJ_VER)" >&6
|
||||
{ echo "$as_me:$LINENO: WARNING: EXPERIMENTAL: gcj is not a full JDK replacement - some projects will fail to compile" >&5
|
||||
echo "$as_me: WARNING: EXPERIMENTAL: gcj is not a full JDK replacement - some projects will fail to compile" >&2;}
|
||||
echo "EXPERIMENTAL: gcj is not a full JDK replacement - some projects will fail to compile" >>warn
|
||||
JAVA_HOME=`echo $JAVAC | $SED -n "s,//*gcj,,p"`
|
||||
echo "$as_me:$LINENO: result: checked (gcj)" >&5
|
||||
echo "${ECHO_T}checked (gcj)" >&6
|
||||
{ echo "$as_me:$LINENO: WARNING: EXPERIMENTAL: gij/gcj is not a full JDK replacement - some projects will fail to compile" >&5
|
||||
echo "$as_me: WARNING: EXPERIMENTAL: gij/gcj is not a full JDK replacement - some projects will fail to compile" >&2;}
|
||||
echo "EXPERIMENTAL: gij/gcj is not a full JDK replacement - some projects will fail to compile" >>warn
|
||||
JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*gij,,p"`
|
||||
else
|
||||
|
||||
_jdk=`$JAVAC -J-version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[-A-Za-z]*//`
|
||||
_jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[-A-Za-z]*//`
|
||||
_jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
|
||||
|
||||
if test "$_jdk_ver" -lt 10300; then
|
||||
|
|
@ -6418,16 +6361,214 @@ echo "$as_me: error: JDK is too old, you need at least 1.3" >&2;}
|
|||
fi
|
||||
echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5
|
||||
echo "${ECHO_T}checked (JDK $_jdk)" >&6
|
||||
JAVA_HOME=`echo $JAVAC | $SED -n "s,//*bin//*javac,,p"`
|
||||
JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
|
||||
fi
|
||||
else
|
||||
{ { echo "$as_me:$LINENO: error: JAVA not found. You need at least jdk-1.3, Kaffee 1.01, or gcj" >&5
|
||||
echo "$as_me: error: JAVA not found. You need at least jdk-1.3, Kaffee 1.01, or gcj" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
XSLTPROC=NO_XSLTPROC
|
||||
else
|
||||
JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
|
||||
fi
|
||||
|
||||
if test "$SOLAR_JAVA" != ""; then
|
||||
if test "$JDK" == "gcj"; then
|
||||
javacompiler="gcj"
|
||||
else
|
||||
javacompiler="javac"
|
||||
fi
|
||||
if test -z "$with_jdk_home"; then
|
||||
# Extract the first word of "$javacompiler", so it can be a program name with args.
|
||||
set dummy $javacompiler; 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_JAVACOMPILER+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $JAVACOMPILER in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_JAVACOMPILER="$JAVACOMPILER" # 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_JAVACOMPILER="$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
|
||||
JAVACOMPILER=$ac_cv_path_JAVACOMPILER
|
||||
|
||||
if test -n "$JAVACOMPILER"; then
|
||||
echo "$as_me:$LINENO: result: $JAVACOMPILER" >&5
|
||||
echo "${ECHO_T}$JAVACOMPILER" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
else
|
||||
_javac_path="$with_jdk_home/bin/$javacompiler"
|
||||
if test -x "$_javac_path"; then
|
||||
JAVACOMPILER=$_javac_path
|
||||
fi
|
||||
fi
|
||||
if test -z "$JAVACOMPILER"; then
|
||||
{ { echo "$as_me:$LINENO: error: $javacompiler not found set with_jdk_home" >&5
|
||||
echo "$as_me: error: $javacompiler not found set with_jdk_home" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$SOLAR_JAVA" != ""; then
|
||||
if test -z "$with_jdk_home"; then
|
||||
# Extract the first word of "javadoc", so it can be a program name with args.
|
||||
set dummy javadoc; 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_JAVADOC+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $JAVADOC in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_JAVADOC="$JAVADOC" # 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_JAVADOC="$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
|
||||
JAVADOC=$ac_cv_path_JAVADOC
|
||||
|
||||
if test -n "$JAVADOC"; then
|
||||
echo "$as_me:$LINENO: result: $JAVADOC" >&5
|
||||
echo "${ECHO_T}$JAVADOC" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
else
|
||||
_javadoc_path="$with_jdk_home/bin/javadoc"
|
||||
if test -x "$_javadoc_path"; then
|
||||
JAVADOC=$_javadoc_path
|
||||
else
|
||||
# Extract the first word of "javadoc", so it can be a program name with args.
|
||||
set dummy javadoc; 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_JAVADOC+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $JAVADOC in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_JAVADOC="$JAVADOC" # 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_JAVADOC="$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
|
||||
JAVADOC=$ac_cv_path_JAVADOC
|
||||
|
||||
if test -n "$JAVADOC"; then
|
||||
echo "$as_me:$LINENO: result: $JAVADOC" >&5
|
||||
echo "${ECHO_T}$JAVADOC" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
fi
|
||||
fi
|
||||
if test -z "$JAVADOC"; then
|
||||
{ { echo "$as_me:$LINENO: error: $_javadoc_path not found set with_jdk_home" >&5
|
||||
echo "$as_me: error: $_javadoc_path not found set with_jdk_home" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$SOLAR_JAVA" != ""; then
|
||||
if test "$JDK" != "gcj"; then
|
||||
# check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
|
||||
if test "$JAVA_HOME" == "/usr" -a "x$with_jdk_home" == "x"; then
|
||||
|
||||
if basename $(readlink $(readlink $JAVAC)) >/dev/null 2>/dev/null; then
|
||||
# try to recover first by looking whether we have a alternatives
|
||||
# system as in Debian or newer SuSEs where following /usr/bin/javac
|
||||
# over /etc/alternatives/javac leads to the right bindir where we
|
||||
# just need to strip a bit away to get a valid JAVA_HOME
|
||||
JAVA_HOME=$(readlink $(readlink $JAVAC) | $SED -e s,/bin/javac$,,)
|
||||
else
|
||||
# else warn
|
||||
{ echo "$as_me:$LINENO: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&5
|
||||
echo "$as_me: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&5
|
||||
echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&2;}
|
||||
echo "JAVA_HOME is set to /usr - this is very likely to be incorrect" >> warn
|
||||
echo "if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >> warn
|
||||
fi
|
||||
fi
|
||||
# now check if $JAVA_HOME is really valid
|
||||
if test ! -d "$JAVA_HOME/jre" -a "x$with_jdk_home" == "x"; then
|
||||
{ echo "$as_me:$LINENO: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&5
|
||||
echo "$as_me: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&5
|
||||
echo "$as_me: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&5
|
||||
echo "$as_me: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&2;}
|
||||
echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
|
||||
echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
|
||||
echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if test "$NEEDXSLTPROC" = "no"; then
|
||||
XSLTPROC=NO_XSLTPROC
|
||||
else
|
||||
# Extract the first word of "xsltproc", so it can be a program name with args.
|
||||
set dummy xsltproc; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
|
|
@ -6469,8 +6610,8 @@ echo "${ECHO_T}no" >&6
|
|||
fi
|
||||
|
||||
if test "$XSLTPROC" = "no"; then
|
||||
{ { echo "$as_me:$LINENO: error: xsltproc is required when building with --disable-java." >&5
|
||||
echo "$as_me: error: xsltproc is required when building with --disable-java." >&2;}
|
||||
{ { echo "$as_me:$LINENO: error: xsltproc is required" >&5
|
||||
echo "$as_me: error: xsltproc is required" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
fi
|
||||
|
|
@ -13520,7 +13661,8 @@ fi
|
|||
|
||||
|
||||
|
||||
if test "$enable_java" != "no"; then
|
||||
|
||||
if test "$SOLAR_JAVA" != ""; then
|
||||
ANT_HOME=; export ANT_HOME
|
||||
WITH_ANT_HOME=; export WITH_ANT_HOME
|
||||
if test -z "$with_ant_home"; then
|
||||
|
|
@ -13617,7 +13759,6 @@ done
|
|||
WITH_ANT_HOME=$with_ant_home
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$ANT"; then
|
||||
{ { echo "$as_me:$LINENO: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&5
|
||||
echo "$as_me: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&2;}
|
||||
|
|
@ -13652,7 +13793,11 @@ cat > conftest.xml << EOF
|
|||
</project>
|
||||
EOF
|
||||
|
||||
ant_cmd="$ANT -buildfile conftest.xml 1>&2"
|
||||
if test "$JDK" == "gcj"; then
|
||||
ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
|
||||
else
|
||||
ant_cmd="$ANT -buildfile conftest.xml 1>&2"
|
||||
fi
|
||||
{ (eval echo "$as_me:$LINENO: \"$ant_cmd\"") >&5
|
||||
(eval $ant_cmd) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -13695,9 +13840,13 @@ echo $ECHO_N "checking Ant lib directory... $ECHO_C" >&6
|
|||
if test -f /usr/share/java/ant.jar; then
|
||||
ANT_LIB=/usr/share/java
|
||||
else
|
||||
{ { echo "$as_me:$LINENO: error: Ant libraries not found!" >&5
|
||||
if test -f /usr/share/ant-core/lib/ant.jar; then
|
||||
ANT_LIB=/usr/share/ant-core/lib
|
||||
else
|
||||
{ { echo "$as_me:$LINENO: error: Ant libraries not found!" >&5
|
||||
echo "$as_me: error: Ant libraries not found!" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
@ -14500,11 +14649,12 @@ s,@CXXCPP@,$CXXCPP,;t t
|
|||
s,@STLPORT4@,$STLPORT4,;t t
|
||||
s,@USE_SYSTEM_STL@,$USE_SYSTEM_STL,;t t
|
||||
s,@SOLAR_JAVA@,$SOLAR_JAVA,;t t
|
||||
s,@JAVAC@,$JAVAC,;t t
|
||||
s,@JAVA@,$JAVA,;t t
|
||||
s,@XSLTPROC@,$XSLTPROC,;t t
|
||||
s,@JAVAINTERPRETER@,$JAVAINTERPRETER,;t t
|
||||
s,@JAVACOMPILER@,$JAVACOMPILER,;t t
|
||||
s,@JAVADOC@,$JAVADOC,;t t
|
||||
s,@JAVA_HOME@,$JAVA_HOME,;t t
|
||||
s,@JDK@,$JDK,;t t
|
||||
s,@XSLTPROC@,$XSLTPROC,;t t
|
||||
s,@XMKMF@,$XMKMF,;t t
|
||||
s,@PERL@,$PERL,;t t
|
||||
s,@DMAKE@,$DMAKE,;t t
|
||||
|
|
|
|||
Loading…
Reference in a new issue