Skip to content

V
vlc
Commit 7f347265 authored by Nicolas Chauvet (kwizart)'s avatar Nicolas Chauvet (kwizart) Committed by Rémi Denis-Courmont
Browse files
Options

Add support for libproxy via pkg-config 

Signed-off-by: default avatarRémi Denis-Courmont <rdenis@simphalempin.com>
parent 37e7ad9a
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
configure.ac
View file @ 7f347265
...@@ -1633,8 +1633,10 @@ dnl ...@@ -1633,8 +1633,10 @@ dnl
AC_ARG_ENABLE(libproxy, AC_ARG_ENABLE(libproxy,
[ --enable-libproxy libproxy support (default auto)]) [ --enable-libproxy libproxy support (default auto)])
AS_IF([test "${enable_libproxy}" != "no"], [ AS_IF([test "${enable_libproxy}" != "no"], [
AC_CHECK_HEADERS(proxy.h, [ PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, [
VLC_ADD_LIBS([access_http],[-lproxy]) 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"], [ AS_IF([test "x${enable_libproxy}" != "x"], [
AC_MSG_ERROR([libproxy could not be found on your system]) AC_MSG_ERROR([libproxy could not be found on your system])
......
modules/access/http.c
View file @ 7f347265
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
#include <assert.h> #include <assert.h>
#ifdef HAVE_PROXY_H #ifdef HAVE_LIBPROXY
# include "proxy.h" # include <proxy.h>
#endif #endif
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
...@@ -326,7 +326,7 @@ static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies ) ...@@ -326,7 +326,7 @@ static int OpenWithCookies( vlc_object_t *p_this, vlc_array_t *cookies )
vlc_UrlParse( &p_sys->proxy, psz, 0 ); vlc_UrlParse( &p_sys->proxy, psz, 0 );
free( psz ); free( psz );
} }
#ifdef HAVE_PROXY_H #ifdef HAVE_LIBPROXY
else else
{ {
pxProxyFactory *pf = px_proxy_factory_new(); pxProxyFactory *pf = px_proxy_factory_new();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment