Remove obsolete SOCKS related entries from configure.ac
These were probably never supported, and we shouldn't claim that we support SOCKS when we don't.
This commit is contained in:
parent
fbc0549540
commit
6f9fa5287f
2
README
2
README
@ -31,8 +31,6 @@ INSTALLATION
|
|||||||
|
|
||||||
--enable-debug If you would like to turn on full
|
--enable-debug If you would like to turn on full
|
||||||
debugging support
|
debugging support
|
||||||
--enable-socks This turns on SOCKS support for using
|
|
||||||
tinyproxy across a fire wall.
|
|
||||||
--enable-xtinyproxy Compile in support for the XTinyproxy
|
--enable-xtinyproxy Compile in support for the XTinyproxy
|
||||||
header, which is sent to any web
|
header, which is sent to any web
|
||||||
server in your domain.
|
server in your domain.
|
||||||
|
18
configure.ac
18
configure.ac
@ -112,11 +112,6 @@ TP_ARG_ENABLE(profiling,
|
|||||||
[Enable profiling information (default is NO)],
|
[Enable profiling information (default is NO)],
|
||||||
no)
|
no)
|
||||||
|
|
||||||
dnl Include SOCKS support
|
|
||||||
TP_ARG_ENABLE(socks,
|
|
||||||
[Enable SOCKS support (default is NO)],
|
|
||||||
no)
|
|
||||||
|
|
||||||
dnl Check to see if the XTinyproxy header is to be included
|
dnl Check to see if the XTinyproxy header is to be included
|
||||||
AH_TEMPLATE([XTINYPROXY_ENABLE],
|
AH_TEMPLATE([XTINYPROXY_ENABLE],
|
||||||
[Define if you want to have the peer's IP address included in a XTinyproxy header sent to the server.])
|
[Define if you want to have the peer's IP address included in a XTinyproxy header sent to the server.])
|
||||||
@ -209,7 +204,6 @@ if test x"$tinyproxy_no_nsl_checks" != x"yes"; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
AC_CHECK_LIB(resolv, inet_aton)
|
AC_CHECK_LIB(resolv, inet_aton)
|
||||||
AC_CHECK_LIB(socks, main, socks_library=yes, socks_library=no)
|
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Checks for headers
|
dnl Checks for headers
|
||||||
@ -232,8 +226,6 @@ case "$target" in
|
|||||||
*) AC_CHECK_HEADER(malloc.h);;
|
*) AC_CHECK_HEADER(malloc.h);;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
AC_CHECK_HEADER(socks.h, socks_header=yes, socks_header=no)
|
|
||||||
|
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Checks for types
|
dnl Checks for types
|
||||||
@ -303,16 +295,6 @@ dnl
|
|||||||
dnl Make sure we can actually handle the "--with-*" and "--enable-*" stuff.
|
dnl Make sure we can actually handle the "--with-*" and "--enable-*" stuff.
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
dnl Handle the SOCKS support
|
|
||||||
if test x"$socks_enabled" = x"yes"; then
|
|
||||||
if test x"$socks_header" = x"yes" -a x"$socks_library" = x"yes"; then
|
|
||||||
CFLAGS="-I/usr/include/sock.h -DSOCKS $CFLAGS"
|
|
||||||
LIBS="-lsocks $LIBS"
|
|
||||||
else
|
|
||||||
AC_MSG_ERROR([Could not include the SOCKS library or header])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl Handle the REGEX library
|
dnl Handle the REGEX library
|
||||||
if test x"$ac_cv_func_regexec" != x"yes"; then
|
if test x"$ac_cv_func_regexec" != x"yes"; then
|
||||||
AC_MSG_ERROR([Could not locate the regexec() function])
|
AC_MSG_ERROR([Could not locate the regexec() function])
|
||||||
|
Loading…
Reference in New Issue
Block a user