----x-Cut-Here-x----
diff -cr2 lily/Make.config lily.new/Make.config
*** lily/Make.config Wed Jan 4 00:20:08 1995
--- lily.new/Make.config Thu Jan 12 15:44:45 1995
***************
*** 52,55 ****
--- 52,84 ----
#
+ # Support for the SOCKS library.
+ #
+ # Useful if you are going to use the client to talk to a lily server
+ # on the other side of a firewall, and use the socks software to
+ # enable clients to connect thru the firewall.
+ #
+ # You may also need to add some lines to the socks.conf file on the
+ # server to "enable" connections to the lily port
+ #
+
+ # define the location of the SOCKS include directory.
+ # Leave this blank if you are not using SOCKS.
+ # SOCKS_INCLUDE = -I/usr/local/socks/include
+ SOCKS_INCLUDE=
+
+ # define the location of the SOCKS library.
+ # Leave this blank if you are not using SOCKS.
+ # SOCKS_LIB = -L/usr/local/socks/lib -lsocks -lresolv
+ SOCKS_LIB =
+
+ # The SOCKS defines to use socksified versions of the networking
+ # calls. Do not uncomment this define unless you wish to compile
+ # with the SOCKS library. If you uncomment, uncomment all 3 lines.
+ # SOCKS_DEFINES = -DSOCKS_CLIENT -Dconnect=Rconnect \
+ # -Dgetsockname=Rgetsockname -Dbind=Rbind \
+ # -Daccept=Raccept -Dlisten=Rlisten -Dselect=Rselect
+ SOCKS_DEFINES =
+
+ #
# These are _custom_ defines. Make them what you want them to be
#
***************
*** 99,117 ****
#
# This should also have -I/usr/include/bsd for Linux
! INCLUDES = -I. -I..
#
# Some systems might need to use terminfo or termcap and curses
# DYNIX needs a ton of libraries -lsocket -linet -lnsl -ltermcap -lrestrcmp
! #LIBS = -lsocket -linet -lnsl -lreadline -ltermcap -lrestrcmp
# SOLARIS also needs a fair number of LIBS. Uncomment the following line:
! LIBS = -lreadline -ltermcap -lrestrcmp -lsocket -lnsl
# Some systems (Linux) have a lib/libreadline.a from gnu in their system
# directories. If your compiler uses that one instead, replace the
# "-lreadline" with "./readline/libreadline.a" to force it to use the
# one with this package.
! #LIBS = ./readline/libreadline.a -ltermcap -lrestrcmp
#
# The default that should work for most people:
! #LIBS = -lreadline -ltermcap -lrestrcmp
# INTERNAL! Do not change these!
--- 128,146 ----
#
# This should also have -I/usr/include/bsd for Linux
! INCLUDES = -I. -I.. $(SOCKS_INCLUDE)
#
# Some systems might need to use terminfo or termcap and curses
# DYNIX needs a ton of libraries -lsocket -linet -lnsl -ltermcap -lrestrcmp
! #LIBS = -lsocket -linet -lnsl -lreadline -ltermcap -lrestrcmp $(SOCKS_LIB)
# SOLARIS also needs a fair number of LIBS. Uncomment the following line:
! LIBS = -lreadline -ltermcap -lrestrcmp -lsocket -lnsl $(SOCKS_LIB)
# Some systems (Linux) have a lib/libreadline.a from gnu in their system
# directories. If your compiler uses that one instead, replace the
# "-lreadline" with "./readline/libreadline.a" to force it to use the
# one with this package.
! #LIBS = ./readline/libreadline.a -ltermcap -lrestrcmp $(SOCKS_LIB)
#
# The default that should work for most people:
! #LIBS = -lreadline -ltermcap -lrestrcmp $(SOCKS_LIB)
# INTERNAL! Do not change these!
***************
*** 122,126 ****
LIBPATH = -L./readline -L./re_strcmp
! ALL_DEFINES = $(DEFINES) -DPAGE_DEFAULT=$(PAGE_DEFAULT_VAL) -DSNDCMD=\"$(SNDCMD)\" -DL_HOST=\"$(DEFAULT_HOST)\" -DDEFAULT_PORT=$(DEFAULT_PORT) -DIRC_TABBING=$(TABBING_TYPE) -DFIXED_PROMPT_DEF=$(FIXED_PROMPT_DEF) -DAUTOLOGIN_FILE=\"$(AUTOLOGIN_FILE)\" -DHAVE_CONFIG_H
.c.o:
--- 151,155 ----
LIBPATH = -L./readline -L./re_strcmp
! ALL_DEFINES = $(DEFINES) -DPAGE_DEFAULT=$(PAGE_DEFAULT_VAL) -DSNDCMD=\"$(SNDCMD)\" -DL_HOST=\"$(DEFAULT_HOST)\" -DDEFAULT_PORT=$(DEFAULT_PORT) -DIRC_TABBING=$(TABBING_TYPE) -DFIXED_PROMPT_DEF=$(FIXED_PROMPT_DEF) -DAUTOLOGIN_FILE=\"$(AUTOLOGIN_FILE)\" -DHAVE_CONFIG_H $(SOCKS_DEFINES)
.c.o:
diff -cr2 lily/lily.c lily.new/lily.c
*** lily/lily.c Wed Jan 4 11:20:07 1995
--- lily.new/lily.c Thu Jan 12 15:24:31 1995
***************
*** 453,456 ****
--- 453,460 ----
sig_setup(); /* install our special signal handlers */
+ #ifdef SOCKS_CLIENT
+ SOCKSinit(argv[0]);
+ #endif
+
set_compile_defaults();
set_autologin_defaults(NULL);