[vlc-devel] [PATCH] - Switch from HAVE_PROXY_H to HAVE_LIBPROXY

[Nicolas Chauvet (kwizart)]

---
 configure.ac          |    7 +++----
 modules/access/http.c |    4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 71ede65..1f7b0d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1634,10 +1634,9 @@ AC_ARG_ENABLE(libproxy,
   [  --enable-libproxy       libproxy support (default auto)])
 AS_IF([test "${enable_libproxy}" != "no"], [
   PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, [
-    AC_CHECK_HEADERS(proxy.h, [
-      VLC_ADD_CFLAGS([access_http],[$LIBPROXY_CFLAGS])
-      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"], [
       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..d7daf14 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
-- 
1.5.4.3