Revision: 7233
http://svn.sourceforge.net/mahogany/?rev=7233&view=rev
Author: vadz
Date: 2007-04-03 08:02:16 -0700 (Tue, 03 Apr 2007)
Log Message:
-----------
require wx 2.8.4+ (because of wxString::char_str())
Modified Paths:
--------------
trunk/M/configure
trunk/M/configure.in
Modified: trunk/M/configure
===================================================================
--- trunk/M/configure 2007-04-03 14:27:22 UTC (rev 7232)
+++ trunk/M/configure 2007-04-03 15:02:16 UTC (rev 7233)
@@ -568,7 +568,7 @@
fi
-# From configure.in Id: configure.in 7221 2007-04-03 00:40:35Z vadz
+# From configure.in Id: configure.in 7222 2007-04-03 01:08:07Z vadz
rm -f conftestdata
if ln -s X conftestdata 2>/dev/null
@@ -4237,6 +4237,7 @@
esac
+MIN_WX_VERSION=2.8.4
if test x${WX_CONFIG_NAME+set} != xset ; then
@@ -4261,14 +4262,14 @@
if test -x "$WX_CONFIG_NAME" ; then
echo $ac_n "checking for wx-config""... $ac_c" 1>&6
-echo "configure:4265: checking for wx-config" >&5
+echo "configure:4266: checking for wx-config" >&5
WX_CONFIG_PATH="$WX_CONFIG_NAME"
echo "$ac_t""$WX_CONFIG_PATH" 1>&6
else
# Extract the first word of "$WX_CONFIG_NAME", so it can be a program
name with args.
set dummy $WX_CONFIG_NAME; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4272: checking for $ac_word" >&5
+echo "configure:4273: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_WX_CONFIG_PATH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4306,13 +4307,13 @@
if test "$WX_CONFIG_PATH" != "no" ; then
WX_VERSION_FULL=""
- min_wx_version=2.7.2
+ min_wx_version=$MIN_WX_VERSION
if test -z "--unicode=no --debug=$debug_option" ; then
echo $ac_n "checking for wxWidgets version >= $min_wx_version""...
$ac_c" 1>&6
-echo "configure:4313: checking for wxWidgets version >= $min_wx_version" >&5
+echo "configure:4314: checking for wxWidgets version >= $min_wx_version" >&5
else
echo $ac_n "checking for wxWidgets version >= $min_wx_version
(--unicode=no --debug=$debug_option)""... $ac_c" 1>&6
-echo "configure:4316: checking for wxWidgets version >= $min_wx_version
(--unicode=no --debug=$debug_option)" >&5
+echo "configure:4317: checking for wxWidgets version >= $min_wx_version
(--unicode=no --debug=$debug_option)" >&5
fi
WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args --unicode=no
--debug=$debug_option adv,base,core,html,net,qa"
@@ -4359,7 +4360,7 @@
WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
echo $ac_n "checking for wxWidgets static
library""... $ac_c" 1>&6
-echo "configure:4363: checking for wxWidgets static library" >&5
+echo "configure:4364: checking for wxWidgets static library" >&5
WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
if test "x$WX_LIBS_STATIC" = "x"; then
echo "$ac_t""no" 1>&6
@@ -4455,7 +4456,7 @@
If you still get this error, then check that 'wx-config' is
in path, the directory where wxWidgets libraries are installed
(returned by 'wx-config --libs' command) is in LD_LIBRARY_PATH
- or equivalent variable and wxWidgets version is 2.7.2 or above."
+ or equivalent variable and wxWidgets version is $MIN_WX_VERSION or above."
{ echo "configure: error: $wx_error_message" 1>&2; exit 1; }
@@ -4504,7 +4505,7 @@
Please check that wx-config is in PATH, the directory
where wxWidgets libraries are installed (returned by
'wx-config --libs' command) is in LD_LIBRARY_PATH or
- equivalent variable and wxWidgets version is 2.7.2 or above
+ equivalent variable and wxWidgets version is $MIN_WX_VERSION or above
and is available in $wxkind version.
" 1>&2; exit 1; }
fi
@@ -4532,7 +4533,7 @@
# Extract the first word of "SetFile", so it can be a program name with
args.
set dummy SetFile; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4536: checking for $ac_word" >&5
+echo "configure:4537: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SETFILE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4578,7 +4579,7 @@
case "$USE_THREADS" in 1)
echo $ac_n "checking if wxWidgets was compiled with threads""... $ac_c"
1>&6
-echo "configure:4582: checking if wxWidgets was compiled with threads" >&5
+echo "configure:4583: checking if wxWidgets was compiled with threads" >&5
if eval "test \"`echo '$''{'m_cv_wx_threads'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4586,7 +4587,7 @@
m_cv_wx_threads=x
else
cat > conftest.$ac_ext <<EOF
-#line 4590 "configure"
+#line 4591 "configure"
#include "confdefs.h"
#include "wx/setup.h"
int main(){
@@ -4597,7 +4598,7 @@
#endif
}
EOF
-if { (eval echo configure:4601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
m_cv_wx_threads=yes
else
@@ -4633,7 +4634,7 @@
case "$OSTYPE" in
linux* | Linux*)
echo $ac_n "checking for pam_end in -lpam""... $ac_c" 1>&6
-echo "configure:4637: checking for pam_end in -lpam" >&5
+echo "configure:4638: checking for pam_end in -lpam" >&5
ac_lib_var=`echo pam'_'pam_end | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4641,7 +4642,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpam $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4645 "configure"
+#line 4646 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4652,7 +4653,7 @@
pam_end()
; return 0; }
EOF
-if { (eval echo configure:4656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:4657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4680,7 +4681,7 @@
0)
case "$USE_CCOSTYPE" in
''|0|1) echo $ac_n "checking for c-client library OS type""... $ac_c"
1>&6
-echo "configure:4684: checking for c-client library OS type" >&5
+echo "configure:4685: checking for c-client library OS type" >&5
case "$OSTYPE" in
linux* | Linux*)
;; Solaris* | solaris* | SunOS*)
@@ -4741,17 +4742,17 @@
1)
ac_safe=`echo "pi-source.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for pi-source.h""... $ac_c" 1>&6
-echo "configure:4745: checking for pi-source.h" >&5
+echo "configure:4746: checking for pi-source.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4750 "configure"
+#line 4751 "configure"
#include "confdefs.h"
#include <pi-source.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4768,7 +4769,7 @@
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lpisock""... $ac_c" 1>&6
-echo "configure:4772: checking for main in -lpisock" >&5
+echo "configure:4773: checking for main in -lpisock" >&5
ac_lib_var=`echo pisock'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4776,14 +4777,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4780 "configure"
+#line 4781 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:4787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4804,7 +4805,7 @@
MAKE_PISOCKLIB="PISOCK_LIB:=-lpisock"
echo $ac_n "checking for pi_setmaxspeed in -lpisock""... $ac_c" 1>&6
-echo "configure:4808: checking for pi_setmaxspeed in -lpisock" >&5
+echo "configure:4809: checking for pi_setmaxspeed in -lpisock" >&5
ac_lib_var=`echo pisock'_'pi_setmaxspeed | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4812,7 +4813,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4816 "configure"
+#line 4817 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4823,7 +4824,7 @@
pi_setmaxspeed()
; return 0; }
EOF
-if { (eval echo configure:4827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:4828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4848,7 +4849,7 @@
fi
echo $ac_n "checking for pi_accept_to in -lpisock""... $ac_c" 1>&6
-echo "configure:4852: checking for pi_accept_to in -lpisock" >&5
+echo "configure:4853: checking for pi_accept_to in -lpisock" >&5
ac_lib_var=`echo pisock'_'pi_accept_to | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4856,7 +4857,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4860 "configure"
+#line 4861 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4867,7 +4868,7 @@
pi_accept_to()
; return 0; }
EOF
-if { (eval echo configure:4871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:4872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4913,7 +4914,7 @@
'') ;;
*)
echo $ac_n "checking for libmal in lib""... $ac_c" 1>&6
-echo "configure:4917: checking for libmal in lib" >&5
+echo "configure:4918: checking for libmal in lib" >&5
if test ! -d $srcdir/lib/libmal
then echo "$ac_t""not found - no MAL synch for PalmOS" 1>&6
elif test -f $srcdir/lib/libmal/Makefile.in \
@@ -4971,7 +4972,7 @@
;;
auto|Auto|AUTO|1)
echo $ac_n "checking how to link modules""... $ac_c" 1>&6
-echo "configure:4975: checking how to link modules" >&5
+echo "configure:4976: checking how to link modules" >&5
if test "$USE_MAC" = 0; then
LDD="ldd"
else
@@ -5028,7 +5029,7 @@
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5032: checking for $ac_word" >&5
+echo "configure:5033: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5063,7 +5064,7 @@
# Extract the first word of "latex", so it can be a program name with args.
set dummy latex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5067: checking for $ac_word" >&5
+echo "configure:5068: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5098,7 +5099,7 @@
# Extract the first word of "makeindex", so it can be a program name with args.
set dummy makeindex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5102: checking for $ac_word" >&5
+echo "configure:5103: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MAKEINDEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5133,7 +5134,7 @@
# Extract the first word of "dvips", so it can be a program name with args.
set dummy dvips; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5137: checking for $ac_word" >&5
+echo "configure:5138: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_DVIPS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5168,7 +5169,7 @@
# Extract the first word of "ps2pdf", so it can be a program name with args.
set dummy ps2pdf; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5172: checking for $ac_word" >&5
+echo "configure:5173: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PSTOPDF'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5203,7 +5204,7 @@
# Extract the first word of "latex2html", so it can be a program name with
args.
set dummy latex2html; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5207: checking for $ac_word" >&5
+echo "configure:5208: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX2HTML'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5271,7 +5272,7 @@
IMAP_CFLAGS="$CFLAGS $IMAP_CFLAGS"
echo $ac_n "checking whether $CC accepts -Wno-pointer-sign""... $ac_c" 1>&6
-echo "configure:5275: checking whether $CC accepts -Wno-pointer-sign" >&5
+echo "configure:5276: checking whether $CC accepts -Wno-pointer-sign" >&5
if eval "test \"`echo '$''{'m_cv_cc_no_warn_ptr_sign'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5296,7 +5297,7 @@
IMAP_CFLAGS="$IMAP_CFLAGS -Wno-pointer-sign"
fi
echo $ac_n "checking whether $CC accepts -Wno-pointer-to-int-cast""... $ac_c"
1>&6
-echo "configure:5300: checking whether $CC accepts -Wno-pointer-to-int-cast"
>&5
+echo "configure:5301: checking whether $CC accepts -Wno-pointer-to-int-cast"
>&5
if eval "test \"`echo '$''{'m_cv_cc_no_warn_ptr_to_int_cast'+set}'`\" = set";
then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5372,7 +5373,7 @@
if test "x$DEPFLAGS" != "x"; then
if test "x$GXX" != "xyes"; then
echo $ac_n "checking whether ${CXX} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5376: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
+echo "configure:5377: 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
else
@@ -5395,7 +5396,7 @@
if test "x$DEPFLAGS" != "x"; then
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c"
1>&6
-echo "configure:5399: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5400: 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
else
Modified: trunk/M/configure.in
===================================================================
--- trunk/M/configure.in 2007-04-03 14:27:22 UTC (rev 7232)
+++ trunk/M/configure.in 2007-04-03 15:02:16 UTC (rev 7233)
@@ -932,7 +932,8 @@
dnl --------------------------------------------------------------------------
dnl check for wxWidgets installation\xA4
-AM_PATH_WXCONFIG(2.7.2, [wxOK=1],, [adv,base,core,html,net,qa],
+MIN_WX_VERSION=2.8.4
+AM_PATH_WXCONFIG($MIN_WX_VERSION, [wxOK=1],, [adv,base,core,html,net,qa],
[--unicode=no --debug=$debug_option])
if test "$wxOK" != 1; then
@@ -949,7 +950,7 @@
Please check that wx-config is in PATH, the directory
where wxWidgets libraries are installed (returned by
'wx-config --libs' command) is in LD_LIBRARY_PATH or
- equivalent variable and wxWidgets version is 2.7.2 or above
+ equivalent variable and wxWidgets version is $MIN_WX_VERSION or above
and is available in $wxkind version.
])
fi
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
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
