diff options
| author | TingPing <tingping@tingping.se> | 2014-12-28 13:57:36 -0500 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2014-12-28 22:29:06 -0500 |
| commit | 5beaf15f217e33e32a02eb84b4c40d7e514b06d7 (patch) | |
| tree | 92b271f6fe1ce7b10a3eb7f036ccae278efcc9f9 /configure.ac | |
| parent | 1b2bee37e43baca9b0ec58061561fdb60c31cef8 (diff) | |
Remove option to use socks5 library
This was always disabled by default and is not required for the current socks support. I am not even sure this library is packaged by any distro?
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index bbfa13b4..d93b2e04 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,6 @@ AH_VERBATIM([OLD_PERL],[#undef OLD_PERL]) AH_VERBATIM([PREFIX],[#undef PREFIX]) AH_VERBATIM([HEXCHATLIBDIR],[#undef HEXCHATLIBDIR]) AH_VERBATIM([HEXCHATSHAREDIR],[#undef HEXCHATSHAREDIR]) -AH_VERBATIM([SOCKS],[#undef SOCKS]) AH_VERBATIM([USE_LIBPROXY],[#undef USE_LIBPROXY]) AH_VERBATIM([HAVE_ISO_CODES],[#undef HAVE_ISO_CODES]) AH_VERBATIM([HAVE_GTK_MAC],[#undef HAVE_GTK_MAC]) @@ -83,10 +82,6 @@ dnl ********************************************************************* dnl ** configure switches *********************************************** dnl ********************************************************************* -AC_ARG_ENABLE(socks, - [AS_HELP_STRING([--enable-socks],[link with SOCKS5 library (default: no)])], - socks=$enableval, socks=no) - AC_ARG_ENABLE(openssl, [AS_HELP_STRING([--enable-openssl[=PATH]],[enable use of openSSL])], openssl=$enableval, openssl=yes) @@ -605,23 +600,6 @@ AM_CONDITIONAL(HAVE_ISO_CODES, test "x$isocodes" = "xyes") AM_CONDITIONAL(WITH_TM, test "x$theme_manager" != "xno") dnl ********************************************************************* -dnl ** SOCKS5 *********************************************************** -dnl ********************************************************************* - -if test "$socks" = yes; then - socks=no - AC_CHECK_LIB(socks5, SOCKSconnect, have_socks=yes) - if test "$have_socks" = yes; then - AC_CHECK_HEADERS(socks.h, have_socks_h=yes) - if test "$have_socks_h" = yes; then - socks=yes - AC_DEFINE(SOCKS) - LIBS="$LIBS -lsocks5" - fi - fi -fi - -dnl ********************************************************************* dnl ** GCC FLAGS ******************************************************** dnl ********************************************************************* |