From e56e8caff26d7eb63dbc74d93ee02330401480fc Mon Sep 17 00:00:00 2001 From: Antti Harri Date: Sat, 9 Jul 2011 22:59:49 +0300 Subject: [PATCH] Fix previous FLAC pkg-config commit that had some typos. While there, restructure and remove duplicate code. --- config.d/compression.m4 | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/config.d/compression.m4 b/config.d/compression.m4 index 293c996ce..7d624a18c 100644 --- a/config.d/compression.m4 +++ b/config.d/compression.m4 @@ -4,15 +4,12 @@ AC_ARG_ENABLE(flac, HAVE_FLAC=no if test "x$enable_flac" != "xno"; then if test "x$PKG_CONFIG" != "x"; then - PKG_CHECK_MODULES([FLAC], [flac], HAVE_FLAC=yes, HAVE_JACK=no) - if test "x$HAVE_FLAC" = "xyes"; then - AC_DEFINE(HAVE_JACK, 1, [Define if you have libFLAC]) - fi + PKG_CHECK_MODULES([FLAC], [flac], HAVE_FLAC=yes, HAVE_FLAC=no) else AM_PATH_LIBFLAC(HAVE_FLAC=yes, HAVE_FLAC=no) - if test "x$HAVE_FLAC" = xyes; then - AC_DEFINE(HAVE_FLAC, 1, [define this if you have flac libs]) - fi + fi + if test "x$HAVE_FLAC" = xyes; then + AC_DEFINE(HAVE_FLAC, 1, [define this if you have flac libs]) fi fi AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLAC" = "xyes")