Fix previous FLAC pkg-config commit that had some typos.

While there, restructure and remove duplicate code.
This commit is contained in:
Antti Harri 2011-07-10 16:24:44 +03:00
parent 8ac5079ada
commit 070eeb2adb

View file

@ -4,15 +4,12 @@ AC_ARG_ENABLE(flac,
HAVE_FLAC=no HAVE_FLAC=no
if test "x$enable_flac" != "xno"; then if test "x$enable_flac" != "xno"; then
if test "x$PKG_CONFIG" != "x"; then if test "x$PKG_CONFIG" != "x"; then
PKG_CHECK_MODULES([FLAC], [flac], HAVE_FLAC=yes, HAVE_JACK=no) PKG_CHECK_MODULES([LIBFLAC], [flac], HAVE_FLAC=yes, HAVE_FLAC=no)
if test "x$HAVE_FLAC" = "xyes"; then
AC_DEFINE(HAVE_JACK, 1, [Define if you have libFLAC])
fi
else else
AM_PATH_LIBFLAC(HAVE_FLAC=yes, HAVE_FLAC=no) AM_PATH_LIBFLAC(HAVE_FLAC=yes, HAVE_FLAC=no)
if test "x$HAVE_FLAC" = xyes; then fi
AC_DEFINE(HAVE_FLAC, 1, [define this if you have flac libs]) if test "x$HAVE_FLAC" = xyes; then
fi AC_DEFINE(HAVE_FLAC, 1, [define this if you have flac libs])
fi fi
fi fi
AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLAC" = "xyes") AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLAC" = "xyes")