1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
|
$NetBSD: patch-ba,v 1.3 2008/10/31 09:40:58 hira Exp $
--- config_office/configure.orig 2008-09-01 20:50:01.000000000 +0900
+++ config_office/configure 2008-10-31 18:07:22.000000000 +0900
@@ -4183,11 +4183,11 @@
test_randr=no
_os=OSF1
;;
- netbsd)
+ *netbsd*)
test_gtk=yes
build_cairo=yes
test_kde=yes
- test_cups=no
+ test_cups=yes
test_randr=yes
test_freetype=yes
PTHREAD_CFLAGS="-pthread"
@@ -11429,7 +11429,7 @@
fi
if test "$SOLAR_JAVA" != ""; then
- if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
+ if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then
cat > findhome.java <<_ACEOF
import java.io.File;
@@ -11530,7 +11530,7 @@
echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
-# if test "$JDK" == "gcj"; then
+# if test "$JDK" = "gcj"; then
# echo "e.g. install java-1.4.2-gcj-compat-devel and use --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
# fi
fi
@@ -14208,7 +14208,7 @@
if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
test "$with_system_libxslt" != "no"; then
if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
- test "$with_system_libxml" == "no"; then
+ test "$with_system_libxml" = "no"; then
# somehow AC_MSG_WARN won't work...
echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml"
echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn
@@ -14218,7 +14218,7 @@
if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
test "$with_system_libxml" != "no"; then
if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
- test "$with_system_libxslt" == "no"; then
+ test "$with_system_libxslt" = "no"; then
# somehow AC_MSG_WARN won't work...
echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt"
echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" >> warn
@@ -14740,13 +14740,14 @@
python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
+ python_ldflags=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LDFLAGS');"`
python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
PYTHON_CFLAGS="-I$python_include"
if test "$_os" = "Darwin"; then
PYTHON_LIBS="-framework Python"
else
- PYTHON_LIBS="-lpython$python_version"
+ PYTHON_LIBS="-lpython$python_version $python_ldflags"
fi
save_CPPFLAGS="$CPPFLAGS"
@@ -15003,7 +15004,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
echo "${ECHO_T}$ac_cv_header_db_h" >&6; }
if test $ac_cv_header_db_h = yes; then
- DB_INCLUDES=/usr/include
+ DB_INCLUDES=${BLNK_PREFIX_db4}/include/db4
else
CFLAGS=-I/usr/include/db4
@@ -15133,13 +15134,13 @@
#AC_CHECK_LIB(db, db_create, [],
# [AC_MSG_ERROR([db library not installed or functional])], [])
-{ echo "$as_me:$LINENO: checking for main in -ldb" >&5
-echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for main in -ldb4" >&5
+echo $ECHO_N "checking for main in -ldb4... $ECHO_C" >&6; }
if test "${ac_cv_lib_db_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldb $LIBS"
+LIBS="-ldb4 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -15193,7 +15194,7 @@
#define HAVE_LIBDB 1
_ACEOF
- LIBS="-ldb $LIBS"
+ LIBS="-ldb4 $LIBS"
else
{ { echo "$as_me:$LINENO: error: db not installed or functional" >&5
@@ -16642,6 +16643,8 @@
MOZ_FLAVOUR=seamonkey
elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "firefox"; then
MOZ_FLAVOUR=firefox
+ elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "firefox3"; then
+ MOZ_FLAVOUR=firefox3
elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then
MOZ_FLAVOUR=mozilla
else
@@ -17378,7 +17381,7 @@
#e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
#the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
- if test "$MOZ_FLAVOUR" == "libxul"; then
+ if test "$MOZ_FLAVOUR" = "libxul"; then
MOZ_FLAVOUR="mozilla"
fi
@@ -21084,7 +21087,7 @@
NEON_CFLAGS=
BUILD_TYPE="$BUILD_TYPE NEON"
fi
-if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
+if test "$USE_BUILTIN_openssl" = "yes" && test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" && test "$with_system_openssl" != "no"; then
with_system_openssl=yes
fi
{ echo "$as_me:$LINENO: checking which libssl to use" >&5
@@ -21095,7 +21098,7 @@
echo "${ECHO_T}external" >&6; }
# Mac OS builds should get out without extra stuff is the Mac porters'
# wish. And pkg-config is although Xcode ships a .pc for openssl
- if test "$_os" = "Darwin"; then
+ if test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
OPENSSL_CFLAGS=
OPENSSL_LIBS="-lssl -lcrypto"
else
@@ -25060,7 +25063,7 @@
ENABLE_MEDIAWIKI=YES
{ echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5
echo $ECHO_N "checking which Apache commons-* libs to use... $ECHO_C" >&6; }
- if test "$with_system_apache_commons" == "yes"; then
+ if test "$with_system_apache_commons" = "yes"; then
SYSTEM_APACHE_COMMONS=YES
{ echo "$as_me:$LINENO: result: external" >&5
echo "${ECHO_T}external" >&6; }
@@ -25203,7 +25206,7 @@
-if test "$ENABLE_MEDIAWIKI" == "YES"; then
+if test "$ENABLE_MEDIAWIKI" = "YES"; then
{ echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5
echo $ECHO_N "checking which Servlet API Jar to use... $ECHO_C" >&6; }
if test -n "$with_system_servlet_api"; then
@@ -25268,7 +25271,7 @@
fi
{ echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5
echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6; }
- if test "$with_system_jfreereport" == "yes"; then
+ if test "$with_system_jfreereport" = "yes"; then
SYSTEM_JFREEREPORT=YES
{ echo "$as_me:$LINENO: result: external" >&5
echo "${ECHO_T}external" >&6; }
@@ -25807,7 +25810,7 @@
fi
KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
- KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lqt-mt"
+ KDE_LIBS="-L$kde_libdir -Wl,-R$kde_libdir -L$qt_libdir -Wl,-R$qt_libdir -lkdeui -lkdecore -lqt-mt"
fi
@@ -26357,7 +26360,7 @@
XINERAMA_LINK=dynamic
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
-elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
+elif test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
# we have both versions, let the user decide but use the dynamic one
# per default
@@ -26842,9 +26845,13 @@
if test -f $ANT_HOME/lib/ant/ant.jar; then
ANT_LIB="$ANT_HOME/lib/ant"
else
+ if test -f $ANT_HOME/lib/java/ant/ant.jar; then
+ ANT_LIB="$ANT_HOME/lib/java/ant"
+ else
{ { echo "$as_me:$LINENO: error: Ant libraries not found!" >&5
echo "$as_me: error: Ant libraries not found!" >&2;}
{ (exit 1); exit 1; }; }
+ fi
fi
fi
fi
@@ -27052,12 +27059,12 @@
{ echo "$as_me:$LINENO: checking build verbosity" >&5
echo $ECHO_N "checking build verbosity... $ECHO_C" >&6; }
if test -n "$enable_verbose"; then
- if test "$enable_verbose" == "yes"; then
+ if test "$enable_verbose" = "yes"; then
VERBOSE="TRUE"
{ echo "$as_me:$LINENO: result: high" >&5
echo "${ECHO_T}high" >&6; }
fi
- if test "$enable_verbose" == "no"; then
+ if test "$enable_verbose" = "no"; then
VERBOSE="FALSE"
{ echo "$as_me:$LINENO: result: low" >&5
echo "${ECHO_T}low" >&6; }
|
