From 98387f94acd8c2d335727dd7a6fd900d292a58bf Mon Sep 17 00:00:00 2001 From: Diogo Franco Date: Thu, 28 Jul 2011 22:17:58 -0300 Subject: [PATCH] Use pkg-config to check for libcurl version Fixes autogen on OSX Lion, might fix for other platforms which don't ship those libcurl m4 macros. --- configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ee7d4d56..a380e2c7 100644 --- a/configure.ac +++ b/configure.ac @@ -124,8 +124,10 @@ AM_CONDITIONAL([HAS_YASM], [test x$has_yasm = xtrue]) PKG_PROG_PKG_CONFIG() -LIBCURL_CHECK_CONFIG(, 7.10.1, , [AC_MSG_ERROR([Missing required libcurl dev >= 7.10.1])]) -LIBCURL_CHECK_CONFIG(, 7.15.6, [AC_DEFINE([CURL_HAS_SOCKOPT], [1], [Defined if version of curl supports sockopts.])],) +PKG_CHECK_MODULES([LIBCURL], [libcurl >= 7.15.6], [AC_DEFINE([CURL_HAS_SOCKOPT], [1], [Defined if version of curl supports sockopts.])], +[PKG_CHECK_MODULES([LIBCURL], [libcurl >= 7.10.1], ,[AC_MSG_ERROR([Missing required libcurl dev >= 7.10.1])])]) +AC_SUBST(LIBCURL_CPPFLAGS) +AC_SUBST(LIBCURL_LIBS) dnl CCAN wants to know a lot of vars. # All the configuration checks. Regrettably, the __attribute__ checks will