libextractor

commit d6dba6f39427d7717a92ca8e4cd328440aeb08cd
parent 530fa2dba6a5bf5104f5eaf902771acf0fb51423
Author: Nils Durner <durner@gnunet.org>
Date:   Fri,  3 Jun 2005 21:53:37 +0000

Don't always add -lvorbis

Diffstat:
M
configure.ac
 | 
4
+++-
M
src/plugins/Makefile.am
 | 
6
+++++-

2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -119,7 +119,9 @@ AC_CHECK_LIB(vorbisfile, ov_open_callbacks,
         [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)
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
@@ -27,6 +27,10 @@ if HAVE_VORBISFILE
  extraogg = libextractor_ogg.la
 endif
 
+if NEED_VORBIS
+ vorbisflag = -lvorbis
+endif
+
 if HAVE_ZLIB
 extraqt = libextractor_qt.la
 endif
@@ -65,7 +69,7 @@ if HAVE_VORBISFILE
 libextractor_ogg_la_SOURCES = \
   oggextractor.c
 libextractor_ogg_la_LDFLAGS = \
- -lvorbisfile -lvorbis $(PLUGINFLAGS)
+ -lvorbisfile $(vorbisflag) $(PLUGINFLAGS)
 endif
 
 noinst_LTLIBRARIES = \