* Some leftover tcl stuff

svn: 701

autotools/configure.ac

@@ -123,7 +123,7 @@ AC_FUNC_STRFTIME
 
 #checkpoint
 AC_CACHE_SAVE
-AC_CHECK_FUNCS([clock dprintf fsync getdtablesize getrusage inet_aton isascii gethostbyname2])
+AC_CHECK_FUNCS([clock fsync getdtablesize getrusage inet_aton isascii gethostbyname2])
 AC_CHECK_FUNCS([getipnodebyname memcpy memset random rename setpgid sigaction sigemptyset snprintf srandom])
 #checkpoint
 AC_CACHE_SAVE
@@ -131,7 +131,9 @@ AC_CHECK_FUNCS([strcasecmp strncasecmp vsnprintf])
 
 #autoscan suggested this....
 #These are recommended by autoscan, but no code supports it currently
-#AC_CHECK_FUNCS([alarm bzero dup2 getcwd gethostbyaddr gethostbyname gethostname getpass gettimeofday inet_ntoa mbrlen mkdir munmap realpath select setlocale socket strchr strerror strpbrk strrchr strstr strtol tzset])
+#AC_CHECK_FUNCS([alarm bzero dup2 getcwd gethostbyaddr gethostbyname gethostname getpass gettimeofday inet_ntoa mbrlen
+#mkdir munmap realpath select setlocale socket strchr strerror strpbrk strrchr strstr strtol tzset])
+
 EGG_CHECK_FUNC_VSPRINTF
 EGG_CHECK_FUNC_UNAME
 

autotools/includes/acinclude.m4

@@ -354,8 +354,8 @@ else
   AC_CHECK_LIB(nsl, connect)
   AC_CHECK_LIB(dns, gethostbyname)
   AC_CHECK_LIB(z, gzopen, ZLIB="-lz")
-  AC_CHECK_LIB(ssl, SSL_accept, SSL="-lssl -lcrypto", SSL="", -lcrypto) 
-#  AC_CHECK_LIB(m, tan, EGG_MATH_LIB="-lm")
+#  AC_CHECK_LIB(ssl, SSL_accept, SSL="-lssl -lcrypto", SSL="", -lcrypto) 
+  AC_CHECK_LIB(ssl, SSL_accept, SSL="-lcrypto", SSL="", -lcrypto) 
   # This is needed for Tcl libraries compiled with thread support
 #  AC_CHECK_LIB(pthread, pthread_mutex_init, [dnl
 #  ac_cv_lib_pthread_pthread_mutex_init=yes

build

@@ -30,15 +30,13 @@ echo
 
 usage() 
 {
-    echo "Usage: $0 [-bcdn] [-t dir] [-T] [all|hub|leaf]"
+    echo "Usage: $0 [-bcdn] [all|hub|leaf]"
     echo
     echo "    The options are as follows:"
     echo "    -b        Use bzip2 instead of gzip when packaging."
     echo "    -c        Cleans up old binaries/files before compile."
     echo "    -d        Builds a debug package."
     echo "    -n        Do not package the binaries."
-    echo "    -t dir    Where to search for TCL libraries."
-    echo "    -T        Builds TCL if it is not on the system."
 }
 
 debug=0
@@ -47,20 +45,17 @@ hub=0
 leaf=0
 clean=0
 type=
-tcldir=
-buildtcl=0
 nopkg=0
 bzip=0
 
-while getopts t:bcdhnT opt ; do
+while getopts bcdhn opt ; do
         case "$opt" in
         b) bzip=1 ;;
 	c) clean=1 ;;
         d) debug=1 ;;
 	h) usage; exit 0 ;;
         n) nopkg=1 ;;
-	t) tcldir="$OPTARG" ;;
-	T) buildtcl=1 ;;
+#	t) tcldir="$OPTARG" ;;
         *) usage; exit 1 ;;
 
         esac
@@ -68,14 +63,6 @@ done
 
 shift $(($OPTIND - 1))
 
-if [ $buildtcl = "1" ]; then
- echo "Hold tight"
- misc/maketcl
- rm -rf tcl8.4.4*
- echo "Done. (You must run ./build again with normal parameters)"
- exit 0
-fi
-
 if test -z "$1"; then
  usage
  exit 1
@@ -129,14 +116,7 @@ echo "[*] Building ${PACKNAME}::${type} for $os"
 echo "[*] Configuring..."
 umask 077 >/dev/null
 
-if test -z "$tcldir"; then
-  echo "[*] Searching for TCL in default paths (use '-t dir' to change)"
-  ./configure --silent 
-else
-  echo "[*] Searching for TCL in: $tcldir"
-  ./configure --silent --with-tcllib=${tcldir}/lib/libtcl8.4.a --with-tclinc=${tcldir}/include/tcl.h
-fi
-
+./configure --silent
 
 MAKE="`which gmake`"
 if test -z "${MAKE}"; then

config.h.in

@@ -26,9 +26,6 @@
    */
 #undef HAVE_DIRENT_H
 
-/* Define to 1 if you have the `dprintf' function. */
-#undef HAVE_DPRINTF
-
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.14 .
+# From configure.ac Revision: 1.15 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -5184,6 +5184,7 @@ if test $ac_cv_lib_z_gzopen = yes; then
   ZLIB="-lz"
 fi
 
