Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1:/tmp/cvs-serv6173
Modified Files:
configure configure.in
Log Message:
show wxWindows port used, not only its version
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.313
retrieving revision 1.314
diff -b -u -2 -r1.313 -r1.314
--- configure 6 Jan 2004 00:24:17 -0000 1.313
+++ configure 10 Jan 2004 18:46:44 -0000 1.314
@@ -567,5 +567,5 @@
-# From configure.in Id: configure.in,v 1.299 2004/01/05 22:48:53 vadz Exp
+# From configure.in Id: configure.in,v 1.300 2004/01/06 00:24:17 vadz Exp
rm -f conftestdata
@@ -1507,54 +1507,32 @@
-
- echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
[...1285 lines suppressed...]
if test "x$GXX" != "xyes"; then
echo $ac_n "checking whether ${CXX} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5379: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
+echo "configure:5363: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
if eval "test \"`echo '$''{'m_cv_cxx_depflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5399,5 +5383,5 @@
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5402: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5386: checking whether ${CC} accepts ${DEPFLAGS}" >&5
if eval "test \"`echo '$''{'m_cv_c_depflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5941,5 +5925,5 @@
echo "Configured Mahogany ${M_VERSION_MAJOR}.${M_VERSION_MINOR}.${M_VERSION_RELEASE}
for ${host}."
echo ""
-echo " wxWindows version used: ${WX_VERSION}"
+echo " wxWindows port used: ${WX_NAME} ${WX_VERSION}"
echo " Debug mode: ${debug_option}"
echo " SSL support: ${ssl_option}"
Index: configure.in
===================================================================
RCS file: /cvsroot/mahogany/M/configure.in,v
retrieving revision 1.300
retrieving revision 1.301
diff -b -u -2 -r1.300 -r1.301
--- configure.in 6 Jan 2004 00:24:17 -0000 1.300
+++ configure.in 10 Jan 2004 18:46:44 -0000 1.301
@@ -954,8 +954,10 @@
fi
-dnl set all flags
+dnl set all flags: notice that currently (as of version 2.5.1)
+dnl WX_CXXFLAGS_ONLY does not include C flags but we do need them for C++
+dnl files compilation as well
CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
-CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+CXXFLAGS="$CXXFLAGS $WX_CFLAGS_ONLY $WX_CXXFLAGS_ONLY"
dnl normal linking mode is fully dynamic
@@ -986,4 +988,11 @@
fi
+dnl we want to have a user-readable wxWindows port name
+WX_NAME=`$WX_CONFIG_WITH_ARGS --basename | sed 's/^wx_//'`
+WX_NAME_NO_DEBUG=`echo $WX_NAME | sed 's/d$//'`
+if test "$WX_NAME_NO_DEBUG" != "$WX_NAME"; then
+ WX_NAME="$WX_NAME_NO_DEBUG (debug build)"
+fi
+
case "$USE_THREADS" in 1)
AC_CACHE_CHECK(if wxWindows was compiled with threads,
@@ -1440,5 +1449,5 @@
echo "Configured Mahogany ${M_VERSION_MAJOR}.${M_VERSION_MINOR}.${M_VERSION_RELEASE}
for ${host}."
echo ""
-echo " wxWindows version used: ${WX_VERSION}"
+echo " wxWindows port used: ${WX_NAME} ${WX_VERSION}"
echo " Debug mode: ${debug_option}"
echo " SSL support: ${ssl_option}"
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
