Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1:/tmp/cvs-serv10410
Modified Files:
configure
Log Message:
require wxWindows at least 2.5.1
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.307
retrieving revision 1.308
diff -b -u -2 -r1.307 -r1.308
--- configure 22 Sep 2003 00:51:42 -0000 1.307
+++ configure 9 Oct 2003 22:50:13 -0000 1.308
@@ -567,5 +567,5 @@
-# From configure.in Id: configure.in,v 1.294 2003/09/15 13:37:34 mlivingstone Exp
+# From configure.in Id: configure.in,v 1.295 2003/10/09 22:43:36 vadz Exp
rm -f conftestdata
@@ -2798,5 +2798,5 @@
if test "$USE_WXDEBUG" = 1; then
USE_OPT=0
- WX_CONFIG_NAME="wxgtkd-2.4-config"
+ WX_CONFIG_NAME="wxgtkd-2.5-config"
fi
@@ -4576,5 +4576,5 @@
no_wx=""
- min_wx_version=2.4.0
+ min_wx_version=2.5.1
echo $ac_n "checking for wxWindows version >= $min_wx_version""... $ac_c" 1>&6
echo "configure:4581: checking for wxWindows version >= $min_wx_version" >&5
@@ -4617,11 +4617,6 @@
no_wx=yes
else
- if test "x" = "x" ; then
- wx_libs_arg="--libs"
- else
- wx_libs_arg="--libs="
- fi
- WX_LIBS=`$WX_CONFIG_WITH_ARGS $wx_libs_arg`
- WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static $wx_libs_arg`
+ WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
+ WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs`
wx_has_cppflags=""
@@ -4696,5 +4691,5 @@
where wxWindows libraries are installed (returned by
'wx-config --libs' command) is in LD_LIBRARY_PATH or
- equivalent variable and wxWindows version is 2.4.0 or above.
+ equivalent variable and wxWindows version is 2.5.1 or above.
" 1>&2; exit 1; }
fi
@@ -4723,5 +4718,5 @@
set dummy SetFile; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4726: checking for $ac_word" >&5
+echo "configure:4721: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SETFILE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4763,5 +4758,5 @@
case "$USE_THREADS" in 1)
echo $ac_n "checking if wxWindows was compiled with threads""... $ac_c" 1>&6
-echo "configure:4766: checking if wxWindows was compiled with threads" >&5
+echo "configure:4761: checking if wxWindows was compiled with threads" >&5
if eval "test \"`echo '$''{'m_cv_wx_threads'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4771,5 +4766,5 @@
else
cat > conftest.$ac_ext <<EOF
-#line 4774 "configure"
+#line 4769 "configure"
#include "confdefs.h"
#include "wx/setup.h"
@@ -4782,5 +4777,5 @@
}
EOF
-if { (eval echo configure:4785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4780: \"$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
@@ -4818,5 +4813,5 @@
linux* | Linux*)
echo $ac_n "checking for pam_end in -lpam""... $ac_c" 1>&6
-echo "configure:4821: checking for pam_end in -lpam" >&5
+echo "configure:4816: 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
@@ -4826,5 +4821,5 @@
LIBS="-lpam $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4829 "configure"
+#line 4824 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4837,5 +4832,5 @@
; return 0; }
EOF
-if { (eval echo configure:4840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:4835: \"$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"
@@ -4865,5 +4860,5 @@
case "$USE_CCOSTYPE" in
''|0|1) echo $ac_n "checking for c-client library OS type""... $ac_c" 1>&6
-echo "configure:4868: checking for c-client library OS type" >&5
+echo "configure:4863: checking for c-client library OS type" >&5
case "$OSTYPE" in
linux* | Linux*)
@@ -4924,15 +4919,15 @@
ac_safe=`echo "pi-source.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for pi-source.h""... $ac_c" 1>&6
-echo "configure:4927: checking for pi-source.h" >&5
+echo "configure:4922: 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 4932 "configure"
+#line 4927 "configure"
#include "confdefs.h"
#include <pi-source.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4932: \"$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
@@ -4951,5 +4946,5 @@
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lpisock""... $ac_c" 1>&6
-echo "configure:4954: checking for main in -lpisock" >&5
+echo "configure:4949: 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
@@ -4959,5 +4954,5 @@
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4962 "configure"
+#line 4957 "configure"
#include "confdefs.h"
@@ -4966,5 +4961,5 @@
; return 0; }
EOF
-if { (eval echo configure:4969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:4964: \"$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"
@@ -4987,5 +4982,5 @@
MAKE_PISOCKLIB="PISOCK_LIB:=-lpisock"
echo $ac_n "checking for pi_setmaxspeed in -lpisock""... $ac_c" 1>&6
-echo "configure:4990: checking for pi_setmaxspeed in -lpisock" >&5
+echo "configure:4985: 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
@@ -4995,5 +4990,5 @@
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4998 "configure"
+#line 4993 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -5006,5 +5001,5 @@
; return 0; }
EOF
-if { (eval echo configure:5009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:5004: \"$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"
@@ -5031,5 +5026,5 @@
echo $ac_n "checking for pi_accept_to in -lpisock""... $ac_c" 1>&6
-echo "configure:5034: checking for pi_accept_to in -lpisock" >&5
+echo "configure:5029: 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
@@ -5039,5 +5034,5 @@
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5042 "configure"
+#line 5037 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -5050,5 +5045,5 @@
; return 0; }
EOF
-if { (eval echo configure:5053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo configure:5048: \"$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"
@@ -5096,5 +5091,5 @@
*)
echo $ac_n "checking for libmal in extra/src""... $ac_c" 1>&6
-echo "configure:5099: checking for libmal in extra/src" >&5
+echo "configure:5094: checking for libmal in extra/src" >&5
if test ! -d $srcdir/extra/src/libmal
then echo "$ac_t""not found - no MAL synch for PalmOS" 1>&6
@@ -5142,5 +5137,5 @@
auto|Auto|AUTO|1)
echo $ac_n "checking how to link modules""... $ac_c" 1>&6
-echo "configure:5145: checking how to link modules" >&5
+echo "configure:5140: checking how to link modules" >&5
if test "$USE_MAC" = 0; then
LDD="ldd"
@@ -5194,5 +5189,5 @@
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5197: checking for $ac_word" >&5
+echo "configure:5192: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5229,5 +5224,5 @@
set dummy latex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5232: checking for $ac_word" >&5
+echo "configure:5227: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5264,5 +5259,5 @@
set dummy makeindex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5267: checking for $ac_word" >&5
+echo "configure:5262: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MAKEINDEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5299,5 +5294,5 @@
set dummy dvips; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5302: checking for $ac_word" >&5
+echo "configure:5297: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_DVIPS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5334,5 +5329,5 @@
set dummy ps2pdf; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5337: checking for $ac_word" >&5
+echo "configure:5332: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PSTOPDF'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5369,5 +5364,5 @@
set dummy latex2html; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5372: checking for $ac_word" >&5
+echo "configure:5367: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX2HTML'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5464,5 +5459,5 @@
if test "x$GXX" != "xyes"; then
echo $ac_n "checking whether ${CXX} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5467: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
+echo "configure:5462: 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
@@ -5487,5 +5482,5 @@
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5490: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5485: 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
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
