[ShareDaemon-CVS] ui-wx configure,1.1,1.2

[<ma...@us...>]

Update of /cvsroot/sharedaemon/ui-wx
In directory sc8-pr-cvs1:/tmp/cvs-serv10561

Modified Files:
	configure 
Log Message:
colours

Index: configure
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- configure	12 Dec 2003 08:37:48 -0000	1.1
+++ configure	12 Dec 2003 09:12:18 -0000	1.2
@@ -19,6 +19,12 @@
 
 #!/bin/sh
 
+colour_default="\33[0;2m"
+colour_yes="\33[32;22m"
+colour_no="\33[31;22m"
+colour_output="\33[35;1m"
+colour_warning="\33[36;1m"
+
 ##
 # Checks for ccache (compiler cache) availability
 #
@@ -26,18 +32,18 @@
 	echo -n -e "checking for ccache...\t\t\t\t";
 	if test -x /usr/local/bin/ccache; then
 		ccache=/usr/local/bin/ccache;
-		echo "yes";
+		echo -e "${colour_yes}yes${colour_default}";
 	elif test -x /usr/bin/ccache; then
 		ccache=/usr/bin/ccache;
-		echo "yes"
+		echo -e "${colour_yes}yes${colour_default}"
 	elif test -x /local/bin/ccache; then
 		ccache=/local/bin/ccache;
-		echo "yes"
+		echo -e "${colour_yes}yes${colour_default}"
 	elif test -x /bin/ccache; then
 		ccache=/bin/ccache;
-		echo "yes"
+		echo -e "${colour_yes}yes${colour_default}"
 	else
-		echo "no";
+		echo -e "${colour_no}no${colour_default}";
 	fi;
 }
 
@@ -62,10 +68,10 @@
 	elif test -x /wx/dynamic/2.5.0/bin/wx-config; then
 		wxconfig=/wx/dynamic/2.5.0/bin/wx-config;
 	else
-		echo "no";
+		echo "${colour_no}no${colour_default}";
 		not_found;
 	fi;
-	echo "yes";
+	echo -e "${colour_yes}yes${colour_default}";
 }
 
 ##
@@ -83,10 +89,10 @@
 		sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
 
 	if test $wxversion_major -ge 2 -a $wxversion_minor -ge 0; then
-		echo "yes" \
+		echo -e "${colour_yes}yes${colour_default}" \
 			"($wxversion_major.$wxversion_minor.$wxversion_patch)";
 	else
-		echo "no";
+		echo -e "${colour_no}no${colour_default}";
 		wrong_version;
 	fi;
 }
@@ -150,6 +156,8 @@
 	# defaults
 	wxconfig=wx-config;
 	prefix=/usr/local/bin;
+	include=-I/local/include;
+	include_dir=/local/include;
 	optimise=1;
 	debug=0;
 	profile=0;
@@ -210,48 +218,48 @@
 		shift;
 	done;
 
-	echo -e "--with-wx-config\t\t\t\t$wxconfig";
-	echo -e "--prefix\t\t\t\t\t$prefix";
-	echo -e "--include-dir\t\t\t\t\t$include_dir";
+	echo -e "checking for --with-wx-config\t\t\t$wxconfig";
+	echo -e "checking for --prefix\t\t\t\t$prefix";
+	echo -e "checking for --include-dir\t\t\t$include_dir";
 
-	echo -e -n "--enable-optimise\t\t\t\t";
+	echo -e -n "checking for --enable-optimise\t\t\t";
 	if test $optimise = 1; then
-		echo -e "yes";
+		echo -e "${colour_yes}yes${colour_default}";
 		cppflags="$cppflags -O3"
 	else
-		echo -e "no";
+		echo -e "${colour_no}no${colour_default}";
 	fi;
 
-	echo -e -n "--enable-debug\t\t\t\t\t";
+	echo -e -n "checking for --enable-debug\t\t\t";
 	if test $debug = 1; then
-		echo -e "yes";
+		echo -e "${colour_yes}yes${colour_default}";
 		cppflags="$cppflags -g -ggdb -fno-inline"
 	else
-		echo -e "no";
+		echo -e "${colour_no}no${colour_default}";
 	fi;
 
-	echo -e -n "--enable-profile\t\t\t\t";
+	echo -e -n "checking for --enable-profile\t\t\t";
 	if test $profile = 1; then
-		echo -e "yes";
+		echo -e "${colour_yes}yes${colour_default}";
 		cppflags="$cppflags -pg"
 	else
-		echo -e "no";
+		echo -e "${colour_no}no${colour_default}";
 	fi;
 
-	echo -e -n "--has-patched-wxsizer\t\t\t\t";
+	echo -e -n "checking for --has-patched-wxsizer\t\t";
 	if test $patch_sizer = 1; then
-		echo -e "yes";
+		echo -e "${colour_yes}yes${colour_default}";
 		cppflags="$cppflags -D__HAVE_REMOVE_GROWABLE_COL__"
 	else
-		echo -e "no";
-		echo -e "\tWarning: Sidebar hiding code will be disabled.";
+		echo -e "${colour_no}no${colour_default}";
+		echo -e "\t${colour_warning}Warning: Sidebar hiding code will be disabled.${colour_default}";
 	fi;
 
-	echo -e -n "--show-flags\t\t\t\t\t";
+	echo -e -n "checking for --show-flags\t\t\t";
 	if test $show_flags = 1; then
-		echo -e "yes";
+		echo -e "${colour_yes}yes${colour_default}";
 	else
-		echo -e "no";
+		echo -e "${colour_no}no${colour_default}";
 	fi;
 }
 
@@ -283,3 +291,5 @@
 check_wxversion;
 check_ccache;
 gen_makefile;
+
+echo -e "configure complete. Now type \33[35;1mmake\33[0;2m and pray.";