Browse Source

Hot-patch broken libcurl pkgconfig CFLAGS found in libcurl's Windows binaries

Luke Dashjr 13 years ago
parent
commit
9bbe96eb3c
1 changed files with 4 additions and 0 deletions
  1. 4 0
      configure.ac

+ 4 - 0
configure.ac

@@ -361,6 +361,10 @@ 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.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])])])
 [PKG_CHECK_MODULES([LIBCURL], [libcurl >= 7.10.1], ,[AC_MSG_ERROR([Missing required libcurl dev >= 7.10.1])])])
+if echo "$LIBCURL_CFLAGS" | grep '@CPPFLAG_CURL_STATICLIB@' >/dev/null 2>&1; then
+	AC_MSG_WARN([Your libcurl pkgconfig file is broken, applying workaround])
+	LIBCURL_CFLAGS=`echo "$LIBCURL_CFLAGS" | sed 's/@CPPFLAG_CURL_STATICLIB@//'`
+fi
 AC_SUBST(LIBCURL_LIBS)
 AC_SUBST(LIBCURL_LIBS)
 
 
 dnl CCAN wants to know a lot of vars.
 dnl CCAN wants to know a lot of vars.