summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure59
1 files changed, 24 insertions, 35 deletions
diff --git a/configure b/configure
index ab1f81c2cf..99023dc8b5 100755
--- a/configure
+++ b/configure
@@ -611,7 +611,6 @@ CFG_OPENVG_LC_INCLUDES=no
CFG_OPENVG_SHIVA=auto
CFG_OPENVG_ON_OPENGL=auto
CFG_EGL=auto
-CFG_GLX=auto
CFG_SSE=auto
CFG_FONTCONFIG=auto
CFG_FREETYPE=auto
@@ -1482,13 +1481,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
- glx)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
- CFG_GLX="$VAL"
- else
- UNKNOWN_OPT=yes
- fi
- ;;
pch)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_PRECOMPILE="$VAL"
@@ -4911,6 +4903,19 @@ if [ "$XPLATFORM_MINGW" = "yes" ]; then
fi
CFG_OPENGL=no
fi
+ case "$PLATFORM" in
+ hpux*)
+ # HP-UX have buggy glx headers; check if we really need to define the GLXFBConfig struct.
+ if [ "$CFG_OPENGL" = "desktop" ]; then
+ compileTest x11/glxfbconfig "OpenGL"
+ if [ $? != "0" ]; then
+ QMakeVar add DEFINES QT_DEFINE_GLXFBCONFIG_STRUCT
+ fi
+ fi
+ ;;
+ *)
+ ;;
+ esac
elif [ "$CFG_OPENGL" = "es2" ]; then
#OpenGL ES 2.x
compileTest unix/opengles2 "OpenGL ES 2.x"
@@ -4931,6 +4936,17 @@ if [ "$XPLATFORM_MINGW" = "yes" ]; then
echo " ${XQMAKESPEC}."
exit 1
fi
+ case "$PLATFORM" in
+ hpux*)
+ # HP-UX have buggy glx headers; check if we really need to define the GLXFBConfig struct.
+ compileTest x11/glxfbconfig "OpenGL"
+ if [ $? != "0" ]; then
+ QMakeVar add DEFINES QT_DEFINE_GLXFBCONFIG_STRUCT
+ fi
+ ;;
+ *)
+ ;;
+ esac
fi
fi # X11/MINGW OpenGL
@@ -5289,24 +5305,6 @@ if [ "$CFG_EGL" != "no" ]; then
fi
fi
-# GLX Support
-if [ "$CFG_GLX" != "no" ]; then
- if [ "$CFG_GLX" = "yes" ] && [ "$CFG_OPENGL" = "no" ]; then
- echo "GLX support was requested but OpenGL support is disabled."
- echo "Either disable GLX support or enable OpenGL support."
- exit 101
- fi
- if compileTest qpa/glx "GLX"; then
- CFG_GLX=yes
- elif [ "$CFG_GLX" = "yes" ]; then
- echo " The GLX functionality test failed; GLX is required by the xcb plugin to manage contexts & surfaces."
- exit 1
- else
- CFG_GLX=no
- fi
-fi
-
-
if [ "$CFG_EGLFS" != "no" ]; then
if [ "$XPLATFORM_QNX" = "no" ]; then
CFG_EGLFS="$CFG_EGL"
@@ -5677,13 +5675,6 @@ else
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EGL"
fi
-# enable glx
-if [ "$CFG_GLX" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG glx"
-else
- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GLX"
-fi
-
# enable eglfs
if [ "$CFG_EGLFS" = "yes" ]; then
QT_CONFIG="$QT_CONFIG eglfs"
@@ -6719,8 +6710,6 @@ else
report_support " pkg-config ............. no"
fi
report_support " PulseAudio ............." "$CFG_PULSEAUDIO"
-report_support " EGL ...................." "$CFG_EGL"
-report_support " GLX ...................." "$CFG_GLX"
report_support " QPA backends:"
report_support " DirectFB ............." "$CFG_DIRECTFB"
report_support " EGLFS ................" "$CFG_EGLFS"