LinGui: Add max width/height widgets to preset save dialog

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

diff --git a/gtk/configure.ac b/gtk/configure.ac
index 0a1b251..63a8a75 100644 (file)
--- a/gtk/configure.ac
+++ b/gtk/configure.ac
@@ -45,10 +45,18 @@ else
        AC_SUBST(HB_DIR, '$(top_srcdir)/'"..")
 fi
 
+AC_ARG_ENABLE(dl,
+       AS_HELP_STRING([--enable-dl], [enable libdl]),
+       use_libdl=yes, use_libdl=no)
+
 AC_ARG_ENABLE(gst,
        AS_HELP_STRING([--enable-gst], [enable gstreamer on Win32]),
        w32_gst=yes, w32_gst=no)
 
+AC_ARG_ENABLE(update-checks,
+       AS_HELP_STRING([--disable-update-checks], [disable update checks]),
+       update_checks=no, update_checks=yes)
+
 # overwrite global variable (used for Makefile generation)
 AC_SUBST(GLOBALCXXFLAGS, $CXXFLAGS )
 AC_SUBST(GLOBALLDFLAGS, $LDFLAGS )
@@ -76,7 +84,7 @@ case $host in
        mingw_flag=yes
     ;;
   *)
-       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"
+       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 libnotify gudev-1.0"
        mingw_flag=no
     ;;
 esac
@@ -86,23 +94,36 @@ 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"
+PKG_PROG_PKG_CONFIG
+if test "x$update_checks" = "xyes" ; then
+       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
 else
-       if test "x$mingw_flag" = "xno" ; then
-               GHB_PACKAGES="$GHB_PACKAGES webkit-1.0"
-       fi
+       CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
 fi
 
 AM_CONDITIONAL([MINGW], [test "x$mingw_flag" = "xyes"])
 
 PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
 
+case $host in
+  *-*-mingw*)
+    if test "x$use_libdl" = "xyes" ; then
+               GHB_LIBS="$GHB_LIBS -ldl"
+       fi
+    ;;
+esac
+
 AC_SUBST(GHB_CFLAGS)
 AC_SUBST(GHB_LIBS)