From 6bb8ba1f1f5f7532ac9e1944745a0c01d9264d4e Mon Sep 17 00:00:00 2001 From: "rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b" Date: Mon, 26 Jun 2006 21:43:33 +0000 Subject: [PATCH] BUILD : 1.7.14 (1075) BUGS : N/A NOTES : multiple file modules now respect mod_version, and ./configure is checked for and executed. git-svn-id: svn://svn.anope.org/anope/trunk@1075 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@799 5417fbe8-f217-4b02-8779-1006273d7864 --- Changes | 1 + src/modules/Makefile | 2 +- src/modules/Makefile.sub | 2 +- src/modules/configure | 5 +++++ version.log | 6 +++++- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Changes b/Changes index 80c0da238..f50ab0150 100644 --- a/Changes +++ b/Changes @@ -39,6 +39,7 @@ Provided by Anope Dev. - 2006 06/20 F Make does not recompile everything even on no change anymore. [ #00] 06/20 F Versions in win32.rc are now updated correctly. [#526] 06/21 F Syntax for NickServ SET MSG showed syntax for SET PRIVATE. [ #00] +06/26 F A few small bugs with module configure scripts. [ #00] Provided by ThaPrince - 2006 05/19 A Plexus 3 support. [ #00] diff --git a/src/modules/Makefile b/src/modules/Makefile index 346e32ffb..0e5a363f7 100644 --- a/src/modules/Makefile +++ b/src/modules/Makefile @@ -24,7 +24,7 @@ distclean: spotless $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $< .o.s: - $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE} + $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${LDFLAGS} ${PROFILE} @$(TOUCH) $*.s subs: diff --git a/src/modules/Makefile.sub b/src/modules/Makefile.sub index 5e53fa5dd..4890b46e6 100644 --- a/src/modules/Makefile.sub +++ b/src/modules/Makefile.sub @@ -19,7 +19,7 @@ distclean: spotless $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $< so: - $(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE} + $(CC) ${SHARED}../../mod_version.o $(OBJECTS) -o ../$(TARGET).so ${LDFLAGS} ${PROFILE} clean: rm -f *.o *.so *.c~ core diff --git a/src/modules/configure b/src/modules/configure index 68d2b7713..cf2158d66 100755 --- a/src/modules/configure +++ b/src/modules/configure @@ -37,6 +37,11 @@ FIRST=1 for dir in * do if [ -d $dir ] ; then + if [ -f $dir/configure ] ; then + cd $dir + ./configure + cd .. + fi if [ -f $dir/Makefile ] ; then if [ "$FIRST" = 1 ] ; then echo2 " "$dir >> ./Makefile.inc diff --git a/version.log b/version.log index f6b2dfd4d..2a5482f81 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="14" VERSION_EXTRA="" -VERSION_BUILD="1074" +VERSION_BUILD="1075" # $Log$ # +# BUILD : 1.7.14 (1075) +# BUGS : N/A +# NOTES : multiple file modules now respect mod_version, and ./configure is checked for and executed. +# # BUILD : 1.7.14 (1074) # BUGS : N/A # NOTES : Small patch by ThaPrince for ircds with modes on id