1 --- oo/config_office/configure.in.old Fri Nov 1 20:24:40 2002
2 +++ oo/config_office/configure.in Fri Nov 1 20:32:31 2002
4 _correct_jdk_exists="false"
5 dnl java -version sends output to stderr!
6 _jdk=`$JAVA -J-version 2>&1 | $AWK -F'"' '{ print \$2 }'`
7 - if test "$_os" = "SunOS" -o "$_os" = "OSF1"; then
8 - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
9 - _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
10 - if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
14 - if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
15 - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
16 - _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
18 - if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
23 - if test "$_os" = "Linux" -a "$_machine_type" = "i686" -o "$_os" = "FreeBSD"; then
24 - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
25 - _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
26 + _jdk_ver=`echo "$_jdk" | awk -F . '{ printf "%d", (($1 * 100) + $2) * 100 + $3;}'`
28 - if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
32 - if test "$_os" = "NetBSD"; then
33 - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
35 - if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
36 - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
38 - if test "$_os" = "Linux" -a "$_machine_type" = "ppc"; then
39 - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
41 - if test "$_os" = "Linux" -a "$_machine_type" = "armv4l"; then
42 - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
44 - if test "$_os" = "WINNT"; then
45 - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
46 - _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
48 - if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
52 - if test "$_os" = "Darwin"; then
53 - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
55 - if test "$_jdk_middle" = "true"; then
56 - if test "$_os" = "SunOS" -o "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
57 - _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
59 - if test "$_os" = "FreeBSD"; then
60 - _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
62 - if test "$_os" = "NetBSD"; then
63 - _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
65 - if test "$_os" = "Linux"; then
66 - if test "$_machine_type" = "i686"; then
67 - _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
69 - if test "$_machine_type" = "sparc"; then
70 - _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
72 - if test "$_machine_type" = "ppc"; then
73 - _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
75 - if test "$_machine_type" = "armv4l"; then
76 - _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
79 - if test "$_os" = "OSF1"; then
80 - _jdk_minor=`echo $_jdk | $AWK -F- '{print $1}' | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
82 - if test "$_os" = "WINNT"; then
83 - _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
85 - if test "$_os" = "Darwin"; then
86 - _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 0) print "false"; else print "true" }'`
89 - if test "$_jdk_minor" = "true"; then
90 + if test "$_jdk_ver" -lt 10300; then
91 + AC_MSG_WARN([You need at least jdk-1.3])
92 + _correct_jdk_exists="false"
94 _correct_jdk_exists="true"
95 JAVA_HOME=`echo $JAVA | $SED -n "s/\/bin\/javac//p"`
96 AC_MSG_RESULT([checked (JDK $_jdk)])
98 - _correct_jdk_exists="false"
101 _correct_jdk_exists="false"