Browse Source

Revert "Use pkg-config to check for libcurl version"

This reverts commit 98387f94acd8c2d335727dd7a6fd900d292a58bf.

Broke generic building.
Con Kolivas 14 years ago
parent
commit
106d367b83
1 changed files with 2 additions and 4 deletions
  1. 2 4
      configure.ac

+ 2 - 4
configure.ac

@@ -124,10 +124,8 @@ AM_CONDITIONAL([HAS_YASM], [test x$has_yasm = xtrue])
 
 PKG_PROG_PKG_CONFIG()
 
-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)
+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.])],)
 
 dnl CCAN wants to know a lot of vars.
 # All the configuration checks.  Regrettably, the __attribute__ checks will