# HG changeset patch
# User rubidium
# Date 1229602988 0
# Node ID 8d3a9fbe8f1996030573f07d4fea0ff4e6ad930f
# Parent  849b45cca2e46366ef1953186571452e4615d2d1
(svn r14689) -Change: make configure die on commonly made user mistakes, like not having SDL development files or zlib headers installed; you can still compile a dedicated server or a binary without zlib, but you have to explicitly force it.

diff -r 849b45cca2e4 -r 8d3a9fbe8f19 config.lib
--- a/config.lib	Wed Dec 17 23:12:35 2008 +0000
+++ b/config.lib	Thu Dec 18 12:23:08 2008 +0000
@@ -574,8 +574,8 @@
 		log 1 "checking dedicated... found"
 
 		if [ "$enable_network" = "0" ]; then
-			log 1 "WARNING: compiling a dedicated server without network is pointless"
-			sleep 5
+			log 1 "configure: error: building a dedicated server without network support is pointless"
+			exit 1
 		fi
 	else
 		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
@@ -585,11 +585,9 @@
 		fi
 
 		if [ -z "$allegro_config" ] && [ -z "$sdl_config" ] && [ "$with_cocoa" = 0 ] && [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "WINCE" ]; then
-			log 1 "WARNING: no video driver found, building dedicated only"
-			enable_dedicated="1"
-			sleep 1
-
-			log 1 "checking dedicated... found"
+			log 1 "configure: error: no video driver development files found"
+			log 1 " If you want a dedicated server use --enable-dedicated as parameter"
+			exit 1
 		else
 			log 1 "checking dedicated... not selected"
 		fi
@@ -619,6 +617,7 @@
 		log 1 "checking assert... disabled"
 	fi
 
+	pre_detect_with_zlib=$with_zlib
 	detect_zlib
 
 	if [ "$with_zlib" = "0" ] || [ -z "$zlib" ]; then
@@ -626,8 +625,13 @@
 		log 1 "WARNING: OpenTTD doesn't require zlib, but it does mean many features (like"
 		log 1 "WARNING: loading most savegames/scenarios, joining most servers, loading"
 		log 1 "WARNING: heightmaps, using PNG or using fonts, ...) will be disabled."
-		log 1 "WARNING: We strongly suggest you to install zlib."
-		sleep 5
+		if [ "$pre_detect_with_zlib" = "0" ]; then
+			log 1 "WARNING: We strongly suggest you to install zlib."
+		else
+			log 1 "configure: error: no zlib detected"
+			log 1 " If you want to compile without zlib use --without-zlib as parameter"
+			exit
+		fi
 	fi
 
 	detect_png