* Port [3733] to 1.2.15

 * Move bdlib to external


svn: 3735

Makefile.in

@@ -91,7 +91,8 @@ distclean: clean
 	@rm -f Makefile src/Makefile src/compat/Makefile src/bdlib/Makefile src/mod/Makefile src/crypto/Makefile src/buildinfo.h
 	@rm -f config.cache config.log config.status config.h 
 	@rm -rf *-$(VERSION)/ autom4te.cache/ autoscan.log configure.scan
-	@rm -rf src/.deps/ src/compat/.deps/ src/bdlib/.deps/ src/mod/*.mod/.deps/ src/crypto/.deps
+	@rm -rf src/.deps/ src/compat/.deps/ src/strucutres/.deps/ src/mod/*.mod/.deps/ src/crypto/.deps
+	+@cd src/bdlib && $(MAKE) distclean
 
 
 distrib: clean

autotools/configure.ac

@@ -158,7 +158,7 @@ EGG_SUBST_VERSION
 EGG_SUBST_MOD_UPDIR
 DO_DEPS
 
-AC_CONFIG_FILES([Makefile src/Makefile src/compat/Makefile src/bdlib/Makefile src/crypto/Makefile src/mod/Makefile src/buildinfo.h])
+AC_CONFIG_FILES([Makefile src/Makefile src/compat/Makefile src/crypto/Makefile src/mod/Makefile src/buildinfo.h])
 AC_OUTPUT
 
 AH_TEMPLATE(HAVE_ST_MTIM, [Define to 1 if your struct stat has an st_mtim member])
@@ -200,3 +200,7 @@ AH_BOTTOM([/*
 #endif
 ])
 
+echo ""
+echo ""
+echo "------------ Configuring BDLIB ------------"
+cd src/bdlib && ./configure

autotools/includes/depend.m4

@@ -19,7 +19,7 @@ AC_SUBST(GCC3)dnl
 
 AC_DEFUN([DO_DEPS],
 [
-files="src/Makefile.in src/compat/Makefile.in src/bdlib/Makefile.in src/crypto/Makefile.in src/mod/channels.mod/Makefile src/mod/compress.mod/Makefile src/mod/console.mod/Makefile src/mod/ctcp.mod/Makefile src/mod/irc.mod/Makefile src/mod/server.mod/Makefile src/mod/share.mod/Makefile src/mod/transfer.mod/Makefile src/mod/update.mod/Makefile"
+files="src/Makefile.in src/compat/Makefile.in src/crypto/Makefile.in src/mod/channels.mod/Makefile src/mod/compress.mod/Makefile src/mod/console.mod/Makefile src/mod/ctcp.mod/Makefile src/mod/irc.mod/Makefile src/mod/server.mod/Makefile src/mod/share.mod/Makefile src/mod/transfer.mod/Makefile src/mod/update.mod/Makefile"
 for mf in $files; do
   # Strip MF so we end up with the name of the file.
 #  echo "MF: $mf"

configure

@@ -11861,7 +11861,7 @@ case "$srcdir" in
 esac
 
 
-files="src/Makefile.in src/compat/Makefile.in src/bdlib/Makefile.in src/crypto/Makefile.in src/mod/channels.mod/Makefile src/mod/compress.mod/Makefile src/mod/console.mod/Makefile src/mod/ctcp.mod/Makefile src/mod/irc.mod/Makefile src/mod/server.mod/Makefile src/mod/share.mod/Makefile src/mod/transfer.mod/Makefile src/mod/update.mod/Makefile"
+files="src/Makefile.in src/compat/Makefile.in src/crypto/Makefile.in src/mod/channels.mod/Makefile src/mod/compress.mod/Makefile src/mod/console.mod/Makefile src/mod/ctcp.mod/Makefile src/mod/irc.mod/Makefile src/mod/server.mod/Makefile src/mod/share.mod/Makefile src/mod/transfer.mod/Makefile src/mod/update.mod/Makefile"
 for mf in $files; do
   # Strip MF so we end up with the name of the file.
 #  echo "MF: $mf"
@@ -11920,7 +11920,7 @@ echo X"$mf" |
 done
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/compat/Makefile src/bdlib/Makefile src/crypto/Makefile src/mod/Makefile src/buildinfo.h"
+ac_config_files="$ac_config_files Makefile src/Makefile src/compat/Makefile src/crypto/Makefile src/mod/Makefile src/buildinfo.h"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -12478,7 +12478,6 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/compat/Makefile") CONFIG_FILES="$CONFIG_FILES src/compat/Makefile" ;;
-    "src/bdlib/Makefile") CONFIG_FILES="$CONFIG_FILES src/bdlib/Makefile" ;;
     "src/crypto/Makefile") CONFIG_FILES="$CONFIG_FILES src/crypto/Makefile" ;;
     "src/mod/Makefile") CONFIG_FILES="$CONFIG_FILES src/mod/Makefile" ;;
     "src/buildinfo.h") CONFIG_FILES="$CONFIG_FILES src/buildinfo.h" ;;
@@ -13050,3 +13049,7 @@ fi
 
 
 
+echo ""
+echo ""
+echo "------------ Configuring BDLIB ------------"
+cd src/bdlib && ./configure

misc/grep

@@ -1,3 +1,3 @@
 #!/bin/sh
 grep=`which grep`
-grep "$@" | grep -v "^configure" | grep -v "^ChangeLog" | grep -v "^Binary" | grep -v "^src/_" | grep -v "^tmp/" | grep -v "help\..*:" | grep -v "\.svn" | grep -v ".deps.*\.Po" | grep -v "\.c~:" | grep -v "tags:" | grep -v "\.orig:"
+grep "$@" | grep -v "^configure" |grep -v src/bdlib| grep -v "^ChangeLog" | grep -v "^Binary" | grep -v "^src/_" | grep -v "^tmp/" | grep -v "help\..*:" | grep -v "\.svn" | grep -v ".deps.*\.Po" | grep -v "\.c~:" | grep -v "tags:" | grep -v "\.orig:"

src/Makefile.in

@@ -62,7 +62,7 @@ MODOBJS = mod/channels.o \
         mod/update.o
 
 
-MAKE_GENERIC = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'LD=$(LD)' 'STRIP=$(STRIP)' 'CFLGS=$(CFLGS)' 'CCDEPMODE=$(CCDEPMODE)'
+MAKE_GENERIC = $(MAKE) 'MAKE=$(MAKE)' 'MAKEFLAGS=$(MAKEFLAGS)' 'CXX=$(CXX)' 'LD=$(LD)' 'STRIP=$(STRIP)' 'CFLGS=$(CFLGS)' 'CCDEPMODE=$(CCDEPMODE)'
 
 blah:
 	@echo ""
@@ -99,7 +99,7 @@ stringfix: stringfix.c common.h ../config.h eggdrop.h
 	@echo ""
 	@echo "Linking wraith... $(EGGBUILD)"
 	@echo ""
-	$(LD) -o ../$(EGGEXEC) $(OBJS) $(MODOBJS) $(LIBS) compat/*.o crypto/*.o bdlib/*.o
+	$(LD) -o ../$(EGGEXEC) $(OBJS) $(MODOBJS) $(LIBS) compat/*.o crypto/*.o bdlib/src/libbdlib.a
 	@$(STRIP) ../$(EGGEXEC)
 	@$(OBJCOPY) ../$(EGGEXEC)
 	@echo "Successful compile: $(EGGEXEC)"
@@ -119,7 +119,7 @@ compatability:
 
 mybdlib:
 	@echo "[*] Compiling BDLIB components"
-	+@cd bdlib && $(MAKE_GENERIC) bdlib
+	+@cd bdlib && $(MAKE_GENERIC)
 
 mycrypto:
 	@echo "[*] Compiling crypto"