[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r6879 - in Extractor: . src/plugins
From: |
gnunet |
Subject: |
[GNUnet-SVN] r6879 - in Extractor: . src/plugins |
Date: |
Sun, 25 May 2008 07:05:10 -0600 (MDT) |
Author: holindho
Date: 2008-05-25 07:05:10 -0600 (Sun, 25 May 2008)
New Revision: 6879
Modified:
Extractor/configure.ac
Extractor/src/plugins/Makefile.am
Log:
make static linking work (FLAC)
Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac 2008-05-25 12:09:28 UTC (rev 6878)
+++ Extractor/configure.ac 2008-05-25 13:05:10 UTC (rev 6879)
@@ -173,7 +173,14 @@
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)],
Modified: Extractor/src/plugins/Makefile.am
===================================================================
--- Extractor/src/plugins/Makefile.am 2008-05-25 12:09:28 UTC (rev 6878)
+++ Extractor/src/plugins/Makefile.am 2008-05-25 13:05:10 UTC (rev 6879)
@@ -67,6 +67,10 @@
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_LIBADD = \
$(top_builddir)/src/main/libextractor.la
libextractor_flac_la_LDFLAGS = \
- -lFLAC $(PLUGINFLAGS) $(retaincommand)
+ -lFLAC $(flacoggflag) $(PLUGINFLAGS) $(retaincommand)
endif
noinst_LTLIBRARIES = \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r6879 - in Extractor: . src/plugins,
gnunet <=