aboutsummaryrefslogtreecommitdiffstats
path: root/www/mozilla-devel/files/patch-qt
blob: 20c5d31abc0c806301cf7e224476c4e160ebb6ab (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
--- configure.orig  Sat Sep 30 23:16:14 2000
+++ configure   Thu Dec 21 00:49:23 2000
@@ -6020,7 +6020,7 @@
    echo $ac_n "checking for Qt insanity""... $ac_c" 1>&6
 echo "configure:6022: checking for Qt insanity" >&5
 
-    QT_CFLAGS="-I${QTDIR}/include/qt"
+    QT_CFLAGS="-I${QTDIR}/include/X11/qt"
     QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
 
     # Check whether --with-static-qt or --without-static-qt was given.
@@ -8052,6 +8052,9 @@
 os2*)
     LIBS=
     ;;
+freebsd*)
+    CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
+    ;;
 esac
 for ac_hdr in sys/byteorder.h compat.h getopt.h
 do
@@ -8702,8 +8705,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*
@@ -8737,7 +8738,7 @@
 EOF
 
                        if test "$ac_cv_have_dash_pthread" = "yes"; then
-               _PTHREAD_LDFLAGS=""
+               _PTHREAD_LDFLAGS="-pthread"
            else
                _PTHREAD_LDFLAGS="-lc_r"
            fi