[eggheads-patches] PATCH: va-fixes.diff

Tothwolf tothwolf at concentric.net
Sat Oct 16 19:05:51 CST 1999


va-fixes.diff:
  Fixed varargs.h/stdarg.h va_* macro problem for non-ansi compilers
  More informative message if $(EGGEXEC) does not exist for 'make install'
  Pass $(CPPFLAGS) along with $(CFLAGS) in Makefiles
  README file should be installed from install-doc ruleset
  Cleanup of Makefile dependency rules
  Use 'installbsd' for $(INSTALL) on OSF1
  
-Toth
-------------- next part --------------
diff -urNPX ../exclude ../eggdrop1.3.cvs/Makefile.in ./Makefile.in
--- ../eggdrop1.3.cvs/Makefile.in	Sat Oct 16 12:07:04 1999
+++ ./Makefile.in	Sat Oct 16 14:08:36 1999
@@ -57,30 +57,30 @@
 @SET_MAKE@
 
 MAKE_STATIC = $(MAKE) 'CC=$(CC)' 'LD=$(LD)' 'STRIP=$(STRIP)' \
-'RANLIB=$(RANLIB)' 'CFLAGS=$(CFLAGS) -DSTATIC' \
+'RANLIB=$(RANLIB)' 'CFLAGS=$(CFLAGS) -DSTATIC' 'CPPFLAGS=$(CPPFLAGS)' \
 'EGGEXEC=$(EGGEXEC)' 'TCLLIB=$(TCLLIB)' \
 'XREQ=$(XREQ)' 'XLIBS=@TCL_LIBS@ @LIBS@'
 
 MAKE_MODEGG = $(MAKE) 'CC=$(MOD_CC)' 'LD=$(MOD_LD)' 'STRIP=$(MOD_STRIP)' \
-'RANLIB=$(RANLIB)' 'CFLAGS=$(CFLAGS)' \
+'RANLIB=$(RANLIB)' 'CFLAGS=$(CFLAGS)' 'CPPFLAGS=$(CPPFLAGS)' \
 'EGGEXEC=$(EGGEXEC)' 'TCLLIB=$(TCLLIB)' \
 'XREQ=$(XREQ)' 'XLIBS=@TCL_LIBS@ @LIBS@'
 
 MAKE_MODULES = $(MAKE) 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
-'STRIP=$(SHLIB_STRIP)' 'CFLAGS=$(CFLAGS)'
+'STRIP=$(SHLIB_STRIP)' 'CFLAGS=$(CFLAGS)' 'CPPFLAGS=$(CPPFLAGS)'
 
 MAKE_SDEBUG = $(MAKE) 'CC=$(CC)' 'LD=$(LD)' 'STRIP=touch' \
 'RANLIB=$(RANLIB)' 'CFLAGS=-g3 $(CFLAGS) -DSTATIC -DEBUG_MEM' \
-'EGGEXEC=$(EGGEXEC)' 'TCLLIB=$(TCLLIB)' \
+'CPPFLAGS=$(CPPFLAGS)' 'EGGEXEC=$(EGGEXEC)' 'TCLLIB=$(TCLLIB)' \
 'XREQ=$(XREQ)' 'XLIBS=@TCL_LIBS@ @LIBS@'
 
 MAKE_MEMEGG = $(MAKE) 'CC=$(MOD_CC)' 'LD=$(MOD_LD)' 'STRIP=touch' \
 'RANLIB=$(RANLIB)' 'CFLAGS=-g3 $(CFLAGS) -DEBUG_MEM' \
-'EGGEXEC=$(EGGEXEC)' 'TCLLIB=$(TCLLIB)' \
+'CPPFLAGS=$(CPPFLAGS)' 'EGGEXEC=$(EGGEXEC)' 'TCLLIB=$(TCLLIB)' \
 'XREQ=$(XREQ)' 'XLIBS=@TCL_LIBS@ @LIBS@'
 
 MAKE_DEBMODULES = $(MAKE) 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
-'STRIP=touch' 'CFLAGS=-g3 $(CFLAGS) -DEBUG_MEM'
+'STRIP=touch' 'CFLAGS=-g3 $(CFLAGS) -DEBUG_MEM' 'CPPFLAGS=$(CPPFLAGS)'
 
 MAKE_INSTALL = $(MAKE) 'DEST=$(DEST)'
 
@@ -189,12 +189,18 @@
 sinstall: static ainstall
 
 ainstall: install-start install-bin install-modules install-data \
-	install-help install-language install-filesys install-doc \
-	install-scripts install-end
+install-help install-language install-filesys install-doc \
+install-scripts install-end
 
 install-start:
 	@if test ! -f $(EGGEXEC); then \
+		echo ""; \
 		echo "You haven't compiled eggdrop yet."; \
+		echo "To compile eggdrop use:"; \
+		echo "  make <target>"; \
+		echo ""; \
+		echo "  valid targets: eggdrop static debug sdebug"; \
+		echo ""; \
 		exit 1; \
 	fi
 	@if test "x$(DEST)" = "x"; then \
@@ -250,7 +256,6 @@
 	fi
 
 install-data:
-	@$(INSTALL_DATA) README $(DEST)
 	@$(INSTALL_DATA) eggdrop.conf.dist $(DEST)
 	@if test ! -f $(DEST)/motd; then \
 		$(INSTALL_DATA) motd $(DEST); \
@@ -311,6 +316,7 @@
 	fi
 
 install-doc:
+	@$(INSTALL_DATA) README $(DEST)
 	@cd doc/; $(MAKE_INSTALL) install
 
 install-scripts:
diff -urNPX ../exclude ../eggdrop1.3.cvs/configure ./configure
--- ../eggdrop1.3.cvs/configure	Sat Oct 16 12:07:05 1999
+++ ./configure	Sat Oct 16 13:38:30 1999
@@ -1411,6 +1411,10 @@
 	then
           AWK="awk"
 	fi
+	if test "x$INSTALL" = "x./install-sh"
+	then
+	  INSTALL="installbsd"
+	fi
 	MOD_CC="cc"
 	MOD_LD="cc"
 	SHLIB_CC="cc"
@@ -1509,7 +1513,7 @@
   echo "configure: warning: Skipping library tests because they CONFUSE Irix." 1>&2
 else
   echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:1513: checking for socket in -lsocket" >&5
+echo "configure:1517: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1517,7 +1521,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1521 "configure"
+#line 1525 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1528,7 +1532,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:1532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1556,7 +1560,7 @@
 fi
 
   echo $ac_n "checking for connect in -lnsl""... $ac_c" 1>&6
-echo "configure:1560: checking for connect in -lnsl" >&5
+echo "configure:1564: checking for connect in -lnsl" >&5
 ac_lib_var=`echo nsl'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1564,7 +1568,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1568 "configure"
+#line 1572 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1575,7 +1579,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:1579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1603,7 +1607,7 @@
 fi
 
   echo $ac_n "checking for gethostbyname in -ldns""... $ac_c" 1>&6
-echo "configure:1607: checking for gethostbyname in -ldns" >&5
+echo "configure:1611: checking for gethostbyname in -ldns" >&5
 ac_lib_var=`echo dns'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1611,7 +1615,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldns  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1615 "configure"
+#line 1619 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1622,7 +1626,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:1626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1650,7 +1654,7 @@
 fi
 
   echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:1654: checking for dlopen in -ldl" >&5
+echo "configure:1658: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1658,7 +1662,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1662 "configure"
+#line 1666 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1669,7 +1673,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:1673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1699,7 +1703,7 @@
   if test "$SUNOS" = "yes"
   then
         echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
-echo "configure:1703: checking for main in -ldl" >&5
+echo "configure:1707: checking for main in -ldl" >&5
 ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1707,14 +1711,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1711 "configure"
+#line 1715 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1745,7 +1749,7 @@
     if test "$HPUX" = "yes"
     then
       echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:1749: checking for shl_load in -ldld" >&5
