tracker r3097 - in trunk: . src/tracker-extract

[mr svn gnome org]

Author: mr
Date: Tue Mar 17 11:43:08 2009
New Revision: 3097
URL: http://svn.gnome.org/viewvc/tracker?rev=3097&view=rev

Log:
	* configure.ac:
	* src/tracker-extract/Makefile.am: Fixed GStreamer helix bin
	checks in configure and renamed variables.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/tracker-extract/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Mar 17 11:43:08 2009
@@ -488,26 +488,25 @@
 AC_ARG_ENABLE(gstreamer-helix, 
 	      AS_HELP_STRING([--enable-gstreamer-helix],
 			     [enable GStreamer helix extractor for Real Media (default=no)]),,
-	      [enable_gst_helix=no])
+	      [enable_gstreamer_helix=no])
 
-if test "x$enable_gst_helix" != "xno"; then
+if test "x$enable_gstreamer_helix" != "xno"; then
    if test "x$have_libgstreamer" = "xyes"; then 
-      have_gst_helix="yes"
+      have_gstreamer_helix="yes"
+   else 
+      have_gstreamer_helix="no"
    fi
 else
-   have_gst_helix="no  (disabled)"
+   have_gstreamer_helix="no  (disabled)"
 fi
 
-if test "x$enable_gst_helix" = "xyes"; then
-   if test "x$have_gst_helix" != "xyes"; then
-      AC_MSG_ERROR([Couldn't find GStreamer Helix Bin])
-   fi
-   if test "x$have_libgstreamer" != "xyes"; then
-      AC_MSG_ERROR([GStreamer is not found/used but GStreamer Helix Bin requested])
+if test "x$enable_gstreamer_helix" = "xyes"; then
+   if test "x$have_gstreamer_helix" != "xyes"; then
+      AC_MSG_ERROR([GStreamer is not available or disabled but GStreamer Helix Bin requested])
    fi
 fi
 
-AM_CONDITIONAL(HAVE_GST_HELIX, test "x$have_gst_helix" = "xyes")
+AM_CONDITIONAL(HAVE_GSTREAMER_HELIX, test "x$have_gstreamer_helix" = "xyes")
 
 ####################################################################
 # Windows check

Modified: trunk/src/tracker-extract/Makefile.am
==============================================================================
--- trunk/src/tracker-extract/Makefile.am	(original)
+++ trunk/src/tracker-extract/Makefile.am	Tue Mar 17 11:43:08 2009
@@ -28,7 +28,6 @@
 	$(XINE_CFLAGS) 							\
 	$(TOTEM_PL_PARSER_CFLAGS)
 
-
 modules_LTLIBRARIES = 							\
 	libextract-abw.la 						\
 	libextract-mp3.la				 		\
@@ -36,11 +35,6 @@
 	libextract-png.la 						\
 	libextract-ps.la 						
 
-
-# if HAVE_IMAGEMAGICK
-# modules_LTLIBRARIES += libextract-imagemagick.la
-# endif
-
 if HAVE_EXEMPI
 modules_LTLIBRARIES += libextract-xmp.la
 endif
@@ -69,11 +63,7 @@
 modules_LTLIBRARIES += libextract-gstreamer.la
 endif
 
-#if HAVE_GSTREAMER
-#modules_LTLIBRARIES += libextract-gstreamer-tagreadbin.la
-#endif
-
-if HAVE_GST_HELIX
+if HAVE_GSTREAMER_HELIX
 modules_LTLIBRARIES += libextract-gstreamer-helix.la
 endif 
 
@@ -123,11 +113,6 @@
 libextract_abw_la_LDFLAGS = $(module_flags)
 libextract_abw_la_LIBADD = $(GLIB2_LIBS) $(GCOV_LIBS)
 
-# Imagemagick
-# libextract_imagemagick_la_SOURCES = tracker-extract-imagemagick.c $(xmp_sources)
-# libextract_imagemagick_la_LDFLAGS = $(module_flags)
-# libextract_imagemagick_la_LIBADD = $(GLIB2_LIBS) $(EXEMPI_LIBS) $(GCOV_LIBS)
-
 # MP3
 libextract_mp3_la_SOURCES = tracker-extract-mp3.c $(albumart_sources) $(escape_sources)
 libextract_mp3_la_LDFLAGS = $(module_flags) $(albumart_flags)
@@ -186,11 +171,6 @@
 libextract_gstreamer_la_LDFLAGS = $(module_flags) $(albumart_flags)
 libextract_gstreamer_la_LIBADD = $(albumart_libs) $(GSTREAMER_LIBS) $(GLIB2_LIBS) $(GCOV_LIBS)
 
-# GStreamer tagreadbin
-#libextract_gstreamer_tagreadbin_la_SOURCES = tracker-extract-gstreamer-tagreadbin.c $(albumart_sources) $(escape_sources)
-#libextract_gstreamer_tagreadbin_la_LDFLAGS = $(module_flags) $(albumart_flags)
-#libextract_gstreamer_tagreadbin_la_LIBADD = $(albumart_libs) $(GSTREAMER_LIBS) $(GLIB2_LIBS)
-
 # GStreamer helix
 libextract_gstreamer_helix_la_SOURCES = tracker-extract-gstreamer-helix.c $(albumart_sources) $(escape_sources)
 libextract_gstreamer_helix_la_LDFLAGS = $(module_flags) $(albumart_flags)