Add support for libproxy via pkg-config

Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>

diff --git a/configure.ac b/configure.ac
index 495d2da44ec7959186d1c0f30859592da47a37a3..1f7b0d04e19a231d290ab7c0a183234a90dba4a3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1633,8 +1633,10 @@ dnl
 AC_ARG_ENABLE(libproxy,
   [  --enable-libproxy       libproxy support (default auto)])
 AS_IF([test "${enable_libproxy}" != "no"], [
-  AC_CHECK_HEADERS(proxy.h, [
-    VLC_ADD_LIBS([access_http],[-lproxy])
+  PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, [
+    AC_DEFINE(HAVE_LIBPROXY, 1, [Define if libproxy is available])
+    VLC_ADD_CFLAGS([access_http],[$LIBPROXY_CFLAGS])
+    VLC_ADD_LIBS([access_http],[$LIBPROXY_LIBS])
   ], [
     AS_IF([test "x${enable_libproxy}" != "x"], [
       AC_MSG_ERROR([libproxy could not be found on your system])

diff --git a/modules/access/http.c b/modules/access/http.c
index ac0d6fc9db26f825eb52d1347374d0f00a955bea..75bde96735fa418df4419173fef51fe42fd79de9 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -53,8 +53,8 @@
 
 #include <assert.h>
 
-#ifdef HAVE_PROXY_H
-#    include "proxy.h"
+#ifdef HAVE_LIBPROXY
+#    include <proxy.h>
 #endif
 /*****************************************************************************
  * Module descriptor
@@ -326,7 +326,7 @@ static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies )
         vlc_UrlParse( &p_sys->proxy, psz, 0 );
         free( psz );
     }
-#ifdef HAVE_PROXY_H
+#ifdef HAVE_LIBPROXY
     else
     {
         pxProxyFactory *pf = px_proxy_factory_new();