]>
Commit | Line | Data |
---|---|---|
e73ece17 | 1 | --- oo_641_src/config_office/configure.in Wed Dec 19 02:28:41 2001 |
2 | +++ oo_641_src/config_office/configure.in.new Wed Dec 19 02:25:43 2001 | |
96dfe4a5 | 3 | @@ -654,6 +654,22 @@ |
4 | _jdk_minor="true" | |
5 | fi | |
6 | fi | |
7 | + if test "$_os" = "Linux" -a "$_machine_type" = "i586"; 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 | + | |
11 | + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then | |
12 | + _jdk_minor="true" | |
13 | + fi | |
14 | + fi | |
15 | + if test "$_os" = "Linux" -a "$_machine_type" = "i386"; then | |
16 | + _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` | |
17 | + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` | |
18 | + | |
19 | + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then | |
20 | + _jdk_minor="true" | |
21 | + fi | |
22 | + fi | |
23 | if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then | |
24 | _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` | |
25 | fi | |
26 | @@ -686,6 +702,12 @@ | |
27 | if test "$_machine_type" = "i686"; then | |
28 | _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'` | |
29 | fi | |
30 | + if test "$_machine_type" = "i586"; then | |
31 | + _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'` | |
32 | + fi | |
33 | + if test "$_machine_type" = "i386"; then | |
34 | + _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'` | |
35 | + fi | |
36 | if test "$_machine_type" = "sparc"; then | |
37 | _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'` | |
38 | fi |