X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fconfigure.ac;h=0a1b2517daff57e92b11621604398cab06e8f34f;hb=033e32de9c380f54c7d1362a3979da205ebc3a29;hp=76a39cc3551bc8ea45cc2b56ec1b995cd85aff8c;hpb=aea0a8447fda112a4a00f11875ff18b06e38acda;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/gtk/configure.ac b/gtk/configure.ac index 76a39cc3..0a1b2517 100644 --- a/gtk/configure.ac +++ b/gtk/configure.ac @@ -3,7 +3,7 @@ dnl Created by Anjuta application wizard. AC_INIT(ghb, 0.1) -AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) +AM_INIT_AUTOMAKE([1.7.9 foreign dist-bzip2 dist-zip]) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE @@ -17,7 +17,7 @@ AC_HEADER_STDC AC_ARG_WITH(hb, AC_HELP_STRING( [--with-hb=prefix], - [try this for the bh-library prefix install directory] + [try this for the hb-library prefix install directory] ), hb_PATHSET=1, hb_PATHSET=0 @@ -45,6 +45,10 @@ else AC_SUBST(HB_DIR, '$(top_srcdir)/'"..") fi +AC_ARG_ENABLE(gst, + AS_HELP_STRING([--enable-gst], [enable gstreamer on Win32]), + w32_gst=yes, w32_gst=no) + # overwrite global variable (used for Makefile generation) AC_SUBST(GLOBALCXXFLAGS, $CXXFLAGS ) AC_SUBST(GLOBALLDFLAGS, $LDFLAGS ) @@ -60,23 +64,48 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name]) AM_GLIB_GNU_GETTEXT IT_PROG_INTLTOOL([0.35.0]) - - AM_PROG_LIBTOOL +case $host in + *-*-mingw*) + if test "x$w32_gst" = "xyes" ; then + 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.10 gthread-2.0 gio-2.0" + fi + 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" + mingw_flag=no + ;; +esac + +if test "x$w32_gst" = "xyes" -o "x$mingw_flag" != "xyes" ; then + CXXFLAGS="$CXXFLAGS -D_ENABLE_GST" + 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(GHBTOOLS, [glib-2.0 gobject-2.0 gdk-pixbuf-2.0]) -AC_SUBST(GHBTOOLS_CFLAGS) -AC_SUBST(GHBTOOLS_LIBS) +PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES]) -PKG_CHECK_MODULES(GHB, [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]) AC_SUBST(GHB_CFLAGS) AC_SUBST(GHB_LIBS) - - - AC_OUTPUT([ Makefile src/Makefile