From: Darren S. <li...@yo...> - 2008-04-27 18:33:33
|
# HG changeset patch # User Darren Salt <li...@yo...> # Date 1209321177 -3600 # Node ID c9f36c944b7586103c24120ada28f13ea8a37a8a # Parent 2c455af254d02adcc9b331dd3259b00312a5ee4a Fix internal libmad compilation in the absence of external libmad. diff -r c9f36c944b7586103c24120ada28f13ea8a37a8a -r 2c455af254d02adcc9b331dd3259b00312a5ee4a m4/decoders.m4 --- a/m4/decoders.m4 Sun Apr 27 19:32:57 2008 +0100 +++ b/m4/decoders.m4 Mon Apr 21 19:15:49 2008 +0100 @@ -258,7 +258,7 @@ use internal ffmpeg. else AC_MSG_RESULT([Using included libmad support]) fi - if test x"$have_external_libmad" != x"no"; then + if test x"$have_external_libmad" != x"yes"; then case "$host_or_hostalias" in i?86-* | k?-* | athlon-* | pentium*-) AC_DEFINE([FPM_INTEL], 1, [Define to select libmad fixed point arithmetic implementation]) @@ -291,8 +291,6 @@ use internal ffmpeg. AC_DEFINE([FPM_DEFAULT], 1, [Define to select libmad fixed point arithmetic implementation]) ;; esac - fi - if test x"$have_external_libmad" != x"yes"; then LIBMAD_CFLAGS='-I$(top_srcdir)/contrib/libmad' LIBMAD_LIBS='$(top_builddir)/contrib/libmad/libmad.la' LIBMAD_DEPS='$(top_builddir)/contrib/libmad/libmad.la' |