e28271bff4
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2776 6952d904-891a-0410-993b-d76249ca496b
19 lines
1.1 KiB
Diff
19 lines
1.1 KiB
Diff
diff -Nur qt-x11-opensource-src-4.5.1-orig/configure qt-x11-opensource-src-4.5.1/configure
|
|
--- qt-x11-opensource-src-4.5.1-orig/configure 2009-04-22 02:57:35.000000000 +0300
|
|
+++ qt-x11-opensource-src-4.5.1/configure 2009-06-03 00:59:44.108245373 +0300
|
|
@@ -4733,14 +4733,6 @@
|
|
X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
|
|
fi
|
|
|
|
- # Check we actually have X11 :-)
|
|
- if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; 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
|
|
-
|
|
# auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
|
|
if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
|
|
if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
|