+echo "configure:1753: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1753,7 +1757,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1757 "configure"
+#line 1761 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1764,7 +1768,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:1768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1800,12 +1804,12 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:1804: checking for $ac_hdr that defines DIR" >&5
+echo "configure:1808: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1809 "configure"
+#line 1813 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -1813,7 +1817,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:1817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -1838,7 +1842,7 @@
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:1842: checking for opendir in -ldir" >&5
+echo "configure:1846: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1846,7 +1850,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1850 "configure"
+#line 1854 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1857,7 +1861,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:1861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1879,7 +1883,7 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:1883: checking for opendir in -lx" >&5
+echo "configure:1887: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1887,7 +1891,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1891 "configure"
+#line 1895 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1898,7 +1902,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:1902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1921,12 +1925,12 @@
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:1925: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:1929: checking for sys/wait.h that is POSIX.1 compatible" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1930 "configure"
+#line 1934 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -1942,7 +1946,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:1946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -1966,17 +1970,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1970: checking for $ac_hdr" >&5
+echo "configure:1974: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1975 "configure"
+#line 1979 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2003,12 +2007,12 @@
 done
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2007: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2011: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2012 "configure"
+#line 2016 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -2017,7 +2021,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:2021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -2037,21 +2041,21 @@
 
 fi
 
-for ac_hdr in sys/select.h sys/rusage.h unistd.h dlfcn.h stdarg.h std_args.h
+for ac_hdr in sys/select.h sys/rusage.h unistd.h dlfcn.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2045: checking for $ac_hdr" >&5
+echo "configure:2049: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2050 "configure"
+#line 2054 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2079,12 +2083,12 @@
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2083: checking for ANSI C header files" >&5
+echo "configure:2087: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2088 "configure"
+#line 2092 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2092,7 +2096,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2109,7 +2113,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2113 "configure"
+#line 2117 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2127,7 +2131,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2131 "configure"
+#line 2135 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2148,7 +2152,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2152 "configure"
+#line 2156 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2159,7 +2163,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:2163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2183,12 +2187,12 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:2187: checking for pid_t" >&5
+echo "configure:2191: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2192 "configure"
+#line 2196 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2216,14 +2220,14 @@
 fi
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:2220: checking whether byte ordering is bigendian" >&5
+echo "configure:2224: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 2227 "configure"
+#line 2231 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -2234,11 +2238,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:2238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 2242 "configure"
+#line 2246 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -2249,7 +2253,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:2253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -2269,7 +2273,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 2273 "configure"
+#line 2277 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -2282,7 +2286,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:2286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
 else
@@ -2306,21 +2310,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2310: checking for inline" >&5
+echo "configure:2314: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2317 "configure"
+#line 2321 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:2324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2346,7 +2350,7 @@
 esac
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:2350: checking size of long" >&5
+echo "configure:2354: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2354,7 +2358,7 @@
   ac_cv_sizeof_long=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 2358 "configure"
+#line 2362 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2365,7 +2369,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:2369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -2385,7 +2389,7 @@
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:2389: checking size of int" >&5
+echo "configure:2393: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2393,7 +2397,7 @@
   ac_cv_sizeof_int=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 2397 "configure"
+#line 2401 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -2404,7 +2408,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:2408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -2427,12 +2431,12 @@
 for ac_func in rename getrusage getdtablesize srandom random sigaction
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2431: checking for $ac_func" >&5
+echo "configure:2435: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2436 "configure"
+#line 2440 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2455,7 +2459,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2482,12 +2486,12 @@
 for ac_func in sigemptyset vsprintf strcasecmp setpgid clock dlopen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2486: checking for $ac_func" >&5
+echo "configure:2490: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2491 "configure"
+#line 2495 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2510,7 +2514,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2537,12 +2541,12 @@
 for ac_func in dprintf bzero uname vsnprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2541: checking for $ac_func" >&5
