diff options
| author | bviktor <bviktor@outlook.com> | 2012-10-04 07:22:04 -0700 |
|---|---|---|
| committer | bviktor <bviktor@outlook.com> | 2012-10-04 07:22:04 -0700 |
| commit | 2ea1b492d5116d5fee363a1ce7df86f81d3b57ac (patch) | |
| tree | 9e3a6c7042a3effe7a89ba5788604542b7728a81 | |
| parent | 33e084029497741463d40bcf97073a1c3b78858c (diff) | |
| parent | 3f9c918b8688f0dfc85c61651e12b49091dfdf46 (diff) | |
Merge pull request #102 from Arnavion/allow-configure-libproxy
Allow user to enable or disable libproxy support explicitly
| -rw-r--r-- | configure.in | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 89484f98..76ff7e88 100644 --- a/configure.in +++ b/configure.in @@ -174,6 +174,11 @@ AC_ARG_ENABLE(ntlm, [ --enable-ntlm enable Microsoft's NTLM auth (libntlm) library support (default: no)], ntlm=$enableval, ntlm=no) +AC_ARG_ENABLE(libproxy, +[ --disable-libproxy disable libproxy support (default: auto)], + libproxy=$enableval, libproxy=auto) + + dnl ********************************************************************* dnl ** GLIB ************************************************************* dnl ********************************************************************* @@ -462,13 +467,20 @@ dnl ********************************************************************* dnl ** LIBPROXY ********************************************************* dnl ********************************************************************* -PKG_CHECK_MODULES([LIBPROXY], [libproxy-1.0], [libproxy=yes], [ +if test "x$libproxy" = "xyes" -o "x$libproxy" = "xauto" ; then + PKG_CHECK_MODULES([LIBPROXY], [libproxy-1.0], [ + COMMON_LIBS="$COMMON_LIBS $LIBPROXY_LIBS" + COMMON_CFLAGS="$COMMON_CFLAGS $LIBPROXY_CFLAGS" + AC_DEFINE(USE_LIBPROXY) + libproxy=yes + ], [ + if test "x$libproxy" = "xyes" ; then + AC_MSG_ERROR(Can't find libproxy!) + fi + libproxy=no + ]) +else libproxy=no -]) -if test "x$libproxy" = "xyes" ; then - COMMON_LIBS="$COMMON_LIBS $LIBPROXY_LIBS" - COMMON_CFLAGS="$COMMON_CFLAGS $LIBPROXY_CFLAGS" - AC_DEFINE(USE_LIBPROXY) fi dnl ********************************************************************* @@ -957,6 +969,7 @@ echo Plugin interface ...... : $plugin echo NLS/gettext ........... : $USE_NLS echo IPv6 support .......... : $ipv6 echo MS Proxy NTLM \(ISA\) ... : $have_ntlm +echo libproxy support ...... : $libproxy echo echo Perl .................. : $perl echo Python ................ : $python |