LinGui: fix problem with loading preset that has deinterlace enabled

[handbrake-jp/handbrake-jp-git.git] / gtk / configure.ac

diff --git a/gtk/configure.ac b/gtk/configure.ac
index 566c789..0a1b251 100644 (file)
--- a/gtk/configure.ac
+++ b/gtk/configure.ac
@@ -69,14 +69,14 @@ AM_PROG_LIBTOOL
 case $host in
   *-*-mingw*)
     if test "x$w32_gst" = "xyes" ; then
-               GHB_PACKAGES="gtk+-2.0 >= 2.8 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0 hal hal-storage libgtkhtml-3.14"
+               GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0"
        else
-        GHB_PACKAGES="gtk+-2.0 >= 2.8 gthread-2.0 gio-2.0"
+        GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gio-2.0"
        fi
        mingw_flag=yes
     ;;
   *)
-       GHB_PACKAGES="gtk+-2.0 >= 2.8 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0 hal hal-storage libgtkhtml-3.14 libnotify"
+       GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0 hal hal-storage libnotify"
        mingw_flag=no
     ;;
 esac
@@ -86,6 +86,19 @@ if test "x$w32_gst" = "xyes" -o  "x$mingw_flag" != "xyes" ; then
        CFLAGS="$CFLAGS -D_ENABLE_GST"
 fi
 
+PKG_CHECK_MODULES(OldWebKitGtk, 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"
+       fi
+else
+       if test "x$mingw_flag" = "xno" ; then
+               GHB_PACKAGES="$GHB_PACKAGES webkit-1.0"
+       fi
+fi
+
 AM_CONDITIONAL([MINGW], [test "x$mingw_flag" = "xyes"])
 
 PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])