Ver Fonte

Merge branch 'port-over-bdlib'

* port-over-bdlib:
  * Checkout bdlib now as well
  * Autoconf 2.63
Bryan Drewery há 17 anos atrás
pai
commit
2e4355d377
7 ficheiros alterados com 388 adições e 255 exclusões
  1. 3 0
      .gitmodules
  2. 9 4
      autotools/configure.ac
  3. 35 5
      config.h.in
  4. 333 239
      configure
  5. 3 3
      lib/Makefile.in
  6. 1 0
      lib/bdlib
  7. 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

+ 35 - 5
config.h.in

@@ -1,5 +1,8 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Define if running on NeXT Step */
 #undef BORGCUBES
 
@@ -313,14 +316,41 @@
 /* Define if you want ipv6 support */
 #undef USE_IPV6
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* Define if windows */
 #undef WIN32_LEAN_AND_MEAN
 
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
 #endif
 
 /* Define to 1 if on MINIX. */

Diff do ficheiro suprimidas por serem muito extensas
+ 333 - 239
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)"

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff