Update of /cvsroot/sharedaemon/ui-wx
In directory sc8-pr-cvs1:/tmp/cvs-serv4802
Modified Files:
configure
Log Message:
Now detects wx2.5.1 (for sizer patch)
Index: configure
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure 12 Dec 2003 10:36:10 -0000 1.3
+++ configure 12 Dec 2003 20:30:19 -0000 1.4
@@ -89,6 +89,24 @@
echo -e "${colour_no}no${colour_default}";
wrong_version;
fi;
+
+ if test $patch_sizer = 0; then
+ if test $wxversion_major = 2; then
+ if test $wxversion_minor -ge 5; then
+ if test $wxversion_patch -ge 1; then
+ patch_sizer=1;
+ fi;
+ fi;
+ elif test $wxversion_major = 3; then
+ patch_sizer=1;
+ fi;
+ 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-sizer.${colour_default}";
+ fi;
}
##
@@ -98,7 +116,7 @@
echo -e -n "checking if wxWindows was linked against GTK2...";
if $wxconfig --cppflags | grep -q 'gtk2' ; then
echo -e "${colour_no}yes${colour_default}";
- echo -e "\t${colour_warning}GTK2 support in wxWindows is currently only experimental,${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 risc.${colour_default}";
else
@@ -160,6 +178,10 @@
echo "FLAGCOLOR =\33[37;1m" >> src/Makefile
fi;
+ if test $patch_sizer = 1; then
+ cppflags="$cppflags -D__HAVE_REMOVE_GROWABLE_COL__"
+ fi;
+
sed -e "\
s#@CXX@#$ccache `$wxconfig --cxx`#; \
s#@CXX_FLAGS@#`$wxconfig --cxxflags`#; \
@@ -290,12 +312,8 @@
echo -e -n "checking for --has-patched-wxsizer\t\t";
if test $patch_sizer = 1; then
echo -e "${colour_yes}yes${colour_default}";
- cppflags="$cppflags -D__HAVE_REMOVE_GROWABLE_COL__"
else
echo -e "${colour_no}no${colour_default}";
- echo -e "\t${colour_warning}Warning: Sidebar hiding code will be disabled. To enable${colour_default}";
- echo -e "\t${colour_warning}it, patch wxWindows with flexgridsizer.patch, recompile${colour_default}";
- echo -e "\t${colour_warning}it and re-run this configure with --has-patched-sizer.${colour_default}";
fi;
echo -e -n "checking for --show-flags\t\t\t";
|
