- AIX patch from Matt Richards <v2matt@btv.ibm.com> and David Rankin

   <drankin@bohemians.lexington.ky.us>

1 files changed, 42 insertions, 2 deletions

diff --git a/configure.in b/configure.in
index 4d414573f..6f5cdafc7 100644
--- a/configure.in
+++ b/configure.in
@@ -518,13 +518,53 @@ dnl Compile with dante SOCKS library
 AC_ARG_WITH(dante,
         [  --with-dante=DIR        Use Dante SOCKS lib (default is system library path)],
         [
-                AC_DEFINE(HAVE_DANTE)
+                SAVELIBS="$LIBS"
+                SOCKSLIBS=""
+                SOCKSLIBPATH=""
                 if test "x$withval" != "xno" ; then
                         if test -n $withval ; then
                                 LIBS="$LIBS -L$withval"
+                                SOCKSLIBPATH="-L$withval"
                         fi
-                        LIBS="$LIBS -lsocks"
+                        AC_CHECK_LIB(socks, Rconnect, AC_DEFINE(HAVE_DANTE) SOCKSLIBS="$SOCKSLIBPATH -lsocks")
                 fi
+                LIBS="$SAVELIBS $SOCKSLIBS"
+        ]
+)
+
+dnl Compile with SOCKS4 SOCKS library
+AC_ARG_WITH(socks4,
+        [  --with-socks4=DIR        Use Socks4 SOCKS lib (default is system library path)],
+        [
+                SAVELIBS="$LIBS"
+                SOCKSLIBS=""
+                SOCKSLIBPATH=""
+                if test "x$withval" != "xno" ; then
+                        if test -n $withval ; then
+                                LIBS="$LIBS -L$withval"
+                                SOCKSLIBPATH="-L$withval"
+                        fi
+                        AC_CHECK_LIB(socks, Rconnect, AC_DEFINE(HAVE_SOCKS4) SOCKSLIBS="$SOCKSLIBPATH -lsocks")
+                fi
+                LIBS="$SAVELIBS $SOCKSLIBS"
+        ]
+)
+
+dnl Compile with SOCKS5 SOCKS library
+AC_ARG_WITH(socks5,
+        [  --with-socks5=DIR        Use Socks5 SOCKS lib (default is system library path)],
+        [
+                SAVELIBS="$LIBS"
+                SOCKSLIBS=""
+                SOCKSLIBPATH=""
+                if test "x$withval" != "xno" ; then
+                        if test -n $withval ; then
+                                LIBS="$LIBS -L$withval"
+                                SOCKSLIBPATH="-L$withval"
+                        fi
+                        AC_CHECK_LIB(socks5, SOCKSconnect, AC_DEFINE(HAVE_SOCKS5) SOCKSLIBS="$SOCKSLIBPATH -lsocks5")
+                fi
+                LIBS="$SAVELIBS $SOCKSLIBS"
         ]
 )
 AC_ARG_WITH(catman,