51 lines
1.5 KiB
Plaintext
51 lines
1.5 KiB
Plaintext
|
|
$FreeBSD: ports/www/mozilla/files/patch-qt,v 1.11 2001/08/07 11:52:15 sobomax Exp $
|
|
|
|
--- configure.orig Wed Jul 25 08:44:09 2001
|
|
+++ configure Sat Aug 4 11:18:33 2001
|
|
@@ -6528,7 +6528,7 @@
|
|
echo "$ac_t""$HOST_MOC" 1>&6
|
|
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.
|
|
@@ -8587,6 +8587,9 @@
|
|
os2*)
|
|
LIBS=
|
|
;;
|
|
+freebsd*)
|
|
+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
|
|
+ ;;
|
|
esac
|
|
for ac_hdr in sys/byteorder.h compat.h getopt.h
|
|
do
|
|
@@ -9316,8 +9319,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*
|
|
@@ -9351,7 +9352,7 @@
|
|
EOF
|
|
|
|
if test "$ac_cv_have_dash_pthread" = "yes"; then
|
|
- _PTHREAD_LDFLAGS=""
|
|
+ _PTHREAD_LDFLAGS="-pthread"
|
|
else
|
|
_PTHREAD_LDFLAGS="-lc_r"
|
|
fi
|
|
@@ -13701,6 +13702,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
|