Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv15658
Modified Files:
CREDITS INSTALL configure.in
Log Message:
wxWindows -> wxWidgets
Index: CREDITS
===================================================================
RCS file: /cvsroot/mahogany/M/CREDITS,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -u -2 -r1.10 -r1.11
--- CREDITS 17 Aug 2003 21:43:47 -0000 1.10
+++ CREDITS 31 Jul 2006 00:32:44 -0000 1.11
@@ -74,5 +74,5 @@
====================
-wxWindows:
+wxWidgets:
Julian Smart
Index: INSTALL
===================================================================
RCS file: /cvsroot/mahogany/M/INSTALL,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- INSTALL 9 May 2005 00:33:19 -0000 1.6
+++ INSTALL 31 Jul 2006 00:32:44 -0000 1.7
@@ -3,5 +3,5 @@
Audience: Mahogany developers and end users
Author: Vadim Zeitlin <[EMAIL PROTECTED]>
-Last modified: 2004-07-13
+Last modified: 2006-07-31
Version: accurate for 0.67 release
@@ -32,7 +32,5 @@
Required software:
- - wxGTK (GTK+ port of wxWindows) 2.5.2 or above (note that 2.5.3
- is not yet released as of time of this writing but if it is
- when you read this, do use it)
+ - wxGTK (GTK+ port of wxWidgets) 2.6.0 or above.
- GTK+ 1.2.3 or above, 1.2.10 recommended. Mahogany can also be
@@ -40,5 +38,5 @@
experimental.
- - GNU make: both wxWindows and Mahogany may be compiled with many
+ - GNU make: both wxWidgets and Mahogany may be compiled with many
different C++ compilers (i.e. not only g++) but they both
require GNU make, please install it if you don't have it yet
@@ -84,11 +82,11 @@
-1. Compilation of wxWindows
+1. Compilation of wxWidgets
---------------------------
Before you can compile Mahogany, you will need to have installed
-wxWindows compiled for the GTK library (wxGTK).
+wxWidgets compiled for the GTK library (wxGTK).
-The recommended way to build wxWindows is (from the directory where
+The recommended way to build wxWidgets is (from the directory where
it was unpacked):
@@ -103,5 +101,5 @@
If you encounter fatal problems with Mahogany, please try rebuilding
-wxWindows in debug mode:
+wxWidgets in debug mode:
mkdir debug_build_dir
@@ -128,8 +126,8 @@
The --with-wxdir allows you to use a not installed version of
-wxWindows. You may also add other configure options, of course.
+wxWidgets. You may also add other configure options, of course.
If you use --enable-debug please use --with-wxdir=debug_build_dir,
i.e. always build debug version of Mahogany with debug version of
-wxWindows.
+wxWidgets.
Depending on whether you have installed all required programs in the
Index: configure.in
===================================================================
RCS file: /cvsroot/mahogany/M/configure.in,v
retrieving revision 1.316
retrieving revision 1.317
diff -b -u -2 -r1.316 -r1.317
--- configure.in 3 May 2006 20:16:04 -0000 1.316
+++ configure.in 31 Jul 2006 00:32:44 -0000 1.317
@@ -90,5 +90,5 @@
*)
M_OVERRIDES(wxdebug,wxWin debug libs,USE_WXDEBUG,0,
- --with-wxdebug use debug wxWindows libraries)
+ --with-wxdebug use debug wxWidgets libraries)
M_OVERRIDES(dmalloc,dmalloc library,USE_DMALLOC,0,
@@ -356,12 +356,12 @@
then workarroundmsg="
It seems you are using Red Hat Linux 7.0. A workaround for your
- problem is to use egcs to compile wxWindows and Mahogany:
+ problem is to use egcs to compile wxWidgets and Mahogany:
- at your bash prompt type:
export CC=egcs
export CXX=egcs++
- - reconfigure and rebuild wxWindows and Mahogany
+ - reconfigure and rebuild wxWidgets and Mahogany
(don't forget to remove the config.cache files
located in the source code directories of
- wxWindows and Mahogany before reconfiguring them."
+ wxWidgets and Mahogany before reconfiguring them."
else workarroundmsg=""
fi
@@ -928,16 +928,16 @@
dnl --------------------------------------------------------------------------
-dnl check for wxWindows installation¤
+dnl check for wxWidgets installation¤
AM_PATH_WXCONFIG(2.5.2,wxOK=1)
if test "$wxOK" != 1; then
AC_MSG_ERROR([
- Mahogany requires wxWindows to be installed on your system
+ Mahogany requires wxWidgets to be installed on your system
but wx-config script couldn't be found.
Please check that wx-config is in PATH, the directory
- where wxWindows libraries are installed (returned by
+ where wxWidgets libraries are installed (returned by
'wx-config --libs' command) is in LD_LIBRARY_PATH or
- equivalent variable and wxWindows version is 2.5.2 or above.
+ equivalent variable and wxWidgets version is 2.5.2 or above.
])
fi
@@ -977,5 +977,5 @@
fi
-dnl we want to have a user-readable wxWindows port name
+dnl we want to have a user-readable wxWidgets port name
WX_NAME=`$WX_CONFIG_WITH_ARGS --basename | sed 's/^wx_//'`
WX_NAME_NO_DEBUG=`echo $WX_NAME | sed 's/d$//'`
@@ -985,5 +985,5 @@
case "$USE_THREADS" in 1)
- AC_CACHE_CHECK(if wxWindows was compiled with threads,
+ AC_CACHE_CHECK(if wxWidgets was compiled with threads,
m_cv_wx_threads,
[AC_TRY_RUN([#include "wx/setup.h"
@@ -1514,5 +1514,5 @@
echo "Configured Mahogany
${M_VERSION_MAJOR}.${M_VERSION_MINOR}.${M_VERSION_RELEASE} for ${host}."
echo ""
-echo " wxWindows port used: ${WX_NAME} ${WX_VERSION}"
+echo " wxWidgets port used: ${WX_NAME} ${WX_VERSION}"
echo " Debug mode: ${debug_option}"
echo " SSL support: ${ssl_option}"
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
