* Removed more useless crap in the configure script :)

svn: 205

Makefile.in

@@ -1,6 +1,5 @@
 #
-#  This is the Makefile for EGGDROP (the IRC bot)
-#  You should never need to edit this.
+#		DO NOT EDIT THIS FILE 
 #
 
 SHELL = @SHELL@
@@ -11,34 +10,17 @@ VPATH = @srcdir@
 @SET_MAKE@
 prefix = @prefix@
 VERSION = @VERSION@
+NUMVER = @NUMVER@
+PACKNAME = @PACKNAME@
 LEAFEXEC = leaf
 HUBEXEC = hub
 DISTROFILES = config.h.in doc/ misc/ scripts/ ChangeLog Makefile.in build configure pack/ src/
 
-# things you can put here:
-#   -Wall            if you're using gcc and it supports it
-#                    (configure usually detects this anyway now)
-#
-#   -DDEBUG_ASSERT   to enable assert debugging
-#   -DDEBUG_MEM      to be able to debug memory allocation (.debug)
-#                    These can both be set by using 'make debug'
-#                    or 'make sdebug'
-CFLGS = 
-
-# configure SHOULD set these...you may need to tweak them to get modules
-# to compile .. if you do...let the devel-team know the working settings
-# btw to turn STRIP off, do 'STRIP = touch' not 'STRIP ='
-
 # defaults
 CC = @CC@
 LD = @CC@
 STRIP = @STRIP@
 
-# STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP #
-# - - - - - - - - do not edit anything below this line. - - - - - - - - #
-# - - - - - - - - -  it's all done by configure now.  - - - - - - - - - #
-# STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP #
-
 # stuff for Tcl
 XREQS = @TCL_REQS@
 XLIBS = @TCL_LIBS@ @LIBS@ @ZLIB@ @SSL@
@@ -47,16 +29,8 @@ TCLLIBFN = @TCLLIBFN@
 
 modconf = $(top_srcdir)/misc/modconfig --top_srcdir=$(top_srcdir)
 
-post_iconfig =  $(modconf) update-depends && \
-		$(modconf) Makefile && \
-		(cd src/mod && $(MAKE_CONFIG) config) && \
-		$(modconf) Makefile
-
-egg_install_msg =  echo "" && \
-		   echo "Now run \"make install\" to install your bot." && \
-		   echo ""
-
 DEBCFLAGS = -DDEBUG_ASSERT -DDEBUG_MEM
+CFLGS = 
 
 MAKE_LEAF = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
 'STRIP=$(STRIP)' 'CFLGS=$(CFLGS) -DLEAF' \

build

@@ -3,9 +3,9 @@
 
 # Awk out the version from source
 ver="?.?.?"
-ver=`cat src/main.c 2>&1 | grep "char" | awk '/egg_version/ {print $4}' | sed -e 's/\"//g' | sed -e 's/\;//g'`
-numver=`cat src/main.c 2>&1 | grep "int" | awk '/egg_numver =/ {print $4}' |  sed -e 's/\;//g'`
-PACKNAME=`cat pack/pack.cfg | grep "PACKNAME" | grep -v "PACKNAME:" | awk '/PACKNAME/ {print $2}'`
+ver=`grep "char" src/main.c | awk '/egg_version/ {print $4}' | sed -e 's/\"//g' | sed -e 's/\;//g'`
+numver=`grep "int" src/main.c | awk '/egg_numver =/ {print $4}' |  sed -e 's/\;//g'`
+PACKNAME=`grep "PACKNAME " pack/pack.cfg | awk '/PACKNAME/ {print $2}'`
 
 echo "*** wraith v${ver}/${numver} builder ***"
 
@@ -14,7 +14,7 @@ usage()
     echo "Usage: $0 [-d] [-c] type"
     echo "	-c	   - Cleans up old binaries/files before compile (default: off)"
     echo "	-d	   - Builds a debug package. (default: off)"
-    echo "	type	   - One of the following: all, leaf, hub. (default: all)"
+    echo "	type	   - One of the following: all, leaf, hub."
 }
 
 debug=0
@@ -69,8 +69,6 @@ if [ $all = "1" ]; then
  hub=1
 fi
 
-packname=${PACKNAME}
-
 ############# CHECK FOR pack/ FILES #################
 
 # Figure what bins we're making
@@ -97,7 +95,7 @@ umask 077 >/dev/null
 TCLDIR=`cat pack/conf.h 2>&1 | grep "//" | awk '/TCLDIR/ {print $2}' |  sed -e 's/\"//g'`
 if test -z ${TCLDIR}
 then
-  echo "[*] Searching for TCL in default dirs (edit $packname to change)"
+  echo "[*] Searching for TCL in default dirs (edit ${PACKNAME} to change)"
   ./configure --silent --disable-tcl-threads
 else
   echo "[*] Searching for TCL in: $TCLDIR"
@@ -148,7 +146,7 @@ fi
 
 # Wrap it nicely up into an archive
 echo "[*] Packaging..."
-packname=`basename $packname .cfg`
+
 if [ $all = "1" ]; then
  fls="leaf hub"
 elif [ $leaf = "1" ]; then
@@ -166,8 +164,8 @@ do
   mv -f $bin $bin.$os.$numver${d}
 done
 
-tar -zcf $packname.$os.$numver${d}.tgz *.$os.$numver${d}
-rm -f *.$os.$numver${d}
-echo "Binaries are now in '$packname.$os.$numver${d}.tgz'."
+tar -zcf ${PACKNAME}.$os.$numver${d}.tgz *.$os.$numver${d}
+rm -f *$os.$numver${d}
+echo "Binaries are now in '${PACKNAME}.$os.$numver${d}.tgz'."
 exit 0
 

config.h.in

@@ -89,10 +89,7 @@
 /* Define for Tcl that has Tcl_Free() (7.5p1 and later)  */
 #undef HAVE_TCL_FREE
 
-/* Define for Tcl that has threads  */
-#undef HAVE_TCL_THREADS
-
-/* Defines the current eggdrop version  */
+/* Defines the current pack version  */
 #undef EGG_VERSION
 
 /* The number of bytes in a int.  */