LinGui: remove gtk2 support from configure.ac

The code won't build with gtk2 anymore.  So allowing it during configure
is just going to cause confusion.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6013 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/gtk/configure.ac b/gtk/configure.ac
index 5ca4b3eaf7afd078432f6ad987813dee3e1e88fb..a16ceeb6c9a2df79dfb075c579f53328836dba24 100644 (file)
--- a/gtk/configure.ac
+++ b/gtk/configure.ac
@@ -114,12 +114,7 @@ case $host in
 esac
 
 PKG_PROG_PKG_CONFIG
-PKG_CHECK_MODULES(Gtk3, [gtk+-3.0], use_gtk3=yes, use_gtk3=no)
-if test "x$use_gtk3" = "xyes" ; then
-    GHB_PACKAGES="gtk+-3.0 $GHB_PACKAGES"
-else
-    GHB_PACKAGES="gtk+-2.0 >= 2.10 $GHB_PACKAGES"
-fi
+GHB_PACKAGES="gtk+-3.0 $GHB_PACKAGES"
 
 GST1_MODULES="gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 gstreamer-pbutils-1.0"
 GST0_MODULES="gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-audio-0.10 gstreamer-pbutils-0.10"
@@ -144,53 +139,22 @@ if test "x$gst_disable" = "xno" ; then
 fi
 
 if test "x$update_checks" = "xyes" ; then
-    if test "x$use_gtk3" = "xyes" ; then
-        PKG_CHECK_MODULES(WebKitGtk3, webkitgtk-3.0, use_webkitgtk3=yes, use_webkitgtk3=no)
-        if test "x$use_webkitgtk3" = "xyes" ; then
-            GHB_PACKAGES="$GHB_PACKAGES webkitgtk-3.0"
-        else
-            update_checks="no"
-               CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
-        fi
+    PKG_CHECK_MODULES(WebKitGtk3, webkitgtk-3.0, use_webkitgtk3=yes, use_webkitgtk3=no)
+    if test "x$use_webkitgtk3" = "xyes" ; then
+        GHB_PACKAGES="$GHB_PACKAGES webkitgtk-3.0"
     else
-        PKG_CHECK_MODULES(OldWebKitGtk1, WebKitGtk, old_webkit=yes, old_webkit=no)
-        if test "x$old_webkit" = "xyes" ; then
-            if test "x$mingw_flag" = "xno" ; then
-                GHB_PACKAGES="$GHB_PACKAGES WebKitGtk"
-                CXXFLAGS="$CXXFLAGS -D_OLD_WEBKIT"
-                CFLAGS="$CFLAGS -D_OLD_WEBKIT"
-            else
-                update_checks="no"
-                CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
-            fi
-        else
-            PKG_CHECK_MODULES(WebKitGtk1, webkit-1.0, use_webkit1=yes, use_webkit1=no)
-            if test "x$use_webkit1" = "xyes" ; then
-                GHB_PACKAGES="$GHB_PACKAGES webkit-1.0"
-            else
-                update_checks="no"
-                CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
-            fi
-        fi
+        update_checks="no"
+        CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
     fi
 else
        CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
 fi
 
-if test "x$use_gtk3" = "xyes" ; then
-    PKG_CHECK_MODULES(libappindicator3, appindicator3-0.1, have_appind=yes, have_appind=no)
-    if test "x$have_appind" = "xyes" ; then
-        GHB_PACKAGES="$GHB_PACKAGES appindicator3-0.1"
-        CXXFLAGS="$CXXFLAGS -D_USE_APP_IND"
-        CFLAGS="$CFLAGS -D_USE_APP_IND"
-    fi
-else
-    PKG_CHECK_MODULES(libappindicator, appindicator-0.1, have_appind=yes, have_appind=no)
-    if test "x$have_appind" = "xyes" ; then
-        GHB_PACKAGES="$GHB_PACKAGES appindicator-0.1"
-        CXXFLAGS="$CXXFLAGS -D_USE_APP_IND"
-        CFLAGS="$CFLAGS -D_USE_APP_IND"
-    fi
+PKG_CHECK_MODULES(libappindicator3, appindicator3-0.1, have_appind=yes, have_appind=no)
+if test "x$have_appind" = "xyes" ; then
+    GHB_PACKAGES="$GHB_PACKAGES appindicator3-0.1"
+    CXXFLAGS="$CXXFLAGS -D_USE_APP_IND"
+    CFLAGS="$CFLAGS -D_USE_APP_IND"
 fi
 
 AM_CONDITIONAL([MINGW], [test "x$mingw_flag" = "xyes"])