# HG changeset patch # User nenolod # Date 1145848631 25200 # Node ID 0c5d8ffeba8821d24c56d2cfe8c2e7e4c62bd32b # Parent b082b5c7746174b01e615e0b2d197ed8aeaebed7 [svn] - sync configure.ac with stable diff -r b082b5c77461 -r 0c5d8ffeba88 configure.ac --- a/configure.ac Sun Apr 23 17:46:20 2006 -0700 +++ b/configure.ac Sun Apr 23 20:17:11 2006 -0700 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(audacious, 0.3) +AC_INIT(audacious, 1.0.0) AC_PREREQ(2.5) AC_CANONICAL_HOST @@ -765,26 +765,7 @@ AC_MSG_CHECKING([for curl >= $check]) -if eval curl-config --version 2>/dev/null >/dev/null; then - ver=`curl-config --version | sed -e "s/libcurl //g"` - hex_ver=`curl-config --vernum | tr 'a-f' 'A-F'` - ok=`echo "ibase=16; if($hex_ver>=$check_hex) $hex_ver else 0" | bc` - - if test x$ok != x0; then - my_cv_curl_vers="$ver" - AC_MSG_RESULT([$my_cv_curl_vers]) - CURL_LIBS=`curl-config --libs` - CURL_CFLAGS=`curl-config --cflags` - else - AC_MSG_RESULT([no]) - AC_MSG_WARN([$ver is too old. Need version $check or higher. Scrobbler support will not be built.]) - scrobbler="no" - fi -else - AC_MSG_RESULT([no]) - AC_MSG_WARN([curl-config was not found. Scrobbler support will not be built.]) - scrobbler="no" -fi +PKG_CHECK_MODULES(CURL, [libcurl >= 7.9.7], , [scrobbler="no"]) if test "x$scrobbler" = "xyes"; then GENERAL_PLUGINS="$GENERAL_PLUGINS scrobbler"