From 03ea0fce9791ef9ca014ef6c49f43454db91da74 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Tue, 7 Aug 2001 16:06:47 +0000 Subject: [PATCH] changed HAVE_FLAC to HAVE_FLACLIB Original commit message from CVS: changed HAVE_FLAC to HAVE_FLACLIB --- acconfig.h | 3 ++- configure.base | 11 +++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/acconfig.h b/acconfig.h index 9d6ab0fbbf..378864c4c1 100644 --- a/acconfig.h +++ b/acconfig.h @@ -39,7 +39,8 @@ #undef HAVE_LIBHERMES #undef HAVE_NASM #undef HAVE_MPEG2DEC -#undef HAVE_FLAC +//thomas: commented out #undef HAVE_FLAC +#undef HAVE_FLACLIB #undef HAVE_LINUX_CDROM #undef HAVE_LINUX_VIDEODEV #undef HAVE_LIBSDL diff --git a/configure.base b/configure.base index 278c998b0b..2fc49a60ab 100644 --- a/configure.base +++ b/configure.base @@ -574,9 +574,8 @@ AC_CHECK_HEADER(mpeg2dec/mpeg2.h, :, HAVE_MPEG2DEC=no) dnl Check for sidplay AC_PATH_LIBSIDPLAY -dnl Check for flac AC_MSG_CHECKING(FLAC library) -AC_CHECK_LIB(FLAC, FLAC__stream_decoder_new, HAVE_FLAC=yes, HAVE_FLAC=no, -lm) +AC_CHECK_LIB(FLAC, main, HAVE_FLAC=yes, HAVE_FLAC=no, -lm) AC_CHECK_HEADER(FLAC/all.h, :, HAVE_FLAC=no) dnl Check for librtp @@ -925,8 +924,8 @@ if test "x$HAVE_MPEG2DEC" = xyes; then AC_DEFINE(HAVE_MPEG2DEC) fi -if test "x$HAVE_FLAC" = xyes; then - AC_DEFINE(HAVE_FLAC) +if test "x$HAVE_FLACLIB" = xyes; then + AC_DEFINE(HAVE_FLACLIB) fi if test "x$HAVE_LIBGSM" = xyes; then @@ -975,11 +974,11 @@ AM_CONDITIONAL(HAVE_LIBLAME, test "x$HAVE_LIBLAME" = "xyes") AM_CONDITIONAL(HAVE_LIBSHOUT, test "x$HAVE_LIBSHOUT" = "xyes") AM_CONDITIONAL(HAVE_MPEG2DEC, test "x$HAVE_MPEG2DEC" = "xyes") dnl thomas : the next line gives errors, this is how it is in CVS -AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLAC" = "xyes") +dnl AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLAC" = "xyes") dnl thomas : the next line gives errors as well, I commented it dnl AM_CONDITIONAL(HAVE_LAC, test "x$HAVE_FAC" = "xyes") dnl thomas: the next line doesn't give errors -dnl AM_CONDITIONAL(HAVE_FLC, test "x$HAVE_FLC" = "xyes") +AM_CONDITIONAL(HAVE_FLACLIB, test "x$HAVE_FLACLIB" = "xyes") AM_CONDITIONAL(HAVE_LIBRTP, test "x$HAVE_LIBRTP" = "xyes") AM_CONDITIONAL(HAVE_ARTS, test "x$HAVE_ARTS" = "xyes") AM_CONDITIONAL(HAVE_RAW1394, test "x$HAVE_RAW1394" = "xyes")