blob: 5558e352edeed8c54bf5682134e23053f7a8301d (
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
45
46
47
48
49
50
|
$FreeBSD$
--- configure.orig Tue Apr 24 01:59:58 2001
+++ configure Mon May 14 21:48:26 2001
@@ -6596,7 +6596,7 @@
fi
- QT_CFLAGS="-I${QTDIR}/include -DQT_GENUINE_STR"
+ QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
# Check whether --with-static-qt or --without-static-qt was given.
@@ -8703,6 +8703,9 @@
os2*)
LIBS=
;;
+freebsd*)
+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
+ ;;
esac
for ac_hdr in sys/byteorder.h compat.h getopt.h
do
@@ -9392,8 +9395,6 @@
if test $? -eq 0; then
if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
ac_cv_have_dash_pthread=yes
- CFLAGS="$CFLAGS -pthread"
- CXXFLAGS="$CXXFLAGS -pthread"
fi
fi
rm -f conftest*
@@ -9427,7 +9428,7 @@
EOF
if test "$ac_cv_have_dash_pthread" = "yes"; then
- _PTHREAD_LDFLAGS=""
+ _PTHREAD_LDFLAGS="-pthread"
else
_PTHREAD_LDFLAGS="-lc_r"
fi
@@ -13902,6 +13903,7 @@
;;
*)
NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
+ NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
$PERL -pi.bak -e "s {^NSPR_LIBS\s*=.*} {NSPR_LIBS = $NSPR_LIBS }" config/autoconf.mk
;;
esac
|
