diff options
| author | jstebbins <[email protected]> | 2010-05-23 15:38:21 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-05-23 15:38:21 +0000 |
| commit | 28658486daa5cd3e7a58edb3539885422889c44f (patch) | |
| tree | 22bd3d2a80d5443584ece6d769cd7d41c53cdfaa /gtk | |
| parent | a28717d0b3d41674934d6e0e24ee70344576fb1e (diff) | |
add ability to probe for existance of headers and libraries to configure.py
use this to check for system versions of bz2 z pthreadGC2 iberty and dl when
building with mingw. solves a problem with conflicts when building on fedora with
a full standard install of their mingw packages.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3316 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/configure.ac | 12 | ||||
| -rw-r--r-- | gtk/module.defs | 7 | ||||
| -rw-r--r-- | gtk/module.rules | 11 |
3 files changed, 20 insertions, 10 deletions
diff --git a/gtk/configure.ac b/gtk/configure.ac index 0323214f2..423923bf4 100644 --- a/gtk/configure.ac +++ b/gtk/configure.ac @@ -45,6 +45,10 @@ 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) @@ -103,6 +107,14 @@ 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) diff --git a/gtk/module.defs b/gtk/module.defs index 8c1648d61..6801d61aa 100644 --- a/gtk/module.defs +++ b/gtk/module.defs @@ -6,6 +6,13 @@ GTK.build/ = $(BUILD/)gtk/ GTK.CONFIGURE.stamp = $(GTK.build/).stamp.configure +ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) +GTK.CONFIGURE.extra += --host=$(BUILD.spec) +ifeq ($(HAS.dlfcn),1) + GTK.CONFIGURE.extra += --enable-dl +endif +endif + ############################################################################### GTK.out += $(GTK.CONFIGURE.stamp) diff --git a/gtk/module.rules b/gtk/module.rules index e7d93e752..138fe64a6 100644 --- a/gtk/module.rules +++ b/gtk/module.rules @@ -13,22 +13,13 @@ $(GTK.CONFIGURE.stamp): | $(dir $(GTK.CONFIGURE.stamp)) $(GTK.CONFIGURE.stamp): $(GTK.src/)Makefile.am $(GTK.CONFIGURE.stamp): $(GTK.src/)configure.ac $(GTK.src/)src/Makefile.am set -e; cd $(GTK.src/); NOCONFIGURE=1 ./autogen.sh -ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) set -e; cd $(GTK.build/); $(call fn.ABSOLUTE,$(GTK.src/))configure \ - --host=$(BUILD.spec) \ + $(GTK.CONFIGURE.extra) \ PKG_CONFIG_PATH=$(BUILD/)contrib/lib/pkgconfig \ CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D ?extra)" \ LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O) " \ --prefix=$(PREFIX) \ --with-hb=$(call fn.ABSOLUTE,$(BUILD/)) -else - set -e; cd $(GTK.build/); $(call fn.ABSOLUTE,$(GTK.src/))configure \ - PKG_CONFIG_PATH=$(BUILD/)contrib/lib/pkgconfig \ - CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O ?extra)" \ - LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O)" \ - --prefix=$(PREFIX) \ - --with-hb=$(call fn.ABSOLUTE,$(BUILD/)) -endif $(TOUCH.exe) $@ gtk.build: | $(GTK.build/) |