changeset 967:55757f96ef5d trunk

[svn] Force dependance on taglib now used by mpg123 and musepack.
author nemo
date Mon, 24 Apr 2006 14:03:16 -0700
parents cf30e07395d5
children 55161236115e
files configure.ac
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Mon Apr 24 13:07:42 2006 -0700
+++ b/configure.ac	Mon Apr 24 14:03:16 2006 -0700
@@ -148,6 +148,16 @@
     [AC_MSG_ERROR([Cannot find libglade])]
 )
 
+AC_PATH_PROG(TAGLIB_CONFIG, taglib-config, [no], [$PATH:$prefix/bin])
+if test "x$TAGLIB_CONFIG" = "xno" ; then
+AC_MSG_ERROR([Cannot find taglib])
+else
+    TAGLIB_CFLAGS=[`$TAGLIB_CONFIG --cflags`]
+    TAGLIB_LIBS=[`$TAGLIB_CONFIG --libs`]
+fi
+AC_SUBST(TAGLIB_CFLAGS)
+AC_SUBST(TAGLIB_LIBS)
+
 # Check if socklen_t is defined
 
 AC_CACHE_CHECK(for socklen_t, beep_cv_type_socklen_t,
@@ -474,16 +484,6 @@
     AC_CHECK_HEADERS(mpcdec/config_types.h,,
         enable_musepack=no
     )
-
-    AC_PATH_PROG(TAGLIB_CONFIG, taglib-config, [no], [$PATH:$prefix/bin])
-    if test "x$TAGLIB_CONFIG" = "xno" ; then
-	enable_musepack=no
-    else
-        TAGLIB_CFLAGS=[`$TAGLIB_CONFIG --cflags`]
-        TAGLIB_LIBS=[`$TAGLIB_CONFIG --libs`]
-    fi
-    AC_SUBST(TAGLIB_CFLAGS)
-    AC_SUBST(TAGLIB_LIBS)
 else
     AC_MSG_RESULT([*** Musepack plugin disabled per user request ***])
     enable_musepack=no