blob: 91667539477a3947b75be858392f7919464e9e41 (
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
51
52
53
54
55
56
57
58
|
$FreeBSD$
--- configure.orig Fri Nov 9 05:13:03 2001
+++ configure Wed Nov 21 14:22:13 2001
@@ -5931,6 +5931,9 @@
os2*)
LIBS=
;;
+freebsd*)
+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
+ ;;
esac
for ac_hdr in sys/byteorder.h compat.h getopt.h
do
@@ -6987,8 +6990,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*
@@ -7022,7 +7023,7 @@
EOF
if test "$ac_cv_have_dash_pthread" = "yes"; then
- _PTHREAD_LDFLAGS=""
+ _PTHREAD_LDFLAGS="-pthread"
else
_PTHREAD_LDFLAGS="-lc_r"
fi
@@ -8365,6 +8366,7 @@
;;
*)
NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --libs`'
+ NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
;;
esac
fi
@@ -9421,7 +9423,7 @@
fi
MOC=$HOST_MOC
- QT_CFLAGS="-I${QTDIR}${QTINCDIR} -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.
@@ -13233,6 +13235,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
|
