| 1 |
diff -up libtunepimp-0.5.3/configure.in.libmad libtunepimp-0.5.3/configure.in
|
| 2 |
--- libtunepimp-0.5.3/configure.in.libmad 2006-11-28 14:28:38.000000000 -0600
|
| 3 |
+++ libtunepimp-0.5.3/configure.in 2008-09-19 09:28:19.000000000 -0500
|
| 4 |
@@ -236,7 +237,7 @@ AC_CHECK_LIB(mp4v2, MP4Read, [
|
| 5 |
|
| 6 |
if test "x$use_lgpl" = "xno"; then
|
| 7 |
dnl Check for MAD decoder lib for mp3 support
|
| 8 |
- AC_CHECK_LIB(mad,mad_version,
|
| 9 |
+ PKG_CHECK_MODULES(MAD, mad,
|
| 10 |
AC_DEFINE(HAVE_LIBMAD,1,[MP3 Decode Support])
|
| 11 |
TP_PLUGINS="$TP_PLUGINS mp3"
|
| 12 |
with_mp3=yes,
|
| 13 |
@@ -245,8 +246,8 @@ if test "x$use_lgpl" = "xno"; then
|
| 14 |
echo "* the decoder from http://www.mars.org/home/rob/proj/mpeg"
|
| 15 |
echo "* to include MP3 TRM generation capabilities."
|
| 16 |
echo "*"
|
| 17 |
- with_mp3=no
|
| 18 |
- ,-lm)
|
| 19 |
+ , with_mp3=no
|
| 20 |
+ )
|
| 21 |
else
|
| 22 |
with_mp3=no
|
| 23 |
fi
|
| 24 |
@@ -277,7 +278,6 @@ else
|
| 25 |
with_flac=no
|
| 26 |
fi
|
| 27 |
|
| 28 |
-
|
| 29 |
AC_SUBST(TP_PLUGINS)
|
| 30 |
AC_SUBST(CFLAGS)
|
| 31 |
AC_DEFINE_UNQUOTED(PREFIX, "${prefix}", "PREFIX")
|
| 32 |
diff -up libtunepimp-0.5.3/plugins/mp3/Makefile.am.libmad libtunepimp-0.5.3/plugins/mp3/Makefile.am
|
| 33 |
--- libtunepimp-0.5.3/plugins/mp3/Makefile.am.libmad 2006-11-18 04:51:07.000000000 -0600
|
| 34 |
+++ libtunepimp-0.5.3/plugins/mp3/Makefile.am 2008-09-19 09:28:01.000000000 -0500
|
| 35 |
@@ -24,12 +24,12 @@
|
| 36 |
#
|
| 37 |
SUBDIRS = id3tag id3tag-2.3
|
| 38 |
|
| 39 |
-INCLUDES = -I$(top_srcdir)/include/tunepimp-0.5 $(INCLTDL)
|
| 40 |
+INCLUDES = -I$(top_srcdir)/include/tunepimp-0.5 $(INCLTDL) $(MAD_CFLAGS)
|
| 41 |
|
| 42 |
lib_LTLIBRARIES = mp3.la
|
| 43 |
mp3_la_SOURCES = mp3.cpp mp3decode.cpp mp3decode.h id3_meta.cpp id3_2_3_meta.cpp mp3info.cpp
|
| 44 |
mp3_la_LDFLAGS = -module -avoid-version
|
| 45 |
-mp3_la_LIBADD = ../../lib/utf8/libutf8.la id3tag/libid3tag.la id3tag-2.3/libid3tag23.la ../../lib/libpluginsupport.la -lmad -lmusicbrainz
|
| 46 |
+mp3_la_LIBADD = ../../lib/utf8/libutf8.la id3tag/libid3tag.la id3tag-2.3/libid3tag23.la ../../lib/libpluginsupport.la $(MAD_LIBS) -lmusicbrainz
|
| 47 |
|
| 48 |
noinst_HEADERS = mp3decode.h id3_meta.h mp3info.h id3_2_3_meta.h mp3.h
|
| 49 |
|
