summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6438094)
raw | patch | inline | side by side (parent: 6438094)
author | Jan Schmidt <thaytan@mad.scientist.com> | |
Mon, 27 Feb 2006 18:37:47 +0000 (18:37 +0000) | ||
committer | Jan Schmidt <thaytan@mad.scientist.com> | |
Mon, 27 Feb 2006 18:37:47 +0000 (18:37 +0000) |
Original commit message from CVS:
* configure.ac:
Make the id3tag and mad checks check for both a header and the
appropriate library if the pkg-config is missing. (Closes #331842)
Split the id3tag and mad checks into 2 pieces. Sometime soon I might
do the same for the plugins themselves.
* configure.ac:
Make the id3tag and mad checks check for both a header and the
appropriate library if the pkg-config is missing. (Closes #331842)
Split the id3tag and mad checks into 2 pieces. Sometime soon I might
do the same for the plugins themselves.
ChangeLog | patch | blob | history | |
configure.ac | patch | blob | history |
diff --git a/ChangeLog b/ChangeLog
index d5597de129b268a5713f2da2bf5225b98c3ac81c..beced5b7db3d20118bebe9e66a34ba49ab502926 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
+2006-02-27 Jan Schmidt <thaytan@mad.scientist.com>
+
+ * configure.ac:
+ Make the id3tag and mad checks check for both a header and the
+ appropriate library if the pkg-config is missing. (Closes #331842)
+ Split the id3tag and mad checks into 2 pieces. Sometime soon I might
+ do the same for the plugins themselves.
+
2006-02-27 Luca Ognibene <luogni at tin dot it>
Reviewed by: Tim-Philipp Müller <tim at centricular dot net>
diff --git a/configure.ac b/configure.ac
index 0a378922311a21bfcda37c370704bef565a02fe1..16aa46334bda57d5b11ff9cc977d976fd93e5583 100644 (file)
--- a/configure.ac
+++ b/configure.ac
])
])
-dnl *** mad ***
-dnl FIXME: we could use header checks here as well IMO
-translit(dnm, m, l) AM_CONDITIONAL(USE_MAD, true)
-GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [
+dnl *** id3tag from the MAD project ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_ID3TAG, true)
+GST_CHECK_FEATURE(ID3TAG, [id3tag reading and writing from the MAD project], id3tag, [
dnl check with pkg-config first
- PKG_CHECK_MODULES(MAD, mad >= 0.15 id3tag >= 0.15, HAVE_MAD="yes", HAVE_MAD="no")
- if test "x$HAVE_MAD" = "xno"; then
+ PKG_CHECK_MODULES(ID3TAG, id3tag >= 0.15, HAVE_ID3TAG="yes", HAVE_ID3TAG="no")
+ if test "x$HAVE_ID3TAG" = "xno"; then
dnl fall back to oldskool detection
- AC_CHECK_LIB(mad, mad_decoder_finish, HAVE_MAD="yes" MAD_LIBS="-lmad")
- if test "x$HAVE_MAD" = "xyes"; then
- HAVE_MAD="no"
+ AC_CHECK_HEADER(id3tag.h, [
save_LIBS=$LIBS
LIBS="-lz"
- AC_CHECK_LIB(id3tag, id3_tag_options, HAVE_MAD="yes" MAD_LIBS="-lmad -lid3tag -lz")
+ AC_CHECK_LIB(id3tag, id3_tag_options, HAVE_ID3TAG="yes" ID3TAG_LIBS="-lid3tag -lz")
LIBS=$save_LIBS
- fi
- fi
+ ])
+ fi
+])
+AC_SUBST(ID3TAG_LIBS)
+
+dnl *** mad ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_MAD, true)
+GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [
+ if test "x$HAVE_ID3TAG" = "xyes"; then
+ dnl check with pkg-config first
+ PKG_CHECK_MODULES(MAD, mad >= 0.15 id3tag >= 0.15, HAVE_MAD="yes", HAVE_MAD="no")
+ if test "x$HAVE_MAD" = "xno"; then
+ dnl fall back to oldskool detection
+ AC_CHECK_HEADER(mad.h, [
+ AC_CHECK_LIB(mad, mad_decoder_finish, HAVE_MAD="yes" MAD_LIBS="-lmad $ID3TAG_LIBS")
+ ])
+ fi
+ else
+ HAVE_MAD="no"
+ AC_MSG_WARN([libid3tag was not available, cannot build MAD MP3 decoder plugin])
+ fi
])
AC_SUBST(MAD_LIBS)