commit 7c455c334dbff7ffb671cd4ceb2b994b379fcb03
Author: Todd Zullinger <t...@pobox.com>
Date: Sun Feb 14 17:46:06 2010 -0500
Explicitly check for and link libvorbis
Changes in the default DSO linking behavior on Fedora exposed the fact
that gtkpod used symbols from libvorbis but had relied on other
libraries it linked against to pull it in.
configure.in | 10 +++++++++-
src/oggfile.c | 1 +
2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/configure.in b/configure.in
index 00f4200..3033e99 100644
--- a/configure.in
+++ b/configure.in
@@ -125,7 +125,7 @@ else
have_gio="*no -- will build without iPod autodetection support"
fi
-dnl Check for libvorbisfile
+dnl Check for libvorbisfile and libvorbis
AC_ARG_WITH(ogg, AC_HELP_STRING([--without-ogg], [Disable Ogg/Vorbis support]))
if test "x$with_ogg" != "xno"; then
AC_SEARCH_LIBS(ov_open, ["vorbisfile"],
@@ -134,6 +134,14 @@ if test "x$with_ogg" != "xno"; then
have_ogg="no"
AC_MSG_WARN([vorbis/vorbisfile.h cannot be found or is unusable. Check
your ogg/vorbis installation.])
fi
+ if test "x$have_ogg" = "xyes"; then
+ AC_SEARCH_LIBS(vorbis_comment_query, ["vorbis"],
+ [AC_CHECK_HEADER(vorbis/codec.h, have_ogg=yes,
have_ogg_header=no)], have_ogg=no)
+ if test "x$have_ogg_header" = "xno"; then
+ have_ogg="no"
+ AC_MSG_WARN([vorbis/codec.h cannot be found or is unusable. Check
your ogg/vorbis installation.])
+ fi
+ fi
if test "x$with_ogg" = "xyes" -a "x$have_ogg" = "xno"; then
AC_MSG_ERROR([Ogg/Vorbis support explicitly requested but ogg/vorbis
libs couldn't be found])
fi
diff --git a/src/oggfile.c b/src/oggfile.c
index 847241f..7f3f777 100644
--- a/src/oggfile.c
+++ b/src/oggfile.c
@@ -45,6 +45,7 @@
#include <inttypes.h>
#include <stdlib.h>
#include <string.h>
+#include "vorbis/codec.h"
#include "vorbis/vorbisfile.h"
#include "prefs.h"
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
