libextractor

commit 6d2dcc1c433177dcbd15f1ccf53f0ca88d461ef2
parent 63510566b4e8d1164e20624f51734c1e11dcb49e
Author: Heikki Lindholm <holin@iki.fi>
Date:   Sun, 25 May 2008 13:05:10 +0000

make static linking work (FLAC)


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

2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -173,7 +173,14 @@ AC_CHECK_LIB(vorbisfile, ov_open_callbacks,
 AC_CHECK_LIB(FLAC, FLAC__stream_decoder_init_stream,
         [AM_CONDITIONAL(HAVE_FLAC, true)
          AC_DEFINE(HAVE_FLAC,1,[Have flac])],
-        [AM_CONDITIONAL(HAVE_FLAC, false)])
+        [AM_CONDITIONAL(HAVE_FLAC, false)],
+        -logg)
+# test without -logg to see whether we really need it (libflac can be without)
+AC_CHECK_LIB(FLAC, FLAC__stream_decoder_init_ogg_stream,
+        [AM_CONDITIONAL(HAVE_FLAC, true)
+         AC_DEFINE(HAVE_FLAC,1,[Have flac])
+         AM_CONDITIONAL(NEED_OGG, false)],
+        [AM_CONDITIONAL(NEED_OGG, true)])
 AC_CHECK_LIB(vorbisfile, vorbis_comment_query,
         [AM_CONDITIONAL(NEED_VORBIS, false)],
         [AM_CONDITIONAL(NEED_VORBIS, true)],
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
@@ -67,6 +67,10 @@ if NEED_VORBIS
  vorbisflag = -lvorbis
 endif
 
+if NEED_OGG
+ flacoggflag = -logg
+endif
+
 if HAVE_ZLIB
 extraqt = libextractor_qt.la
 oodir = oo
@@ -123,7 +127,7 @@ libextractor_flac_la_SOURCES = \
 libextractor_flac_la_LIBADD = \
   $(top_builddir)/src/main/libextractor.la
 libextractor_flac_la_LDFLAGS = \
- -lFLAC $(PLUGINFLAGS)  $(retaincommand)
+ -lFLAC $(flacoggflag) $(PLUGINFLAGS)  $(retaincommand)
 endif
 
 noinst_LTLIBRARIES = \