Merge pull request #1010 from ulmus-scott/configure2

configure cleanup

mythplugins/configure

@@ -316,7 +316,6 @@ flix
 "
 
 CONFIG_LIST="
-opengl
 exif
 newexif
 dcraw
@@ -609,8 +608,6 @@ ECXXFLAGS=$(cat mythconfig.mak | grep -e "^ECXXFLAGS=")
 ECXXFLAGS=${ECXXFLAGS#ECXXFLAGS=}
 CXXPPFLAGS=$(cat mythconfig.mak | grep -e "^CXXPPFLAGS=")
 CXXPPFLAGS=${CXXPPFLAGS#CXXPPFLAGS=}
-OPENGLV=$(cat mythconfig.mak | grep -e "^CONFIG_OPENGL_VIDEO=yes")
-OPENGLES=$(cat mythconfig.mak | grep -e "^HAVE_GLES2_GL2_H=yes")
 WEBKIT=$(cat mythconfig.mak | grep -e "^CONFIG_QTWEBKIT=yes")
 
 EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=")
@@ -640,11 +637,6 @@ qmake=${qmake#QMAKE=}
 qt_version_str=`$qmake -query QT_VERSION`
 qt_version=$(version2num $qt_version_str)
 
-# rely on what was discover during MythTV configure
-if enabled opengl && test "$OPENGLV" != "CONFIG_OPENGL_VIDEO=yes"; then
-    disable opengl
-fi
-
 if ! check_lib libexif/exif-data.h exif_loader_new -lexif ; then
     disable exif
 fi

mythplugins/settings.pro

@@ -34,7 +34,6 @@ macx:CONFIG += console
 # figure out compile flags based on qmake info
 
 QMAKE_CXXFLAGS += $$ARCHFLAGS
-QMAKE_CXXFLAGS += $$CONFIG_DIRECTFB_CXXFLAGS
 QMAKE_CXXFLAGS_SHLIB = -DPIC -fPIC
 QMAKE_CXXFLAGS += $$CXXFLAGS $$ECXXFLAGS
 
@@ -69,12 +68,8 @@ contains(CONFIG_LIBMP3LAME, "yes") {
 EXTRA_LIBS += $$CONFIG_AUDIO_ALSA_LIBS
 EXTRA_LIBS += $$CONFIG_AUDIO_JACK_LIBS
 EXTRA_LIBS += $$CONFIG_FIREWIRE_LIBS
-EXTRA_LIBS += $$CONFIG_DIRECTFB_LIBS
 
 EXTRA_LIBS += $$LOCAL_LIBDIR_X11
-EXTRA_LIBS += $$CONFIG_XV_LIBS
-EXTRA_LIBS += $$CONFIG_XVMC_LIBS
-EXTRA_LIBS += $$CONFIG_OPENGL_VSYNC_LIBS
 
 LIRC_LIBS = $$CONFIG_LIRC_LIBS