+#  AC_CHECK_LIB(ssl, SSL_accept, SSL="-lssl -lcrypto", SSL="", -lcrypto)
   echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
 echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
 if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then
@@ -5248,12 +5249,11 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_accept" >&5
 echo "${ECHO_T}$ac_cv_lib_ssl_SSL_accept" >&6
 if test $ac_cv_lib_ssl_SSL_accept = yes; then
-  SSL="-lssl -lcrypto"
+  SSL="-lcrypto"
 else
   SSL=""
 fi
 
-#  AC_CHECK_LIB(m, tan, EGG_MATH_LIB="-lm")
   # This is needed for Tcl libraries compiled with thread support
 #  AC_CHECK_LIB(pthread, pthread_mutex_init, [dnl
 #  ac_cv_lib_pthread_pthread_mutex_init=yes
@@ -11234,8 +11234,7 @@ rm -f confcache
 
 
 
-
-for ac_func in clock dprintf fsync getdtablesize getrusage inet_aton isascii gethostbyname2
+for ac_func in clock fsync getdtablesize getrusage inet_aton isascii gethostbyname2
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -11606,7 +11605,9 @@ done
 
 #autoscan suggested this....
 #These are recommended by autoscan, but no code supports it currently
-#AC_CHECK_FUNCS([alarm bzero dup2 getcwd gethostbyaddr gethostbyname gethostname getpass gettimeofday inet_ntoa mbrlen mkdir munmap realpath select setlocale socket strchr strerror strpbrk strrchr strstr strtol tzset])
+#AC_CHECK_FUNCS([alarm bzero dup2 getcwd gethostbyaddr gethostbyname gethostname getpass gettimeofday inet_ntoa mbrlen
+#mkdir munmap realpath select setlocale socket strchr strerror strpbrk strrchr strstr strtol tzset])
+
 
 for ac_func in vsprintf
 do

doc/INSTALL

@@ -1,47 +1,22 @@
 
 * The installation process has changed starting at version 1.0.11. 
-* The build currently requires a static TCL 8.0 or newer library. (TCL will be stripped soon)
-* All commands and directories/ are assumed to be located/ran in the wraith root dir. (TCL excluded)
+* All commands and directories/ are assumed to be located/ran in the wraith root dir.
 
-1. TCL
-2. Pack settings
-3. Compiling
-4. Making bots
+1. Pack settings
+2. Compiling
+3. Making bots
 
-Step 1: TCL
-
-If you have already made a static TCL build proceed to Step 2. If you are unsure then keep reading...
-From the main pack dir, just type: ./build -T
-If this fails, keep reading, otherwise, proceed to Step 2.
-The download website is at:
-	http://www.tcl.tk/software/tcltk/download84.html
-A nice direct link for the tarball is:
-	http://aleron.dl.sourceforge.net/sourceforge/tcl/tcl8.4.4-src.tar.gz
-Once you have it, untar -zxf tcl8.4.4-src.tar.gz
-Then, cd tcl8.4.4/unix
-./configure --disable-shared --prefix=/path/to/your/home --exec-prefix=/path/to/your/home
-Then: make; make install
-Make sure you edit pack/conf.h and change the path to TCL. (See Pack settings)
-
-Step 2: Pack settings
+Step 1: Pack settings
 
 The files listed here are all located in pack/, and will need to be saved for future compiles.
-If you have pack.cfg, conf.h, or salt.h, place them in pack/
-NOTE: salt.h, settings.c and conf.h (pack.conf) from versions previous to 1.0.11 are NOT compatable with 1.0.11 and higher.
+If you have pack.cff place it in pack/
 
-conf.h:
- This file contains pack compile-time options and the path to TCL
- If you have an older pack.conf, print it out and edit the template pack/conf.h and change accordingly.
-salt.h:
- This file is generated automatically, if you do not already have one, during compilation.
- If you have an older salt.h, do not use it.
 pack.cfg(.sample):
- This is the new and improved version of settings.c
  Simply edit it and change accordingly 
  Rename to pack.cfg when completed and make sure it is in pack/
 
 
-Step 3: Compiling
+Step 2: Compiling
 
 For leaf build: ./build leaf
 For hub build: ./build hub
@@ -54,7 +29,7 @@ After the compile process is finished, the binaries will be placed in wraith.OS.
  The OS and version are dynamic depending on the pack build, type 'ls' to find exact name.
 
 
-Step 4: Making bots
+Step 3: Making bots
 
 NOTE: conf files from versions older than 1.0.11 still work, but improvements have been made.
 

misc/maketcl

@@ -1,8 +0,0 @@
-#!/bin/sh
-wget http://aleron.dl.sourceforge.net/sourceforge/tcl/tcl8.4.4-src.tar.gz
-tar -zxf tcl8.4.4-src.tar.gz
-cd tcl8.4.4/
-cd unix/
-./configure --prefix=${HOME} --exec-prefix=${HOME} --disable-shared
-make && make install
-rm -rf tcl8.4.4*

src/dccutil.h

@@ -4,9 +4,7 @@
 #include "common.h"
 #include "dcc.h"
 
-#ifdef HAVE_DPRINTF
-#  define dprintf dprintf_eggdrop
-#endif
+#define dprintf dprintf_eggdrop
 
 /* Public structure for the listening port map */
 struct portmap {