+echo "configure:2545: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2546 "configure"
+#line 2550 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2565,7 +2569,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2615,12 +2619,12 @@
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:2619: checking for Cygwin environment" >&5
+echo "configure:2623: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2624 "configure"
+#line 2628 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2631,7 +2635,7 @@
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:2635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -2656,19 +2660,19 @@
 fi
 
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:2660: checking for mingw32 environment" >&5
+echo "configure:2664: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2665 "configure"
+#line 2669 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:2672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -2687,7 +2691,7 @@
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:2691: checking for executable suffix" >&5
+echo "configure:2695: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2697,7 +2701,7 @@
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:2701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:2705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -2723,7 +2727,7 @@
 fi
 
 echo $ac_n "checking space left in file database struct""... $ac_c" 1>&6
-echo "configure:2727: checking space left in file database struct" >&5
+echo "configure:2731: checking space left in file database struct" >&5
 
 cat > abacab.c << 'EOF'
 #include <stdio.h>
@@ -2960,7 +2964,7 @@
 fi
 
 echo $ac_n "checking for Tcl library""... $ac_c" 1>&6
-echo "configure:2964: checking for Tcl library" >&5
+echo "configure:2968: checking for Tcl library" >&5
 
 # attempt autodetect for $TCLLIBFN if it's not set
 if test ! "x${TCLLIBFN}" = "x"
@@ -2994,7 +2998,7 @@
 fi
 
 echo $ac_n "checking for Tcl header""... $ac_c" 1>&6
-echo "configure:2998: checking for Tcl header" >&5
+echo "configure:3002: checking for Tcl header" >&5
 
 # attempt autodetect for $TCLINCFN if it's not set
 if test ! "x${TCLINCFN}" = "x"
@@ -3070,7 +3074,7 @@
 
     # check Tcl version
     echo $ac_n "checking for Tcl version""... $ac_c" 1>&6
-echo "configure:3074: checking for Tcl version" >&5
+echo "configure:3078: checking for Tcl version" >&5
     TCLVER=`grep TCL_VERSION $TCLINC/$TCLINCFN | $AWK '{gsub(/\"/, "", $3); print $3}' | head -1`
     if test ! "x${TCLVER}" = "x"
     then
@@ -3093,7 +3097,7 @@
       if test "x${BUGGY_TCL}" = "xyes"
       then
 	echo $ac_n "checking for buggy Tcl 8.1 threads""... $ac_c" 1>&6
-echo "configure:3097: checking for buggy Tcl 8.1 threads" >&5
+echo "configure:3101: checking for buggy Tcl 8.1 threads" >&5
 	if test -f "$TCLLIB/$tclconfigfile"
 	then
 	  HASTHREADS=`grep 'TCL_DEFS' $TCLLIB/$tclconfigfile | grep 'TCL_THREADS=1' | wc -l`
diff -urNPX ../exclude ../eggdrop1.3.cvs/configure.in ./configure.in
--- ../eggdrop1.3.cvs/configure.in	Sat Oct 16 12:07:05 1999
+++ ./configure.in	Sat Oct 16 13:51:38 1999
@@ -184,6 +184,10 @@
 	then
           AWK="awk"
 	fi
+	if test "x$INSTALL" = "x./install-sh"
+	then
+	  INSTALL="installbsd"
+	fi
 	MOD_CC="cc"
 	MOD_LD="cc"
 	SHLIB_CC="cc"
diff -urNPX ../exclude ../eggdrop1.3.cvs/doc/Makefile.in ./doc/Makefile.in
--- ../eggdrop1.3.cvs/doc/Makefile.in	Sat Oct 16 12:07:05 1999
+++ ./doc/Makefile.in	Sat Oct 16 13:57:17 1999
@@ -8,9 +8,9 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 DOCS = BOTNET BUG-REPORT CONTENTS KNOWN-PROBLEMS \
-	MODULES Ode_To_Beldin UPDATES.pre1.3 UPDATES1.3 \
-	compiling.FAQ eggdrop.doc patch.howto \
-	tcl-commands.doc tricks
+MODULES Ode_To_Beldin UPDATES.pre1.3 UPDATES1.3 \
+compiling.FAQ eggdrop.doc patch.howto \
+tcl-commands.doc tricks
 
 MAN1 = man1/eggdrop.1
 
