sharedaemon-cvs

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

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

Modified Files:
	configure 
Log Message:
BSD compatibility.

Index: configure
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/configure,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- configure	22 Dec 2003 10:51:04 -0000	1.14
+++ configure	26 Dec 2003 14:25:28 -0000	1.15
@@ -21,7 +21,7 @@
 ##
 # Parses command-line options and sets variables as needed.
 #
-function parse_cmdline() {
+parse_cmdline() {
 	# defaults
 	wxconfig=wx-config;
 	gtkconfig=gtk-config;
@@ -102,7 +102,7 @@
 		shift;
 	done;
 
-	echo -e -n "checking for --disable-colours\t\t\t";
+	echo -e "checking for --disable-colours\\t\\t\\t\\c";
 	if test $colours = 1; then
 		colour_default="\33[0;2m"
 		colour_yes="\33[32;22m"
@@ -114,11 +114,11 @@
 		echo -e "yes";
 	fi;
 
-	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 "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 "checking for --enable-optimise\t\t\t";
+	echo -e "checking for --enable-optimise\\t\\t\\t\\c"
 	if test $optimise = 1; then
 		echo -e "${colour_yes}yes${colour_default}";
 		cppflags="$cppflags -O3"
@@ -126,7 +126,7 @@
 		echo -e "${colour_no}no${colour_default}";
 	fi;
 
-	echo -e -n "checking for --enable-debug\t\t\t";
+	echo -e "checking for --enable-debug\\t\\t\\t\\c";
 	if test $debug = 1; then
 		echo -e "${colour_yes}yes${colour_default}";
 		cppflags="$cppflags -g -ggdb -fno-inline -Wall"
@@ -134,7 +134,7 @@
 		echo -e "${colour_no}no${colour_default}";
 	fi;
 
-	echo -e -n "checking for --enable-profile\t\t\t";
+	echo -e "checking for --enable-profile\\t\\t\\t\\c";
 	if test $profile = 1; then
 		echo -e "${colour_yes}yes${colour_default}";
 		cppflags="$cppflags -pg"
@@ -142,14 +142,14 @@
 		echo -e "${colour_no}no${colour_default}";
 	fi;
 
-	echo -e -n "checking for --has-patched-wxsizer\t\t";
+	echo -e "checking for --has-patched-wxsizer\\t\\t\\c";
 	if test $patch_sizer = 1; then
 		echo -e "${colour_yes}yes${colour_default}";
 	else
 		echo -e "${colour_no}no${colour_default}";
 	fi;
 
-	echo -e -n "checking for --show-flags\t\t\t";
+	echo -e "checking for --show-flags\\t\\t\\t\\c";
 	if test $show_flags = 1; then
 		echo -e "${colour_yes}yes${colour_default}";
 	else
@@ -161,12 +161,10 @@
 # Checks for wx-config in various standard locations and sets $wxconfig variable
 # to the location of it if found, or calls not_found()  if can't find wx-config.
 #
-function check_wxconfig() {
-	echo -n -e "checking for wx-config... \t\t\t";
+check_wxconfig() {
+	echo -e "checking for wx-config... \\t\\t\\t\\c";
 	if test -x $wxconfig; then
 		wxconfig=$wxconfig;
-	elif test -x `which wx-config 2>/dev/null`; then
-		wxconfig=`which wx-config 2>/dev/null`;
 	elif test -x /usr/local/bin/wx-config; then
 		wxconfig=/usr/local/bin/wx-config;
 	elif test -x /usr/bin/wx-config; then
@@ -182,11 +180,12 @@
 	else
 		echo "${colour_no}no${colour_default}";
 		cat <<EOF
-wx-config was not found in standard locations. This means that either you do not
-have  wxWindows library  installed for your platform (wxGTK for Linux, wxMac for
-Mac OS,  wxMSW for MS Windows),  you are missing  wxWindows developer package or
-you have  installed wxWindows  into non-standard  location. In the latter  case,
-rerun configure with --with-wx-config=/path/to/wx-config.
+	wx-config was not found in standard locations. This means that either 
+	you do not have  wxWindows library installed for your platform (wxGTK
+	for Linux, wxMac for Mac OS,  wxMSW for MS Windows),  you are missing
+	wxWindows developer package or you have installed wxWindows into non-
+	standard  location. In the latter  case, rerun configure with --with-
+	wx-config=/path/to/wx-config.
 EOF
 		exit 1;
 	fi;
@@ -197,8 +196,8 @@
 # Checks for wxWindows library version by parsing output of  wx-config --version
 # and testing it against 2.4.0. Exists script with true if  version is >= 2.4.0.
 #
-function check_wxversion() {
-	echo -e -n "checking for wxWindows version >= 2.4.0...\t";
+check_wxversion() {
+	echo -e "checking for wxWindows version >= 2.4.0...\\t\\c";
 	wxversion=`$wxconfig --version`
 	wxversion_major=`echo $wxversion | \
 		sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
@@ -228,23 +227,23 @@
 	fi;
 
 	if test $patch_sizer = 0; then
-		echo -e "\t${colour_warning}Warning:  Sidebar  hiding code  will be disabled.  To enable it,${colour_default}";
-		echo -e "\t${colour_warning}get wxWindows >=v2.5.1, or patch it with flexgridsizer.patch and${colour_default}";
-		echo -e "\t${colour_warning}recompile it and re-run this configure with --has-patched-wxsizer.${colour_default}";
+		echo -e "\\t${colour_warning}Warning:  Sidebar  hiding code  will be disabled.  To enable it,${colour_default}";
+		echo -e "\\t${colour_warning}get wxWindows >=v2.5.1, or patch it with flexgridsizer.patch and${colour_default}";
+		echo -e "\\t${colour_warning}recompile it and re-run this configure with --has-patched-wxsizer.${colour_default}";
 	fi;
 }
 
 ##
 # Checks if wxWindows library was linked against GTK2
 #
-function check_wxgtk2() {
+check_wxgtk2() {
 if $wxconfig --cppflags | grep -q 'gtk'; then
-	echo -e -n "checking if wxWindows was linked against GTK2...";
+	echo -e "checking if wxWindows was linked against GTK2...\\c";
 	if $wxconfig --cppflags | grep -q 'gtk2' ; then
 		echo -e "${colour_no}yes${colour_default}";
-		echo -e "\t${colour_warning}Warning: GTK2 support in wxWindows  is only experimental,${colour_default}";
-		echo -e "\t${colour_warning}thus it is not officially  supported in this  application${colour_default}";
-		echo -e "\t${colour_warning}either.  You have been warned, continue on your own risk.${colour_default}";
+		echo -e "\\t${colour_warning}Warning: GTK2 support in wxWindows  is only experimental,${colour_default}";
+		echo -e "\\t${colour_warning}thus it is not officially  supported in this  application${colour_default}";
+		echo -e "\\t${colour_warning}either.  You have been warned, continue on your own risk.${colour_default}";
 		cppflags="$cppflags -D__GTK2__"
 		gtk2=1;
 	else
@@ -257,7 +256,7 @@
 ##
 # Checks if wxWindows was linked against MSW
 #
-function check_wxmsw() {
+check_wxmsw() {
 	if $wxconfig --cppflags | grep -q 'msw'; then
 		res=wxInterface_private.res
 	else
@@ -268,11 +267,11 @@
 ###
 # Checks for availability of GTK headers (needed for GTK systray)
 #
-function check_gtkconfig() {
+check_gtkconfig() {
 has_gtk=0;
 has_pkgconfig=0;
 if $wxconfig --cppflags | grep -q 'gtk'; then
-	echo -e -n "checking for gtk-config...";
+	echo -e "checking for gtk-config...\\c";
 	if test -x $gtkconfig; then
 		gtkconfig=$gtkconfig;
 		has_gtk=1;
@@ -304,11 +303,11 @@
 		has_gtk=0;
 	fi;
 	if test $has_gtk = 1; then
-		echo -e "${colour_yes}\t\t\t$gtkconfig${colour_default}";
+		echo -e "${colour_yes}\\t\\t\\t$gtkconfig${colour_default}";
 	fi;
 
 	if test $gtk2 = 1; then
-		echo -e -n "checking for pkg-config...";
+		echo -e "checking for pkg-config...\\c";
 		if test -x $pkgconfig; then
 			pkgconfig=$pkgconfig;
 			has_pkgconfig=1;
@@ -328,7 +327,7 @@
 			has_pkgconfig=0;
 		fi;
 		if test $has_gtk = 1 -a $has_pkgconfig = 1; then
-			echo -e "$colour_yes\t\t\t$pkgconfig$colour_default";
+			echo -e "$colour_yes\\t\\t\\t$pkgconfig$colour_default";
 		fi;
 	fi;
 
@@ -339,8 +338,8 @@
 ##
 # Checks for ccache (compiler cache) availability
 #
-function check_ccache() {
-	echo -n -e "checking for ccache...\t\t\t\t";
+check_ccache() {
+	echo -e "checking for ccache...\\t\\t\\t\\t\\c";
 	if test -x /usr/local/bin/ccache; then
 		ccache=/usr/local/bin/ccache;
 		echo -e "${colour_yes}yes${colour_default}";
@@ -425,7 +424,7 @@
 ##
 # Outputs error  message about  too old wxWindows library and  exits with false.
 #
-function wrong_version() {
+wrong_version() {
 	cat<<EOF
 wxWindows library was found, but is too old for usage (v$wxversion_major.\
 $wxversion_minor.$wxversion_patch).  Please download