chanserv: fixed cleanupdb to also clear history databases

[irc/quakenet/newserv.git] / build.mk.in

diff --git a/build.mk.in b/build.mk.in
index 6affc34047fd5cbb26113afd743188a2bb0e1aa1..33598acf08f01d4d92017c1d53c2f8475d0edbb9 100644 (file)
--- a/build.mk.in
+++ b/build.mk.in
@@ -11,9 +11,9 @@ MFLAGS=
 @sinclude@ @includel@$(INCPATH)settings.mk@includel@
 
 @ifeq@${HOOKS_NEW}@ifeqsep@1@ifeqend@
-HOOK_ENGINE=old
-@else@
 HOOK_ENGINE=new
+@else@
+HOOK_ENGINE=old
 @endif@
 
 # if USE_VALGRIND == 1
@@ -45,18 +45,12 @@ HOOK_ENGINE=new
 @endif@ ## SSTRING_NEW == 1
 @endif@ # USE_VALGRIND == 1
 
-@ifeq@${SSTRING_NEW}@ifeqsep@1@ifeqend@
-HOOK_ENGINE=old
-@else@
-HOOK_ENGINE=new
-@endif@
-
 @ifdef@ IMPOSSIBLE
 @error@ impossible combination of settings: ${IMPOSSIBLE}@errorend@
 @endif@
 
 @ifndef@ BUILDID
-BUILDID @shell@ (hg id || echo "unknown") | sed -e "s/+ /-/;s/ /-/" @shellend@
+BUILDID @shell@ (hg id || echo "unknown") | sed -e "s/[()]//g;s/+ /+/g;s/ /-/g" @shellend@
 @endif@
 MFLAGS+=BUILDID=$(BUILDID)
 
@@ -87,5 +81,8 @@ realchecksettings:
 @endif@
 MFLAGS+=CHECKEDSETTINGS=1
 
-CFLAGS+=-Wall -g -finline-functions -funroll-loops -std=c99 -I./ -DBUILDID=$(BUILDID)
-CFLAGS+=-fPIC -export-dynamic
+CFLAGS+=-Wall -g -finline-functions -funroll-loops
+@ifndef@ NOC99
+CFLAGS+=-std=c99
+@endif@
+CFLAGS+=-I./ -DBUILDID=$(BUILDID) -fPIC -export-dynamic