diff -urNPX ../exclude ../eggdrop1.3.cvs/scripts/Makefile.in ./scripts/Makefile.in
--- ../eggdrop1.3.cvs/scripts/Makefile.in	Sat Oct 16 12:07:05 1999
+++ ./scripts/Makefile.in	Sat Oct 16 13:57:32 1999
@@ -8,7 +8,7 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 SCRIPTS = action.fix.tcl alltools.tcl compat.tcl getops-2.2d.tcl \
-	klined.tcl notes2.tcl ques5.tcl sentinel1.54.tcl userinfo1.0.tcl
+klined.tcl notes2.tcl ques5.tcl sentinel1.54.tcl userinfo1.0.tcl
 
 EXESCRIPTS = autobotchk botchk weed
 
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/Makefile.in ./src/Makefile.in
--- ../eggdrop1.3.cvs/src/Makefile.in	Sat Oct 16 12:07:05 1999
+++ ./src/Makefile.in	Sat Oct 16 13:56:36 1999
@@ -8,9 +8,9 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 OBJS = botcmd.o botmsg.o botnet.o chanprog.o cmds.o dcc.o \
-	dccutil.o flags.o language.o main.o mem.o misc.o \
-	modules.o net.o rfc1459.o tcl.o tcldcc.o tclhash.o \
-	tclmisc.o tcluser.o userent.o userrec.o users.o md5/md5c.o
+dccutil.o flags.o language.o main.o mem.o misc.o \
+modules.o net.o rfc1459.o tcl.o tcldcc.o tclhash.o \
+tclmisc.o tcluser.o userent.o userrec.o users.o md5/md5c.o
 
 doofus:
 	@echo ""
@@ -61,13 +61,13 @@
 
 main.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) \
-	'-DCCFLAGS="$(CC) $(CFLAGS) $(CPPFLAGS)"' \
-	'-DLDFLAGS="$(LD)"' \
-	'-DSTRIPFLAGS="$(STRIP)"' -c main.c
+'-DCCFLAGS="$(CC) $(CFLAGS) $(CPPFLAGS)"' \
+'-DLDFLAGS="$(LD)"' \
+'-DSTRIPFLAGS="$(STRIP)"' -c main.c
 
 md5/md5c.o:
 	@cd md5; $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
-	'STRIP=$(STRIP)' 'CFLAGS=$(CFLAGS)' md5
+'STRIP=$(STRIP)' 'CFLAGS=$(CFLAGS)' 'CPPFLAGS=$(CPPFLAGS)' md5
 	@echo "---------- Yeah! that's the compiling, now the linking! ----------"
 
 libtcle.a: $(TCLLIB)/lib$(TCLLIBFN)
@@ -111,7 +111,7 @@
 userrec.o: chan.h main.h modules.h tandem.h users.h
 users.o: chan.h main.h modules.h tandem.h users.h
 main.h: ../config.h chan.h cmdt.h eggdrop.h flags.h lang.h \
-	 proto.h tclegg.h tclhash.h users.h
+proto.h tclegg.h tclhash.h users.h
 modules.h: mod/modvals.h
 proto.h: ../lush.h
 tclegg.h: ../lush.h proto.h
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/main.h ./src/main.h
--- ../eggdrop1.3.cvs/src/main.h	Fri Oct 15 11:31:03 1999
+++ ./src/main.h	Sat Oct 16 13:32:56 1999
@@ -10,8 +10,7 @@
 #endif
 
 /* UGH! Why couldn't Tcl pick a standard? */
-#if !defined(HAVE_OLD_TCL) && (defined(__STDC__) || \
-    (defined(HAVE_STDARG_H) || defined(HAVE_STD_ARGS_H)))
+#if !defined(HAVE_OLD_TCL) && defined(__STDC__)
 #  ifdef HAVE_STDARG_H
 #    include <stdarg.h>
 #  else
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mem.c ./src/mem.c
--- ../eggdrop1.3.cvs/src/mem.c	Fri Oct 15 11:31:03 1999
+++ ./src/mem.c	Sat Oct 16 13:32:58 1999
@@ -51,8 +51,7 @@
 #define DP_HELP         0x7FF4
 
 /* prototypes */
