* Move configure files into build/

.gitignore

@@ -1,11 +1,12 @@
 /Makefile
-/confcache
-/config.cache
-/confdefs.h
-/config.h
-/config.log
-/config.status
+/build/confcache
+/build/config.cache
+/build/confdefs.h
+/src/config.h
+/build/config.log
+/build/config.status
 /stamp.*
+/build/autotools/src
 /*.tgz
 /leaf
 /hub

Makefile.in

@@ -13,9 +13,9 @@ CCDEPMODE = @CCDEPMODE@
 BINEXEC = wraith@EXEEXT@
 
 STATICMAKEFILES = lib/Makefile src/mod/Makefile src/crypto/Makefile src/compat/Makefile src/Makefile Makefile
-CONFIGFILES = config.cache config.log config.status config.h src/buildinfo.h
+CONFIGFILES = build/config.cache build/config.log build/config.status src/config.h src/buildinfo.h
 
-DISTROFILES = README LICENSE config.h.in build doc scripts lib Makefile.in build.sh configure src BSDmakefile
+DISTROFILES = README LICENSE build doc scripts lib Makefile.in build.sh configure src BSDmakefile
 EXCLUDES = $(CONFIGFILES) $(STATICMAKEFILES)
 
 COMMIT_FULL 	:= $(shell git log -1 --pretty=format:%H HEAD)
@@ -185,7 +185,7 @@ res: makeres
 	cp -f src/responses.h~ src/responses.h; \
 	fi)
 
-stringfix: src/stringfix.c config.h
+stringfix: src/stringfix.c src/config.h
 	+@cd src && ${MAKE_UTILS} stringfix
 
 makeres: src/makeres.c

build/autotools/Makefile

@@ -4,32 +4,39 @@ all: clean aclocal autoheader autoconf clean_again
 
 aclocal:
 	@rm -rf aclocal.m4
+	@mkdir src
 	aclocal -I includes/
 
 autoheader:
-	@rm -rf ../config.h.in
+	@rm -f ../../src/config.h.in
 	@echo "Autoheader..."
 	@autoheader
-	@mv -f config.h.in ../config.h.in
-	@ls -al ../config.h.in
+	@mv -f src/config.h.in ../../src/config.h.in
+	@ls -al ../../src/config.h.in
 
 autoconf: 
-	@rm -rf ../configure
+	@rm -rf ../../configure
 	@echo "Autoconf...."
 	@autoconf
 	@echo "Fixing configure for cache_file"
-	@(if ! sed configure -e "s/^cache_file=\/dev\/null/cache_file=\.\/config.cache/" \
-	-e "s/&& echo \"updating cache .cache_file\"//" > ../configure; then \
-	cp configure ../configure; \
-	rm configure; \
+	@(if ! sed configure \
+	  -e 's:^cache_file=/dev/null:cache_file=build/config.cache:' \
+	  -e 's:config\.log:build/config.log:g' \
+	  -e 's:config\.status:build/config.status:g' \
+	  -e 's:confdefs\.h:build/confdefs.h:g' \
+	  -e 's:&& echo "updating cache .cache_file"::' \
+	  > ../../configure; then \
+	  echo "FAILED TO FIX configure" >&2; \
+          cp configure ../../configure; \
+          rm configure; \
 	fi)
-	@chmod 700 ../configure
-	@ls -al ../configure
+	@chmod 700 ../../configure
+	@ls -al ../../configure
 
 clean:
 	@echo "Cleaning..."
-	@rm -rf autom4te.cache/ configure config.h.in aclocal.m4
+	@rm -rf autom4te.cache/ configure aclocal.m4 src/
 
 clean_again:
 	@echo "Cleaning..."
-	@rm -rf autom4te.cache/ configure config.h.in aclocal.m4
+	@rm -rf autom4te.cache/ configure aclocal.m4 src/

build/autotools/configure.ac

@@ -5,8 +5,8 @@ dnl
 AC_PREREQ(2.59)
 AC_INIT([wraith],[],[wraith@botpack.net])
 AC_CONFIG_SRCDIR(src/eggdrop.h)
-AC_CONFIG_HEADER(config.h)
-AC_COPYRIGHT([Copyright (c) 2003 - 2010 Bryan Drewery])
+AC_CONFIG_HEADER(src/config.h)
+AC_COPYRIGHT([Copyright (c) Bryan Drewery])
 AC_REVISION($Revision$)
 
 EGG_SAVE_PARAMETERS

src/Makefile.in

@@ -8,7 +8,7 @@ depcomp = /bin/sh $(top_srcdir)/build/autotools/depcomp
 
 @SET_MAKE@
 
-CXXFLAGS = @CXXFLAGS@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/pack @DEFS@ $(INCLUDES) $(CFLGS) '-DCOMMIT="$(COMMIT)"' '-DBRANCH="$(BRANCH)"' -DBUILDTS=$(BUILDTS) '-DVERSION="$(VERSION)"'
+CXXFLAGS = @CXXFLAGS@ -I. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/pack @DEFS@ $(INCLUDES) $(CFLGS) '-DCOMMIT="$(COMMIT)"' '-DBRANCH="$(BRANCH)"' -DBUILDTS=$(BUILDTS) '-DVERSION="$(VERSION)"'
 CPPFLAGS = @CPPFLAGS@
 
 OBJCOPY = @OBJCOPY@
@@ -75,25 +75,25 @@ blah:
 
 makeres: makeres.c ../lib/bdlib/src/libbdlib.a
 	@echo -e "Compiling: \033[1mmakeres\033[0m"
-	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makeres.c ../lib/bdlib/src/libbdlib.a -o makeres
+	@$(CXX) $(CXXFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CPPFLAGS) makeres.c ../lib/bdlib/src/libbdlib.a -o makeres
 	@$(STRIP) makeres@EXEEXT@
 
 makeset: makeset.c ../lib/bdlib/src/libbdlib.a
 	@echo -e "Compiling: \033[1mmakeset\033[0m"
-	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makeset.c ../lib/bdlib/src/libbdlib.a -o makeset
+	@$(CXX) $(CXXFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CPPFLAGS) makeset.c ../lib/bdlib/src/libbdlib.a -o makeset
 	@$(STRIP) makeset@EXEEXT@
 
 makehelp: makehelp.c ../lib/bdlib/src/libbdlib.a
 	@echo -e "Compiling: \033[1mmakehelp\033[0m"
-	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makehelp.c ../lib/bdlib/src/libbdlib.a -o makehelp
+	@$(CXX) $(CXXFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CPPFLAGS) makehelp.c ../lib/bdlib/src/libbdlib.a -o makehelp
 	@$(STRIP) makehelp@EXEEXT@
 
 sorthelp: sorthelp.c ../lib/bdlib/src/libbdlib.a
 	@echo -e "Compiling: \033[1msorthelp\033[0m"
-	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) sorthelp.c ../lib/bdlib/src/libbdlib.a -o sorthelp
+	@$(CXX) $(CXXFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CPPFLAGS) sorthelp.c ../lib/bdlib/src/libbdlib.a -o sorthelp
 	@$(STRIP) sorthelp@EXEEXT@
 
-stringfix: stringfix.c common.h ../config.h eggdrop.h
+stringfix: stringfix.c common.h config.h eggdrop.h
 	@echo -e "Compiling: \033[1mstringfix\033[0m"
 	@$(CXX) $(CXXFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) stringfix.c -o stringfix
 	@$(STRIP) stringfix@EXEEXT@

config.h.in → src/config.h.in

@@ -1,4 +1,4 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
+/* src/config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD