[GNUnet-SVN] r2909 - in Extractor: . src/plugins

[durner]

Author: durner
Date: 2006-05-26 13:20:40 -0700 (Fri, 26 May 2006)
New Revision: 2909

Modified:
   Extractor/configure.ac
   Extractor/src/plugins/Makefile.am
Log:
make mpeg2 optional

Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2006-05-26 20:20:26 UTC (rev 2908)
+++ Extractor/configure.ac      2006-05-26 20:20:40 UTC (rev 2909)
@@ -154,7 +154,7 @@
 
 AC_CHECK_LIB(mpeg2, mpeg2_init,
         [AM_CONDITIONAL(HAVE_MPEG2, true)
-        AC_DEFINE(HAVE_LIBMPEG2,1,[Have libmpeg2])],
+        AC_DEFINE(HAVE_MPEG2,1,[Have libmpeg2])],
         [AM_CONDITIONAL(HAVE_MPEG2, false)])
 
 # restore LIBS
@@ -375,5 +375,5 @@
 
 if test "x$HAVE_MPEG2_TRUE" = "x#"
 then
- AC_MSG_ERROR([FATAL: libmpeg2 not found])
+ AC_MSG_NOTICE([NOTICE: libmpeg2 not found])
 fi

Modified: Extractor/src/plugins/Makefile.am
===================================================================
--- Extractor/src/plugins/Makefile.am   2006-05-26 20:20:26 UTC (rev 2908)
+++ Extractor/src/plugins/Makefile.am   2006-05-26 20:20:40 UTC (rev 2909)
@@ -24,6 +24,10 @@
  pdfplugin=libextractor_pdf.la 
 endif
 
+if HAVE_MPEG2
+ extrampeg = libextractor_mpeg.la
+endif
+
 # toggle for development
 # SUBDIRS = . 
 SUBDIRS = . $(oodir) $(printdir) hash $(oledir) rpm $(xpdfdir) $(thumbdir) 
$(exiv2dir)
@@ -58,7 +62,7 @@
   libextractor_man.la \
   libextractor_mime.la \
   libextractor_mp3.la \
-  libextractor_mpeg.la \
+  $(extrampeg) \
   $(extraogg) \
   libextractor_png.la \
   libextractor_ps.la \
@@ -224,6 +228,7 @@
   $(top_builddir)/src/main/libextractor.la \
   $(PLUGINFLAGS)  $(retaincommand)
 
+if HAVE_MPEG2
 libextractor_mpeg_la_SOURCES = \
   mpegextractor.c 
 libextractor_mpeg_la_LDFLAGS = \
@@ -231,6 +236,7 @@
   $(PLUGINFLAGS)  $(retaincommand)
 libextractor_mpeg_la_LIBADD = \
   -lmpeg2
+endif
 
 libextractor_man_la_SOURCES = \
   manextractor.c