[vlc-devel] commit: Fix libproxy usage. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Aug 28 14:46:34 2009 +0200| [f7d796286d0479fb6c5a8f4ffa23e0e185ce0fc2] | committer: Jean-Baptiste Kempf 

Fix libproxy usage.

Partially revert 30f9eb499bf5e47a05e6652126fc9c4cbec34e11

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f7d796286d0479fb6c5a8f4ffa23e0e185ce0fc2
---

 configure.ac |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 748bb21..8ce3e6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1736,7 +1736,19 @@ AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"])
 dnl
 dnl libproxy support
 dnl
-PKG_ENABLE_MODULES_VLC([LIBPROXY], [], [libproxy-1.0], [libproxy support], [auto])
+AC_ARG_ENABLE(libproxy,
+  [  --enable-libproxy       libproxy support (default auto)])
+AS_IF([test "${enable_libproxy}" != "no"], [
+  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])
+    ])
+  ])
+])
 
 
 dnl