-#if !defined(HAVE_OLD_TCL) && (defined(__STDC__) || \
-    (defined(HAVE_STDARG_H) || defined(HAVE_STD_ARGS_H)))
+#if !defined(HAVE_OLD_TCL) && defined(__STDC__)
 void dprintf(int arg1, ...);
 void putlog(int arg1, ...);
 #else
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/Makefile.in ./src/mod/Makefile.in
--- ../eggdrop1.3.cvs/src/mod/Makefile.in	Sat Oct 16 12:07:06 1999
+++ ./src/mod/Makefile.in	Sat Oct 16 12:30:09 1999
@@ -8,7 +8,7 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 MAKE_MOD = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
-'STRIP=$(STRIP)' 'CFLAGS=$(CFLAGS)' 
+'STRIP=$(STRIP)' 'CFLAGS=$(CFLAGS)' 'CPPFLAGS=$(CPPFLAGS)'
 
 doofus:
 	@echo ""
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/assoc.mod/Makefile ./src/mod/assoc.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/assoc.mod/Makefile	Fri Oct 15 11:31:03 1999
+++ ./src/mod/assoc.mod/Makefile	Sat Oct 16 13:58:02 1999
@@ -17,9 +17,8 @@
 	$(LD) -o ../../../assoc.so assoc.o
 	$(STRIP) ../../../assoc.so
 
-assoc.o: ../module.h ../modvals.h ../../eggdrop.h \
-	../../tandem.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c assoc.c
+assoc.o: ../module.h ../modvals.h ../../eggdrop.h ../../tandem.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c assoc.c
 
 ../assoc.o: assoc.o
 	@rm -f ../assoc.o
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/blowfish.mod/Makefile ./src/mod/blowfish.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/blowfish.mod/Makefile	Fri Oct 15 11:31:03 1999
+++ ./src/mod/blowfish.mod/Makefile	Sat Oct 16 13:59:54 1999
@@ -17,9 +17,8 @@
 	$(LD) -o ../../../blowfish.so blowfish.o
 	$(STRIP) ../../../blowfish.so
 
-blowfish.o: ../module.h ../modvals.h ../../eggdrop.h \
-	bf_tab.h blowfish.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c blowfish.c
+blowfish.o: ../module.h ../modvals.h ../../eggdrop.h bf_tab.h blowfish.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c blowfish.c
 
 ../blowfish.o: blowfish.o
 	@rm -f ../blowfish.o
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/channels.mod/Makefile ./src/mod/channels.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/channels.mod/Makefile	Fri Oct 15 11:31:03 1999
+++ ./src/mod/channels.mod/Makefile	Sat Oct 16 13:58:58 1999
@@ -17,9 +17,9 @@
 	$(LD) -o ../../../channels.so channels.o
 	$(STRIP) ../../../channels.so
 
-channels.o: ../module.h ../modvals.h ../../eggdrop.h \
-	cmdschan.c tclchan.c userchan.c channels.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c channels.c
+channels.o: ../module.h ../modvals.h ../../eggdrop.h cmdschan.c tclchan.c \
+userchan.c channels.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c channels.c
 
 ../channels.o: channels.o
 	@rm -f ../channels.o
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/console.mod/Makefile ./src/mod/console.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/console.mod/Makefile	Fri Oct 15 11:31:03 1999
+++ ./src/mod/console.mod/Makefile	Sat Oct 16 12:31:02 1999
@@ -18,7 +18,7 @@
 	$(STRIP) ../../../console.so
 
 console.o: ../module.h ../modvals.h ../../eggdrop.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c console.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c console.c
 
 ../console.o: console.o
 	@rm -f ../console.o
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/ctcp.mod/Makefile ./src/mod/ctcp.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/ctcp.mod/Makefile	Fri Oct 15 11:31:03 1999
+++ ./src/mod/ctcp.mod/Makefile	Sat Oct 16 13:58:51 1999
@@ -17,9 +17,9 @@
 	$(LD) -o ../../../ctcp.so ctcp.o
 	$(STRIP) ../../../ctcp.so
 
