From 9ab8959b30774cc2845b9e0d586b149b01bb803a Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiago.sousa.santos@collabora.co.uk>
Date: Fri, 11 Jun 2010 15:29:43 -0300
Subject: [PATCH] jifmux: Fix tests building

Only build jifmux tests if libexif headers are present
---
 configure.ac                  | 15 +++++++++++----
 tests/check/Makefile.am       | 17 +++++++++--------
 tests/check/elements/jifmux.c |  6 ------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 40508c7cbf..6289c3cb31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -739,13 +739,20 @@ AG_GST_CHECK_FEATURE(RESINDVD, [resindvd plugin], resindvd, [
   ])
 ])
 
+dnl **** exif (used on metadata and jifmux tests) ****
+translit(dnm, m, l) AM_CONDITIONAL(USE_EXIF, true)
+AG_GST_CHECK_FEATURE(EXIF, [exif], exif, [
+  PKG_CHECK_MODULES(EXIF, libexif >= 0.6.16, HAVE_EXIF="yes", [
+    HAVE_EXIF="no"
+    AC_MSG_RESULT(no)
+  ])
+])
+
+
 dnl *** METADATA ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_METADATA, true)
 AG_GST_CHECK_FEATURE(METADATA, [METADATA muxer and demuxer], metadata, [
   HAVE_METADATA="no"
-  PKG_CHECK_MODULES(EXIF, libexif >= 0.6.16, HAVE_EXIF="yes", [
-    HAVE_EXIF="no"
-  ])
   PKG_CHECK_MODULES(IPTC, libiptcdata >= 1.0.2, HAVE_IPTC="yes", [
     HAVE_IPTC="no"
   ])
@@ -754,7 +761,7 @@ AG_GST_CHECK_FEATURE(METADATA, [METADATA muxer and demuxer], metadata, [
   ])
   PKG_CHECK_MODULES(XMP_1_99_5, exempi-2.0 >= 1.99.5, XMP_CFLAGS="-DXMP_1_99_5 $XMP_CFLAGS", AC_MSG_RESULT(no))
   if test x$HAVE_EXIF = xyes; then
-    METADATA_CFLAGS="-DHAVE_EXIF $EXIF_CFLAGS $METADATA_CFLAGS"
+    METADATA_CFLAGS="$EXIF_CFLAGS $METADATA_CFLAGS"
     METADATA_LIBS="$EXIF_LIBS $METADATA_LIBS -lm"
     HAVE_METADATA="yes"
   fi
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index dd2faa15c6..f413f9f301 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -45,6 +45,12 @@ else
 check_faad =
 endif
 
+if USE_EXIF
+check_jifmux = elements/jifmux
+else
+check_jifmux =
+endif
+
 if USE_METADATA
 check_metadata = pipelines/metadata
 else
@@ -133,7 +139,7 @@ check_PROGRAMS = \
 	elements/camerabin \
 	elements/dataurisrc \
 	elements/legacyresample \
-	elements/jifmux \
+        $(check_jifmux) \
 	elements/jpegparse \
 	elements/qtmux \
 	elements/selector \
@@ -165,13 +171,8 @@ elements_camerabin_LDADD = \
          -lgstinterfaces-@GST_MAJORMINOR@
 elements_camerabin_SOURCES = elements/camerabin.c
 
-exif_CFLAGS =
-exif_LDADD =
-if test x$HAVE_EXIF = xyes; then
-  exif_CFLAGS = -DHAVE_EXIF
-
-elements_jifmux_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS) $(GST_OPTION_CFLAGS) $(exif_CFLAGS)
-elements_jifmux_LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS) $(EXIF_LIBS)
+elements_jifmux_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS) $(GST_OPTION_CFLAGS) $(AM_CFLAGS) $(EXIF_CFLAGS)
+elements_jifmux_LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS) $(EXIF_LIBS) $(LDADD)
 elements_jifmux_SOURCES = elements/jifmux.c
 
 elements_timidity_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS)
diff --git a/tests/check/elements/jifmux.c b/tests/check/elements/jifmux.c
index bb2165887a..8cd0893a43 100644
--- a/tests/check/elements/jifmux.c
+++ b/tests/check/elements/jifmux.c
@@ -28,7 +28,6 @@
 
 #include <gst/check/gstcheck.h>
 
-#ifdef HAVE_EXIF
 #include <libexif/exif-data.h>
 #include <libexif/exif-loader.h>
 
@@ -194,18 +193,13 @@ GST_START_TEST (test_jifmux_tags)
 }
 
 GST_END_TEST;
-#endif
 
 static Suite *
 asfmux_suite (void)
 {
   Suite *s = suite_create ("jifmux");
   TCase *tc_chain = tcase_create ("general");
-#ifdef HAVE_EXIF
   tcase_add_test (tc_chain, test_jifmux_tags);
-#else
-  GST_WARNING ("Not running jifmux tags tests that depend on libexif");
-#endif
 
   suite_add_tcase (s, tc_chain);