configure.ac: detect faad correctly as non-working if it's indeed non-working

Original commit message from CVS:
* configure.ac:
detect faad correctly as non-working if it's indeed non-working
This commit is contained in:
Benjamin Otte 2004-04-26 18:03:19 +00:00
parent 868b8c650e
commit 7d948c9efc
2 changed files with 14 additions and 6 deletions

View file

@ -1,3 +1,8 @@
2004-04-26 Benjamin Otte <otte@gnome.org>
* configure.ac:
detect faad correctly as non-working if it's indeed non-working
2004-04-26 Thomas Vander Stichele <thomas at apestaart dot org> 2004-04-26 Thomas Vander Stichele <thomas at apestaart dot org>
* Makefile.am: * Makefile.am:

View file

@ -865,7 +865,9 @@ GST_CHECK_FEATURE(FAAC, [AAC encoder plug-in], faac, [
dnl **** Free AAC Decoder (FAAD) **** dnl **** Free AAC Decoder (FAAD) ****
translit(dnm, m, l) AM_CONDITIONAL(USE_FAAD, true) translit(dnm, m, l) AM_CONDITIONAL(USE_FAAD, true)
GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [ GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
GST_CHECK_LIBHEADER(FAAD, faad, faacDecOpen, -lm, faad.h, FAAD_LIBS="-lfaad -lm") HAVE_FAAD="yes"
GST_CHECK_LIBHEADER(FAAD, faad, faacDecOpen, -lm, faad.h, FAAD_LIBS="-lfaad -lm", HAVE_FAAD="no")
if test $HAVE_FAAD = "yes"; then
AC_MSG_CHECKING([Checking for FAAD >= 2]) AC_MSG_CHECKING([Checking for FAAD >= 2])
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <faad.h> #include <faad.h>
@ -875,6 +877,7 @@ GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
], [ return 0; ], ], [ return 0; ],
[ HAVE_FAAD="yes" && AC_MSG_RESULT(yes)], [ HAVE_FAAD="yes" && AC_MSG_RESULT(yes)],
[ HAVE_FAAD="no" && AC_MSG_RESULT(no)]) [ HAVE_FAAD="no" && AC_MSG_RESULT(no)])
fi;
AS_SCRUB_INCLUDE(FAAD_CFLAGS) AS_SCRUB_INCLUDE(FAAD_CFLAGS)
AC_SUBST(FAAD_LIBS) AC_SUBST(FAAD_LIBS)
]) ])