-ctcp.o: ../module.h ../modvals.h ../../eggdrop.h \
-	ctcp.h ../server.mod/server.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c ctcp.c
+ctcp.o: ../module.h ../modvals.h ../../eggdrop.h ctcp.h \
+../server.mod/server.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c ctcp.c
 
 ../ctcp.o: ctcp.o
 	@rm -f ../ctcp.o
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/filesys.mod/Makefile ./src/mod/filesys.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/filesys.mod/Makefile	Fri Oct 15 11:23:25 1999
+++ ./src/mod/filesys.mod/Makefile	Sat Oct 16 13:59:49 1999
@@ -17,10 +17,10 @@
 	$(LD) -o ../../../filesys.so filesys.o
 	$(STRIP) ../../../filesys.so
 
-filesys.o: ../module.h ../modvals.h ../../eggdrop.h \
-	filedb.c files.c tclfiles.c files.h filesys.h \
-	../../lang.h ../../tandem.h ../transfer.mod/transfer.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c filesys.c
+filesys.o: ../module.h ../modvals.h ../../eggdrop.h filedb.c files.c \
+tclfiles.c files.h filesys.h ../../lang.h ../../tandem.h \
+../transfer.mod/transfer.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c filesys.c
 
 ../filesys.o: filesys.o
 	@rm -f ../filesys.o
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/irc.mod/Makefile ./src/mod/irc.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/irc.mod/Makefile	Fri Oct 15 11:31:03 1999
+++ ./src/mod/irc.mod/Makefile	Sat Oct 16 13:58:43 1999
@@ -17,12 +17,11 @@
 	$(LD) -o ../../../irc.so irc.o
 	$(STRIP) ../../../irc.so
 
-irc.o: ../module.h ../modvals.h ../../eggdrop.h \
-	chan.c cmdsirc.c mode.c msgcmds.c tclirc.c irc.h \
-	../channels.mod/channels.h ../server.mod/server.h
+irc.o: ../module.h ../modvals.h ../../eggdrop.h chan.c cmdsirc.c mode.c \
+msgcmds.c tclirc.c irc.h ../channels.mod/channels.h ../server.mod/server.h
 
 irc.o: 
-	$(CC) $(CFLAGS) -DMAKING_MODS -c irc.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c irc.c
 
 ../irc.o: irc.o
 	@rm -f ../irc.o
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/notes.mod/Makefile ./src/mod/notes.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/notes.mod/Makefile	Fri Oct 15 11:31:03 1999
+++ ./src/mod/notes.mod/Makefile	Sat Oct 16 13:59:35 1999
@@ -17,9 +17,9 @@
 	$(LD) -o ../../../notes.so notes.o
 	$(STRIP) ../../../notes.so
 
-notes.o: ../module.h ../modvals.h ../../eggdrop.h \
-	cmdsnote.c notes.c notes.h ../../tandem.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c notes.c
+notes.o: ../module.h ../modvals.h ../../eggdrop.h cmdsnote.c notes.c \
+notes.h ../../tandem.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c notes.c
 
 ../notes.o: notes.o
 	@rm -f ../notes.o
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/seen.mod/Makefile ./src/mod/seen.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/seen.mod/Makefile	Fri Oct 15 11:31:03 1999
+++ ./src/mod/seen.mod/Makefile	Sat Oct 16 13:59:06 1999
@@ -17,10 +17,9 @@
 	$(LD) -o ../../../seen.so seen.o
 	$(STRIP) ../../../seen.so
 
