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

[durner]

Author: durner
Date: 2005-06-03 14:53:37 -0700 (Fri, 03 Jun 2005)
New Revision: 861

Modified:
   Extractor/configure.ac
   Extractor/src/plugins/Makefile.am
Log:
Don't always add -lvorbis

Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2005-06-03 21:32:37 UTC (rev 860)
+++ Extractor/configure.ac      2005-06-03 21:53:37 UTC (rev 861)
@@ -119,8 +119,10 @@
         [AM_CONDITIONAL(HAVE_VORBISFILE, true)
          AC_DEFINE(HAVE_VORBISFILE,1,[Have vorbisfile])],
         [AM_CONDITIONAL(HAVE_VORBISFILE, false)])
+AC_CHECK_LIB(vorbisfile, vorbis_comment_query,
+        [AM_CONDITIONAL(NEED_VORBIS, false)],
+        [AM_CONDITIONAL(NEED_VORBIS, true)])
 
-
 AC_CHECK_LIB(z, inflate,
         [AM_CONDITIONAL(HAVE_ZLIB, true)
         AC_DEFINE(HAVE_ZLIB,1,[Have zlib])],

Modified: Extractor/src/plugins/Makefile.am
===================================================================
--- Extractor/src/plugins/Makefile.am   2005-06-03 21:32:37 UTC (rev 860)
+++ Extractor/src/plugins/Makefile.am   2005-06-03 21:53:37 UTC (rev 861)
@@ -27,6 +27,10 @@
  extraogg = libextractor_ogg.la
 endif
 
+if NEED_VORBIS
+ vorbisflag = -lvorbis
+endif
+
 if HAVE_ZLIB
 extraqt = libextractor_qt.la
 endif
@@ -65,7 +69,7 @@
 libextractor_ogg_la_SOURCES = \
   oggextractor.c
 libextractor_ogg_la_LDFLAGS = \
- -lvorbisfile -lvorbis $(PLUGINFLAGS)
+ -lvorbisfile $(vorbisflag) $(PLUGINFLAGS)
 endif
 
 noinst_LTLIBRARIES = \