blob: bede68d7870e46ea4f2bfe9bd1fa02b46ef8b49b (
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
|
--- ./configure.orig 2012-01-06 11:42:45.828388787 +0100
+++ ./configure 2012-01-06 11:46:01.318339795 +0100
@@ -829,7 +829,7 @@
CFG_SILENT=no
CFG_GRAPHICS_SYSTEM=default
CFG_RUNTIME_SYSTEM=
-CFG_ALSA=auto
+CFG_ALSA=no
CFG_PULSEAUDIO=auto
CFG_COREWLAN=auto
CFG_ICD=auto
@@ -2576,11 +2576,6 @@
fi
done
- # symlink the mkspecs directory
- mkdir -p "$outpath/mkspecs"
- rm -rf "$outpath"/mkspecs/*
- ln -s "$relpath"/mkspecs/* "$outpath/mkspecs"
- rm -f "$outpath/mkspecs/default"
ShadowMkspecs()
{
@@ -2626,7 +2621,7 @@
# find a make command
if [ -z "$MAKE" ]; then
MAKE=
- for mk in gmake make; do
+ for mk in make; do
if "$WHICH" $mk >/dev/null 2>&1; then
MAKE=`"$WHICH" $mk`
break
@@ -4816,7 +4811,7 @@
}
# build qmake
-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
@@ -5831,14 +5826,6 @@
X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
fi
- # Check we actually have X11 :-)
- "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
- if [ $? != "0" ]; then
- echo "Basic XLib functionality test failed!"
- echo " You might need to modify the include and library search paths by editing"
- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
- exit 1
- fi
fi
# X11/MINGW/SYMBIAN OpenGL
|
