1 --- config_office/configure.in.orig 2003-09-22 11:14:29.000000000 -0700
2 +++ config_office/configure.in 2003-09-22 11:33:19.000000000 -0700
3 @@ -1124,66 +1124,79 @@
4 dnl ===================================================================
6 dnl ===================================================================
7 -JAVA_HOME=; export JAVA_HOME
8 -if test -z "$with_jdk_home"; then
9 - AC_PATH_PROG(JAVAC, javac)
10 - AC_PATH_PROG(JAVA, java)
12 - _javac_path="$with_jdk_home/bin/javac"
13 - dnl Check if there is a java compiler at all.
14 - if test -x "$_javac_path"; then
17 - AC_MSG_ERROR([$_javac_path not found set with_jdk_home])
18 +if test "$enable_java" != "no"; then
19 + JAVA_HOME=; export JAVA_HOME
20 + if test -z "$with_jdk_home"; then
21 + AC_PATH_PROG(JAVAC, javac)
22 + AC_PATH_PROG(JAVA, java)
24 + _javac_path="$with_jdk_home/bin/javac"
25 + dnl Check if there is a java compiler at all.
26 + if test -x "$_javac_path"; then
29 + AC_MSG_ERROR([$_javac_path not found set with_jdk_home])
32 + _java_path="$with_jdk_home/bin/java"
33 + dnl Check if there is a java interpreter at all.
34 + if test -x "$_java_path"; then
37 + AC_MSG_ERROR([$_java_path not found set with_jdk_home])
40 + AC_MSG_CHECKING([the installed JDK])
41 + if test "$JAVA"; then
43 - _java_path="$with_jdk_home/bin/java"
44 - dnl Check if there is a java interpreter at all.
45 - if test -x "$_java_path"; then
48 - AC_MSG_ERROR([$_java_path not found set with_jdk_home])
51 -AC_MSG_CHECKING([the installed JDK])
52 -if test "$JAVA"; then
54 - dnl java -version sends output to stderr!
55 - if test `$JAVA -version 2>&1 | grep -c "Kaffe"` -gt 0; then
57 - dnl Kaffe specific tests
58 - KAFFE_VER=`$JAVA -version 2>&1 | $EGREP " Version:" | $SED -r "s/.* Version: ([[0-9\.]]*).*/\1/"`
59 - if test -z "$KAFFE_VER"; then
60 - AC_MSG_ERROR([looks like Kaffe but version detection failed])
62 - _kaffe_ver=`echo "$KAFFE_VER" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
63 - if test "$_kaffe_ver" -lt 10100; then
64 - AC_MSG_ERROR([Kaffe is too old ($KAFFE_VER - $_kaffe_ver), you need at least 1.1.0])
68 - dnl TODO: define some project exclusion variables
70 - AC_MSG_RESULT([checked (Kaffe $KAFFE_VER)])
71 - AC_MSG_WARN([EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile])
72 - echo "EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >>warn
75 - dnl SUN JDK specific tests
76 - _jdk=`$JAVAC -J-version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
77 - _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
79 - if test "$_jdk_ver" -lt 10300; then
80 - AC_MSG_ERROR([JDK is too old, you need at least 1.3])
82 - AC_MSG_RESULT([checked (JDK $_jdk)])
83 + dnl java -version sends output to stderr!
84 + if test `$JAVA -version 2>&1 | grep -c "Kaffe"` -gt 0; then
86 + dnl Kaffe specific tests
87 + KAFFE_VER=`$JAVA -version 2>&1 | $EGREP " Version:" | $SED -r "s/.* Version: ([[0-9\.]]*).*/\1/"`
88 + if test -z "$KAFFE_VER"; then
89 + AC_MSG_ERROR([looks like Kaffe but version detection failed])
91 + _kaffe_ver=`echo "$KAFFE_VER" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
92 + if test "$_kaffe_ver" -lt 10100; then
93 + AC_MSG_ERROR([Kaffe is too old ($KAFFE_VER - $_kaffe_ver), you need at least 1.1.0])
97 + dnl TODO: define some project exclusion variables
99 + AC_MSG_RESULT([checked (Kaffe $KAFFE_VER)])
100 + AC_MSG_WARN([EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile])
101 + echo "EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >>warn
104 + dnl SUN JDK specific tests
105 + _jdk=`$JAVAC -J-version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
106 + _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
108 + if test "$_jdk_ver" -lt 10300; then
109 + AC_MSG_ERROR([JDK is too old, you need at least 1.3])
111 + AC_MSG_RESULT([checked (JDK $_jdk)])
113 + JAVA_HOME=`echo $JAVAC | $SED -n "s,//*bin//*javac,,p"`
115 + AC_MSG_ERROR([JAVA not found. You need at least jdk-1.3])
117 - JAVA_HOME=`echo $JAVAC | $SED -n "s,//*bin//*javac,,p"`
118 + dnl xsltproc not needed with JDK present.
119 + XSLTPROC=NO_XSLTPROC
121 - AC_MSG_ERROR([JAVA not found. You need at least jdk-1.3])
123 + JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
124 + dnl Check for xsltproc
125 + AC_PATH_PROG(XSLTPROC, xsltproc, no)
126 + if test "$XSLTPROC" = "no"; then
127 + AC_MSG_ERROR([xsltproc is required when building with --disable-java.])
134 dnl ===================================================================
135 dnl Checks for specific files.
136 --- config_office/set_soenv.in.orig 2003-09-22 11:27:24.000000000 -0700
137 +++ config_office/set_soenv.in 2003-09-22 11:30:33.000000000 -0700
138 @@ -1359,6 +1359,7 @@
140 { ToFile( "JDK", "@JDK@", "e" );
142 +ToFile( "XSLTPROC", "@XSLTPROC@", "e" );
143 ToFile( "ANT_HOME", "@ANT_HOME@", "e" );
144 ToFile( "JDKLIB", $JAVA_LIB, "e" );
145 ToFile( "STLPORT4", $STLPORT4, "e" );