blob: ff953c9a2cc7f523fc1287953fd8acb2a5b79da2 (
plain) (
blame)
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
|
#iZ and CWS data
o http://www.openoffice.org/issues/show_bug.cgi?id=40176
http://www.openoffice.org/issues/show_bug.cgi?id=40226
o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1806&Path=SRC680%2Fconfigure4
o configure4
Description
o Correct PTHREAD_CFLAGS, PTHREAD_LIBS
o CUPS support via --enable-cups
Index: config_office/configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.82
diff -u -r1.82 configure.in
--- config_office/configure.in 5 Jan 2005 12:09:48 -0000 1.82
+++ config_office/configure.in 9 Jan 2005 10:36:08 -0000
@@ -449,7 +449,7 @@
test_x=yes
test_gtk=yes
test_kde=yes
- test_cups=no
+ test_cups=yes
AC_MSG_CHECKING([the FreeBSD operating system release])
if test -n "$with_os_version"; then
OSVERSION="$with_os_version"
@@ -457,13 +457,15 @@
OSVERSION=`/sbin/sysctl -n kern.osreldate`
fi
AC_MSG_RESULT([found OSVERSION=$OSVERSION])
- PTHREAD_CFLAGS="-D_THREAD_SAFE"
if test "$OSVERSION" -lt "500016"; then
+ PTHREAD_CFLAGS="-D_THREAD_SAFE"
PTHREAD_LIBS="-pthread"
elif test "$OSVERSION" -lt "502102"; then
+ PTHREAD_CFLAGS="-D_THREAD_SAFE"
PTHREAD_LIBS="-lc_r"
else
- PTHREAD_LIBS="-lpthread"
+ PTHREAD_CFLAGS=""
+ PTHREAD_LIBS="-pthread"
fi
;;
"OSF1")
|
