From 7e1c83b5b948844ff81bb7e8100d349f7d05908d Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 28 Mar 2014 11:30:01 +0100 Subject: [PATCH] validate: Do not build LD_PRELOAD related code on windows And do not forget to link against gst-pbutils --- validate/configure.ac | 10 ++++++++++ validate/gst/validate/Makefile.am | 19 ++++++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/validate/configure.ac b/validate/configure.ac index 3f6639b42b..68a08052ed 100644 --- a/validate/configure.ac +++ b/validate/configure.ac @@ -62,6 +62,16 @@ AM_GNU_GETTEXT_VERSION([0.17]) AM_GNU_GETTEXT([external]) AG_GST_GETTEXT([gst-validate-$GST_API_VERSION]) +dnl Check wether to build LDPRELOAD related code or not +AC_CANONICAL_HOST +case $host_os in + mingw* | msvc* | mks*) + BUILD_LDPRELOAD=no ;; + *) + BUILD_LDPRELOAD=yes ;; +esac +AM_CONDITIONAL(HAVE_LD_PRELOAD, test "x$BUILD_LDPRELOAD" = "xyes") + dnl *** check for arguments to configure *** AG_GST_ARG_DEBUG diff --git a/validate/gst/validate/Makefile.am b/validate/gst/validate/Makefile.am index 961a52c7f6..d6959f4e78 100644 --- a/validate/gst/validate/Makefile.am +++ b/validate/gst/validate/Makefile.am @@ -33,20 +33,24 @@ libgstvalidate_@GST_API_VERSION@include_HEADERS = \ gst-validate-utils.h \ gst-validate-media-info.h -lib_LTLIBRARIES = \ - libgstvalidate-@GST_API_VERSION@.la \ - libgstvalidate-default-overrides-@GST_API_VERSION@.la \ - libgstvalidate-preload-@GST_API_VERSION@.la -libgstvalidate_@GST_API_VERSION@_la_CFLAGS = $(GST_ALL_CFLAGS) $(GIO_CFLAGS) +lib_LTLIBRARIES = libgstvalidate-@GST_API_VERSION@.la + +if HAVE_LD_PRELOAD +lib_LTLIBRARIES += libgstvalidate-default-overrides-@GST_API_VERSION@.la \ + libgstvalidate-preload-@GST_API_VERSION@.la +endif + +libgstvalidate_@GST_API_VERSION@_la_CFLAGS = $(GST_ALL_CFLAGS) $(GIO_CFLAGS) $(GST_PBUTILS_CFLAGS) libgstvalidate_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) \ - $(GST_LT_LDFLAGS) $(GIO_LDFLAGS) + $(GST_LT_LDFLAGS) $(GIO_LDFLAGS) $(GST_PBUTILS_LDFAGS) libgstvalidate_@GST_API_VERSION@_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \ - $(GST_ALL_LIBS) $(GIO_LIBS) + $(GST_ALL_LIBS) $(GIO_LIBS) $(GST_PBUTILS_LIBS) libgstvalidate_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/validate +if HAVE_LD_PRELOAD libgstvalidate_default_overrides_@GST_API_VERSION@_la_SOURCES = \ gst-validate-default-overrides.c @@ -71,6 +75,7 @@ libgstvalidate_preload_@GST_API_VERSION@_la_LIBADD = \ $(GST_ALL_LIBS) libgstvalidate_preload_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/validate libgstvalidate_preload_@GST_API_VERSION@include_HEADERS = +endif #AM_CFLAGS = $(GST_ALL_CFLAGS) $(GST_PBUTILS_CFLAGS) #LDADD = $(top_builddir)/gst/validate/libgstvalidate-@GST_API_VERSION@.la $(GST_PBUTILS_LIBS) $(GST_LIBS)