Contents of /trunk/gettext/patches/gettext-0.14.1-without_java.patch
Parent Directory | Revision Log
Revision 144 -
(show annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 2743 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 2743 byte(s)
-import
1 | Submitted By: Tushar Teredesai <tushar@linuxfromscratch.org> |
2 | Date: 2003-11-15 |
3 | Initial Package Version: 0.12.1 |
4 | Origin: None |
5 | Description: Adds logic to bypass checking for java/gcj. This is useful |
6 | when building gettext in Ch 5 (If java is found on the host, gettext build |
7 | libs that link to the host and also causes failure of some tests during make check). |
8 | To bypass Java checks, pass the option --without-java to configure. |
9 | diff -ur gettext-0.12.1.orig/gettext-runtime/configure gettext-0.12.1/gettext-runtime/configure |
10 | --- gettext-0.12.1.orig/gettext-runtime/configure 2003-05-22 08:38:47.000000000 -0500 |
11 | +++ gettext-0.12.1/gettext-runtime/configure 2003-10-15 18:20:49.000000000 -0600 |
12 | @@ -3268,6 +3268,16 @@ |
13 | |
14 | |
15 | |
16 | +if test "${with_java+set}" = set; then |
17 | + withval="$with_java" |
18 | + test "$withval" = no || with_java=yes |
19 | +else |
20 | + with_java=yes |
21 | +fi; |
22 | +if test "$with_java" = no ; then |
23 | + echo "Skipping Java compiler checks..." |
24 | +else |
25 | + |
26 | echo "$as_me:$LINENO: checking for Java compiler" >&5 |
27 | echo $ECHO_N "checking for Java compiler... $ECHO_C" >&6 |
28 | cat >conftest.$ac_ext <<_ACEOF |
29 | @@ -3490,6 +3500,7 @@ |
30 | echo "$as_me:$LINENO: result: no" >&5 |
31 | echo "${ECHO_T}no" >&6 |
32 | fi |
33 | +fi |
34 | |
35 | if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then |
36 | BUILDJAVA=yes |
37 | diff -ur gettext-0.12.1.orig/gettext-tools/configure gettext-0.12.1/gettext-tools/configure |
38 | --- gettext-0.12.1.orig/gettext-tools/configure 2003-05-22 08:40:24.000000000 -0500 |
39 | +++ gettext-0.12.1/gettext-tools/configure 2003-10-15 18:21:15.000000000 -0600 |
40 | @@ -3070,6 +3070,16 @@ |
41 | |
42 | |
43 | |
44 | +if test "${with_java+set}" = set; then |
45 | + withval="$with_java" |
46 | + test "$withval" = no || with_java=yes |
47 | +else |
48 | + with_java=yes |
49 | +fi; |
50 | +if test "$with_java" = no ; then |
51 | + echo "Skipping Java native compiler checks..." |
52 | +else |
53 | + |
54 | echo "$as_me:$LINENO: checking for Java to native code compiler" >&5 |
55 | echo $ECHO_N "checking for Java to native code compiler... $ECHO_C" >&6 |
56 | # Search for the gcj command or use the one provided by the user. |
57 | @@ -3161,6 +3171,7 @@ |
58 | HAVE_GCJ= |
59 | fi |
60 | |
61 | +fi |
62 | |
63 | |
64 | |
65 | @@ -3423,6 +3434,10 @@ |
66 | |
67 | |
68 | |
69 | +if test "$with_java" = no ; then |
70 | + echo "Skipping Java compiler checks..." |
71 | +else |
72 | + |
73 | echo "$as_me:$LINENO: checking for Java compiler" >&5 |
74 | echo $ECHO_N "checking for Java compiler... $ECHO_C" >&6 |
75 | cat >conftest.$ac_ext <<_ACEOF |
76 | @@ -3646,6 +3661,8 @@ |
77 | echo "${ECHO_T}no" >&6 |
78 | fi |
79 | |
80 | +fi |
81 | + |
82 | if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then |
83 | BUILDJAVA=yes |
84 | else |
85 | @@ -3653,6 +3670,10 @@ |
86 | fi |
87 | |
88 | |
89 | +if test "$with_java" = no ; then |
90 | + echo "Skipping Java VM checks..." |
91 | +else |
92 | + |
93 | |
94 | echo "$as_me:$LINENO: checking for Java virtual machine" >&5 |
95 | echo $ECHO_N "checking for Java virtual machine... $ECHO_C" >&6 |
96 | @@ -3840,7 +3861,7 @@ |
97 | echo "${ECHO_T}$ac_result" >&6 |
98 | |
99 | |
100 | - |
101 | +fi |
102 | |
103 | |
104 |