فهرست منبع

* Checkout bdlib now as well

Bryan Drewery 17 سال پیش
والد
کامیت
663b9d0efa
6فایلهای تغییر یافته به همراه29 افزوده شده و 15 حذف شده
  1. 3 0
      .gitmodules
  2. 9 4
      autotools/configure.ac
  3. 9 4
      configure
  4. 3 3
      lib/Makefile.in
  5. 1 0
      lib/bdlib
  6. 4 4
      src/Makefile.in

+ 3 - 0
.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/bdlib"]
+	path = lib/bdlib
+	url = git://git.shatow.net/bdlib

+ 9 - 4
autotools/configure.ac

@@ -200,7 +200,12 @@ AH_BOTTOM([/*
 #endif
 ])
 
-#echo ""
-#echo ""
-#echo "------------ Configuring BDLIB ------------"
-#cd lib/bdlib && ./configure
+echo ""
+echo ""
+echo "------------ Configuring BDLIB ------------"
+[
+if test -d .git && ! test -d lib/bdlib/.git; then
+  git submodule update --init
+fi
+]
+cd lib/bdlib && ./configure

+ 9 - 4
configure

@@ -14870,7 +14870,12 @@ fi
 
 
 
-#echo ""
-#echo ""
-#echo "------------ Configuring BDLIB ------------"
-#cd lib/bdlib && ./configure
+echo ""
+echo ""
+echo "------------ Configuring BDLIB ------------"
+
+if test -d .git && ! test -d lib/bdlib/.git; then
+  git submodule update --init
+fi
+
+cd lib/bdlib && ./configure

+ 3 - 3
lib/Makefile.in

@@ -13,11 +13,11 @@ VPATH = @srcdir@
 default: normal
 
 clean:
-#	-+@cd bdlib && $(MAKE) clean
+	-+@cd bdlib && $(MAKE) clean
 	@rm -f *.a
 
 distclean: clean
-#	-+@cd bdlib && $(MAKE) distclean
+	-+@cd bdlib && $(MAKE) distclean
 
 notice:
 	@echo "[*] Making libraries"
@@ -32,7 +32,7 @@ debug: general notice_debug build
 general:
 
 build:
-#	+@cd bdlib && $(MAKE) bdlib
+	+@cd bdlib && $(MAKE) bdlib
 
 buildcheck: build
 

+ 1 - 0
lib/bdlib

@@ -0,0 +1 @@
+Subproject commit 9364c1a11098c192c10641a4fef5005dd236e110

+ 4 - 4
src/Makefile.in

@@ -94,14 +94,14 @@ stringfix: stringfix.c common.h ../config.h eggdrop.h
 	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) stringfix.c -o stringfix
 	@$(STRIP) stringfix@EXEEXT@
 
-#../$(EGGEXEC): build_msg $(OBJS) mycrypto compatability ../lib/bdlib/src/libbdlib.a
-../$(EGGEXEC): build_msg $(OBJS) mycrypto compatability 
+#../$(EGGEXEC): build_msg $(OBJS) mycrypto compatability
+../$(EGGEXEC): build_msg $(OBJS) mycrypto compatability ../lib/bdlib/src/libbdlib.a
 	@echo "[*] Linking"
 	@echo ""
 	@echo "Linking wraith... $(EGGBUILD)"
 	@echo ""
-#	$(LD) -o ../$(EGGEXEC) $(OBJS) $(MODOBJS) $(LIBS) compat/*.o crypto/*.o ../lib/bdlib/src/libbdlib.a
-	$(LD) -o ../$(EGGEXEC) $(OBJS) $(MODOBJS) $(LIBS) compat/*.o crypto/*.o
+	$(LD) -o ../$(EGGEXEC) $(OBJS) $(MODOBJS) $(LIBS) compat/*.o crypto/*.o ../lib/bdlib/src/libbdlib.a
+#	$(LD) -o ../$(EGGEXEC) $(OBJS) $(MODOBJS) $(LIBS) compat/*.o crypto/*.o
 	@$(STRIP) ../$(EGGEXEC)
 	@$(OBJCOPY) ../$(EGGEXEC)
 	@echo "Successful compile: $(EGGEXEC)"