From 95ffd606f8a632a8a963486ce340e7e1b707be0a Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 19 Nov 2013 16:53:21 +0100 Subject: Do not disable egl on desktop gl automatically MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit desktop opengl and egl are not incompatible with eachother, so there is no need to disable egl when on desktop opengl Task-number: QTBUG-34949 Change-Id: I757c38674a480910d1cb23853c255eb993e107ff Reviewed-by: Oswald Buddenhagen Reviewed-by: Andrew Knight Reviewed-by: Jørgen Lind --- configure | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 120150ca87..72c13ab75d 100755 --- a/configure +++ b/configure @@ -5267,11 +5267,13 @@ elif [ "$CFG_XKBCOMMON" = "no" ]; then fi # EGL Support -if [ "$CFG_EGL" = "yes" ] && [ "$CFG_OPENGL" = "no" ]; then +if [ "$CFG_EGL" != "no" ]; then + if [ "$CFG_EGL" = "yes" ] && [ "$CFG_OPENGL" = "no" ]; then echo "EGL support was requested but OpenGL support is disabled." - echo "Either disable EGL support or enable OpenGL ES support." + echo "Either disable EGL support or enable OpenGL support." exit 101 -elif [ "$CFG_EGL" != "no" ]; then + fi + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null` -- cgit v1.2.3