[XaraXtreme-dev] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 697
Date       : Mon Mar 20 21:21:58 GMT 2006

Changed paths:
   M /Trunk/XaraLX/configure.in

Unbreak build on Linux (test & grep don't work like that) - hopefully not breaking the Mac
Fix version reporting for wxWindows
Add output for __WXGTK__ detection
Set minimum version for wxWidgets to 2.6.3 now 2.6.3-rc2 is available and reports itself as 2.6.3 (thus simplifying no end of hackery to support 2.6.1,2)


Diff:
Index: Trunk/XaraLX/configure.in
===================================================================
--- Trunk/XaraLX/configure.in	(revision 696)
+++ Trunk/XaraLX/configure.in	(revision 697)
@@ -115,7 +115,7 @@
 
 # Verify minimus requires
 vers=`echo $wxversion | $AWK 'BEGIN { FS = "."; } { printf "% d", ($1 * 1000 + $2) * 1000 + $3;}'`
-if test -n "$vers" && test "$vers" -ge 2006001; then
+if test -n "$vers" && test "$vers" -ge 2006003; then
 	WX_CPPFLAGS="`$WXCONFIG --static=$StaticEnable --debug=$DebugEnable --unicode=yes --cppflags`"
 	WX_CXXFLAGS="`$WXCONFIG --static=$StaticEnable --debug=$DebugEnable --unicode=yes --cxxflags | sed -e 's/-fno-exceptions//'`"
 	WX_LIBS="`$WXCONFIG --static=$StaticEnable --debug=$DebugEnable --unicode=yes --libs`"
@@ -123,13 +123,17 @@
 	
 	# See if we are running on GTK
 	WX_GTK="no"
-	if test `echo $WX_CPPFLAGS | grep *__WXGTK__*`; then 
+	AC_MSG_CHECKING([wxWidgets GTK usage])
+	if echo $WX_CPPFLAGS | grep -q '__WXGTK__' ; then 
 		WX_GTK="yes"
+		AC_MSG_RESULT([found])
 		PKG_CHECK_MODULES(GTK, [gtk+-2.0])
+	else
+		AC_MSG_RESULT([not found])
 	fi
 
 else
-	AC_MSG_ERROR([wxWidgets 2.6.1 or newer is required])
+	AC_MSG_ERROR([wxWidgets 2.6.3 or newer is required (2.6.3-rc2 will do)])
 fi
 
 TOPDIR=$srcdir;


Xara