[vlc-devel] [PATCH] - Add support for libproxy via pkg-config
Nicolas Chauvet (kwizart)
kwizart at gmail.com
Fri Oct 24 16:15:35 CEST 2008
---
configure.ac | 6 ++++--
modules/access/http.c | 6 +++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 495d2da..1f7b0d0 100644
--- 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 ac0d6fc..75bde96 100644
--- 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();
--
1.5.4.3
More information about the vlc-devel
mailing list