]>
Commit | Line | Data |
---|---|---|
2b9815c2 | 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 | |
3 | @@ -789,93 +789,16 @@ | |
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 | |
11 | - _jdk_minor="true" | |
12 | - fi | |
13 | - fi | |
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" }'` | |
17 | - | |
18 | - if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then | |
19 | - _jdk_minor="true" | |
20 | - fi | |
21 | - fi | |
22 | ||
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;}'` | |
27 | ||
28 | - if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then | |
29 | - _jdk_minor="true" | |
30 | - fi | |
31 | - fi | |
32 | - if test "$_os" = "NetBSD"; then | |
33 | - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` | |
34 | - fi | |
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" }'` | |
37 | - fi | |
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" }'` | |
40 | - fi | |
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" }'` | |
43 | - fi | |
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" }'` | |
47 | - | |
48 | - if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then | |
49 | - _jdk_minor="true" | |
50 | - fi | |
51 | - fi | |
52 | - if test "$_os" = "Darwin"; then | |
53 | - _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` | |
54 | - fi | |
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" }'` | |
58 | - fi | |
59 | - if test "$_os" = "FreeBSD"; then | |
60 | - _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'` | |
61 | - fi | |
62 | - if test "$_os" = "NetBSD"; then | |
63 | - _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'` | |
64 | - fi | |
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" }'` | |
68 | - fi | |
69 | - if test "$_machine_type" = "sparc"; then | |
70 | - _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'` | |
71 | - fi | |
72 | - if test "$_machine_type" = "ppc"; then | |
73 | - _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'` | |
74 | - fi | |
75 | - if test "$_machine_type" = "armv4l"; then | |
76 | - _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'` | |
77 | - fi | |
78 | - fi | |
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" }'` | |
81 | - fi | |
82 | - if test "$_os" = "WINNT"; then | |
83 | - _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'` | |
84 | - fi | |
85 | - if test "$_os" = "Darwin"; then | |
86 | - _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 0) print "false"; else print "true" }'` | |
87 | - fi | |
88 | - fi | |
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" | |
93 | + else | |
94 | _correct_jdk_exists="true" | |
95 | JAVA_HOME=`echo $JAVA | $SED -n "s/\/bin\/javac//p"` | |
96 | AC_MSG_RESULT([checked (JDK $_jdk)]) | |
97 | - else | |
98 | - _correct_jdk_exists="false" | |
99 | fi | |
100 | else | |
101 | _correct_jdk_exists="false" |