--- a/config.lib	Thu Jul 12 15:52:17 2007 +0000
+++ b/config.lib	Fri Jul 13 09:18:50 2007 +0000
@@ -702,9 +702,9 @@
 			log 1 "checking revision... no detection"
 			log 1 "WARNING: there is no means to determine the version."
 			log 1 "WARNING: please use a subversion or git checkout of OpenTTD."
-			log 1 "WARNING: this version will be allowed by all game servers,"
-			log 1 "WARNING: but you will be kicked from all incompatible"
-			log 1 "WARNING: servers as you will desync."
+			log 1 "WARNING: this version is only allowed by game servers that"
+			log 1 "WARNING: have been compiled without version detection."
+			log 1 "WARNING: there is a great chance you desync."
 			log 1 "WARNING: USE WITH CAUTION!"
 
 			sleep 5
@@ -753,15 +753,14 @@
 		OBJS_SUBDIR="release"
 		if [ "$os" = "OSX" ]; then
 			# these compilerflags makes the app run as fast as possible without making the app unstable. It works on G3 or newer
-			CFLAGS="$CFLAGS -O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic"
+			CFLAGS="-O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic $CFLAGS"
 		else
 			if [ "$os" = "MORPHOS" ]; then
-				CFLAGS="$CFLAGS -I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations"
-				CFLAGS="$CFLAGS -mcpu=604 -fno-inline -mstring -mmultiple"
+				CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS"
 				LDFLAGS="$LDFLAGS -noixemul"
 			fi
 
-			CFLAGS="$CFLAGS -O2 -fomit-frame-pointer"
+			CFLAGS="-O2 -fomit-frame-pointer $CFLAGS"
 		fi
 	else
 		OBJS_SUBDIR="debug"