X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/blobdiff_plain/1a935a314928d1e6585e6591f5b855b7a07e4c96..2f726f7717e35e9536eca7635d09279774ddd516:/build.mk.in

diff --git a/build.mk.in b/build.mk.in
index f39f3b41..dc18a8a5 100644
--- 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,12 +45,6 @@ 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@
@@ -75,10 +69,9 @@ MFLAGS+=BUILDID=$(BUILDID)
 default: checksettings all
 
 checksettings:
-	echo checked settings
-	@touch settings.mk
-	@test -f .settings.mk || cp settings.mk .settings.mk
-	@diff .settings.mk settings.mk >/dev/null || $(MAKE) -e FORCECHECK=1 realchecksettings
+	@touch ${INCPATH}/settings.mk
+	@test -f ${INCPATH}/.settings.mk || cp ${INCPATH}/settings.mk ${INCPATH}/.settings.mk
+	@diff ${INCPATH}/.settings.mk ${INCPATH}/settings.mk >/dev/null || $(MAKE) -e FORCECHECK=1 realchecksettings
 
 realchecksettings:
 
@@ -88,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