-seen.o: ../module.h ../modvals.h ../../eggdrop.h \
-	seen.c ../channels.mod/channels.h \
-	../../chan.h ../../users.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c seen.c
+seen.o: ../module.h ../modvals.h ../../eggdrop.h seen.c \
+../channels.mod/channels.h ../../chan.h ../../users.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c seen.c
 
 ../seen.o: seen.o
 	@rm -f ../seen.o
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/server.mod/Makefile ./src/mod/server.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/server.mod/Makefile	Fri Oct 15 11:31:03 1999
+++ ./src/mod/server.mod/Makefile	Sat Oct 16 13:59:24 1999
@@ -17,9 +17,9 @@
 	$(LD) -o ../../../server.so server.o
 	$(STRIP) ../../../server.so
 
-server.o: ../module.h ../modvals.h ../../eggdrop.h \
-	cmdsserv.c server.c servmsg.c server.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c server.c
+server.o: ../module.h ../modvals.h ../../eggdrop.h cmdsserv.c server.c \
+servmsg.c server.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c server.c
 
 ../server.o: server.o
 	@rm -f ../server.o
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/share.mod/Makefile ./src/mod/share.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/share.mod/Makefile	Fri Oct 15 11:31:03 1999
+++ ./src/mod/share.mod/Makefile	Sat Oct 16 14:00:12 1999
@@ -17,10 +17,9 @@
 	$(LD) -o ../../../share.so share.o
 	$(STRIP) ../../../share.so
 
-share.o: ../module.h ../modvals.h ../../eggdrop.h \
-	share.c ../../chan.h ../../users.h \
-	../channels.mod/channels.h ../transfer.mod/transfer.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c share.c
+share.o: ../module.h ../modvals.h ../../eggdrop.h share.c ../../chan.h \
+../../users.h ../channels.mod/channels.h ../transfer.mod/transfer.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c share.c
 
 ../share.o: share.o
 	@rm -f ../share.o
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/transfer.mod/Makefile ./src/mod/transfer.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/transfer.mod/Makefile	Fri Oct 15 11:31:03 1999
+++ ./src/mod/transfer.mod/Makefile	Sat Oct 16 13:59:18 1999
@@ -17,9 +17,9 @@
 	$(LD) -o ../../../transfer.so transfer.o
 	$(STRIP) ../../../transfer.so
 
-transfer.o: ../module.h ../modvals.h ../../eggdrop.h \
-	transfer.h ../../tandem.h ../../users.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c transfer.c
+transfer.o: ../module.h ../modvals.h ../../eggdrop.h transfer.h \
+../../tandem.h ../../users.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c transfer.c
 
 ../transfer.o: transfer.o
 	@rm -f ../transfer.o
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/wire.mod/Makefile ./src/mod/wire.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/wire.mod/Makefile	Fri Oct 15 11:23:25 1999
+++ ./src/mod/wire.mod/Makefile	Sat Oct 16 14:00:00 1999
@@ -17,9 +17,9 @@
 	$(LD) -o ../../../wire.so wire.o
 	$(STRIP) ../../../wire.so
 
-wire.o: ../module.h ../modvals.h ../../eggdrop.h \
-	wire.c wire.h ../../chan.h ../../users.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c wire.c
+wire.o: ../module.h ../modvals.h ../../eggdrop.h wire.c wire.h \
+../../chan.h ../../users.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c wire.c
 
 ../wire.o: wire.o
 	@rm -f ../wire.o
diff -urNPX ../exclude ../eggdrop1.3.cvs/src/mod/woobie.mod/Makefile ./src/mod/woobie.mod/Makefile
--- ../eggdrop1.3.cvs/src/mod/woobie.mod/Makefile	Fri Oct 15 11:31:03 1999
+++ ./src/mod/woobie.mod/Makefile	Sat Oct 16 12:30:48 1999
@@ -18,7 +18,7 @@
 	$(STRIP) ../../../woobie.so
 
 woobie.o: ../module.h ../modvals.h ../../eggdrop.h
-	$(CC) $(CFLAGS) -DMAKING_MODS -c woobie.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c woobie.c
 
 ../woobie.o: woobie.o
 	@rm -f ../woobie.o


More information about the Patches mailing list