Build system upgrade:

HAVE_EXTRACTOR_H -> HAVE_LIBEXTRACTOR

3 files changed, 14 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index 08bc56c3..a3ed4c8c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # See the main source file 'xineliboutput.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile,v 1.40 2008-10-21 14:41:27 phintuka Exp $
+# $Id: Makefile,v 1.41 2008-10-28 10:37:02 phintuka Exp $
 #
 
 # The official name of this plugin.
@@ -24,7 +24,7 @@ XINELIBOUTPUT_X11 = 0
 HAVE_XRENDER      = 0
 HAVE_XDPMS        = 0
 HAVE_XINERAMA     = 0
-HAVE_EXTRACTOR_H  = 0
+HAVE_LIBEXTRACTOR = 0
 APPLE_DARWIN      = 0
 XINELIBOUTPUT_XINEPLUGIN = 0
 
@@ -84,7 +84,7 @@ USE_ICONV = 1
 #HAVE_XRENDER             = 1
 #HAVE_XDPMS               = 1
 #HAVE_XINERAMA            = 1
-#HAVE_EXTRACTOR_H         = 1
+#HAVE_LIBEXTRACTOR        = 1
 #XINELIBOUTPUT_FB         = 1
 #XINELIBOUTPUT_XINEPLUGIN = 1
 #XINELIBOUTPUT_VDRPLUGIN  = 1
@@ -165,7 +165,7 @@ else
     endif
     XINELIBOUTPUT_VDRPLUGIN = 1
     ifeq ($(shell pkg-config libextractor && echo "1"), 1)
-        HAVE_EXTRACTOR_H = 1
+        HAVE_LIBEXTRACTOR = 1
     else
         $(warning libextractor not found.)
     endif
@@ -270,8 +270,8 @@ endif
 ifeq ($(HAVE_XINERAMA), 1)
     DEFINES += -DHAVE_XINERAMA=1
 endif
-ifeq ($(HAVE_EXTRACTOR_H), 1)
-    DEFINES  += -DHAVE_EXTRACTOR_H=1
+ifeq ($(HAVE_LIBEXTRACTOR), 1)
+    DEFINES  += -DHAVE_LIBEXTRACTOR=1
     INCLUDES += $(shell pkg-config libextractor --cflags-only-I)
     LIBS_VDR += $(shell pkg-config libextractor --libs-only-L)
     LIBS_VDR += $(shell pkg-config libextractor --libs-only-l)
diff --git a/tools/metainfo_menu.c b/tools/metainfo_menu.c
index 746da1fe..b08f8323 100644
--- a/tools/metainfo_menu.c
+++ b/tools/metainfo_menu.c
@@ -4,11 +4,11 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: metainfo_menu.c,v 1.4 2008-05-22 10:44:23 phintuka Exp $
+ * $Id: metainfo_menu.c,v 1.5 2008-10-28 10:37:03 phintuka Exp $
  *
  */
 
-#ifdef HAVE_EXTRACTOR_H
+#ifdef HAVE_LIBEXTRACTOR
 # include <extractor.h>
 #endif
 
@@ -42,7 +42,7 @@ void cMetainfoMenu::Display(void)
   char metadata[4096];
   metadata[0] = 0;
 
-#ifdef HAVE_EXTRACTOR_H
+#ifdef HAVE_LIBEXTRACTOR
   EXTRACTOR_ExtractorList * plugins;
   EXTRACTOR_KeywordList   * md_list;
   plugins = EXTRACTOR_loadDefaultLibraries();
diff --git a/tools/playlist.c b/tools/playlist.c
index 1e2d4b80..8f38a8b5 100644
--- a/tools/playlist.c
+++ b/tools/playlist.c
@@ -4,18 +4,18 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: playlist.c,v 1.18 2008-07-14 07:57:24 phintuka Exp $
+ * $Id: playlist.c,v 1.19 2008-10-28 10:37:02 phintuka Exp $
  *
  */
 
 #include <stdlib.h> 
 
-#ifdef HAVE_EXTRACTOR_H
+#ifdef HAVE_LIBEXTRACTOR
 # include <extractor.h>
   // libextractor 0.5.20 (2008-03-20) adds support for track numbers
 # if EXTRACTOR_VERSION < 0x00052000
 #  warning libextractor version too old (0.5.20 required for track numbers)
-#  undef HAVE_EXTRACTOR_H
+#  undef HAVE_LIBEXTRACTOR
 # endif
 #endif
 
@@ -107,7 +107,7 @@ int cPlaylistItem::Compare(const cListObject &ListObject) const
 // cID3Scanner
 //
 
-#ifndef HAVE_EXTRACTOR_H
+#ifndef HAVE_LIBEXTRACTOR
 static const char *shell_escape(char *buf, int buflen, const cString& src, char ch)
 {
   const char *pt = *src;
@@ -161,7 +161,7 @@ class cID3Scanner : public cThread
 
       if(xc.IsAudioFile(Item->Filename)) {
         LOGDBG("Scanning metainfo for file %s", *Item->Filename);
-#ifdef HAVE_EXTRACTOR_H
+#ifdef HAVE_LIBEXTRACTOR
         EXTRACTOR_ExtractorList * plugins;
         EXTRACTOR_KeywordList   * md_list;
         plugins = EXTRACTOR_loadDefaultLibraries();