Update of /cvsroot/mahogany/M
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18619
Modified Files:
configure
Log Message:
regenerated again, with even newer (and this time correct) wxwin.m4
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.323
retrieving revision 1.324
diff -b -u -2 -r1.323 -r1.324
--- configure 16 Nov 2004 11:57:33 -0000 1.323
+++ configure 17 Nov 2004 08:57:33 -0000 1.324
@@ -4485,8 +4485,11 @@
WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
fi
+ if test "$cross_compiling" = "yes"; then
+ wx_config_args="$wx_config_args --host=$host_alias"
+ fi
if test -x "$WX_CONFIG_NAME" ; then
echo $ac_n "checking for wx-config""... $ac_c" 1>&6
-echo "configure:4491: checking for wx-config" >&5
+echo "configure:4494: checking for wx-config" >&5
WX_CONFIG_PATH="$WX_CONFIG_NAME"
echo "$ac_t""$WX_CONFIG_PATH" 1>&6
@@ -4495,5 +4498,5 @@
set dummy $WX_CONFIG_NAME; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4498: checking for $ac_word" >&5
+echo "configure:4501: 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
@@ -4532,13 +4535,17 @@
if test "$WX_CONFIG_PATH" != "no" ; then
WX_VERSION=""
- no_wx=""
min_wx_version=2.5.2
+ if test -z "" ; then
echo $ac_n "checking for wxWindows version >= $min_wx_version""... $ac_c"
1>&6
-echo "configure:4539: checking for wxWindows version >= $min_wx_version" >&5
+echo "configure:4542: checking for wxWindows version >= $min_wx_version" >&5
+ else
+ echo $ac_n "checking for wxWindows version >= $min_wx_version ()""...
$ac_c" 1>&6
+echo "configure:4545: checking for wxWindows version >= $min_wx_version ()" >&5
+ fi
- WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args"
+ WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args "
- WX_VERSION=`$WX_CONFIG_WITH_ARGS --version`
+ WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
wx_config_major_version=`echo $WX_VERSION | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
@@ -4556,4 +4563,5 @@
wx_ver_ok=""
+ if test "x$WX_VERSION" != x ; then
if test $wx_config_major_version -gt $wx_requested_major_version; then
wx_ver_ok=yes
@@ -4571,15 +4579,19 @@
fi
fi
+ fi
- if test "x$wx_ver_ok" = x ; then
- no_wx=yes
- else
- if test "x" = "x" ; then
- wx_libs_arg="--libs"
+ if test -n "$wx_ver_ok"; then
+
+ echo "$ac_t""yes (version $WX_VERSION)" 1>&6
+ WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
+
+ echo $ac_n "checking for wxWindows static
library""... $ac_c" 1>&6
+echo "configure:4590: checking for wxWindows 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
else
- wx_libs_arg="--libs="
+ echo "$ac_t""yes" 1>&6
fi
- WX_LIBS=`$WX_CONFIG_WITH_ARGS $wx_libs_arg`
- WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static $wx_libs_arg 2>&1 >
/dev/null`
wx_has_cppflags=""
@@ -4615,10 +4627,9 @@
WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "[EMAIL PROTECTED] *@@"`
fi
- fi
- if test "x$no_wx" = x ; then
- echo "$ac_t""yes (version $WX_VERSION)" 1>&6
wxOK=1
+
else
+
if test "x$WX_VERSION" = x; then
echo "$ac_t""no" 1>&6
@@ -4633,4 +4644,5 @@
WX_LIBS_STATIC=""
:
+
fi
fi
@@ -4681,5 +4693,5 @@
set dummy SetFile; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4684: checking for $ac_word" >&5
+echo "configure:4696: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SETFILE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4727,5 +4739,5 @@
case "$USE_THREADS" in 1)
echo $ac_n "checking if wxWindows was compiled with threads""... $ac_c"
1>&6
-echo "configure:4730: checking if wxWindows was compiled with threads" >&5
+echo "configure:4742: 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
@@ -4735,5 +4747,5 @@
else
cat > conftest.$ac_ext <<EOF
-#line 4738 "configure"
+#line 4750 "configure"
#include "confdefs.h"
#include "wx/setup.h"
@@ -4746,5 +4758,5 @@
}
EOF
-if { (eval echo configure:4749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4761: \"$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
@@ -4782,5 +4794,5 @@
linux* | Linux*)
echo $ac_n "checking for pam_end in -lpam""... $ac_c" 1>&6
-echo "configure:4785: checking for pam_end in -lpam" >&5
+echo "configure:4797: 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
@@ -4790,5 +4802,5 @@
LIBS="-lpam $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4793 "configure"
+#line 4805 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4801,5 +4813,5 @@
; return 0; }
EOF
-if { (eval echo configure:4804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:4816: \"$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"
@@ -4829,5 +4841,5 @@
case "$USE_CCOSTYPE" in
''|0|1) echo $ac_n "checking for c-client library OS type""... $ac_c"
1>&6
-echo "configure:4832: checking for c-client library OS type" >&5
+echo "configure:4844: checking for c-client library OS type" >&5
case "$OSTYPE" in
linux* | Linux*)
@@ -4888,15 +4900,15 @@
ac_safe=`echo "pi-source.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for pi-source.h""... $ac_c" 1>&6
-echo "configure:4891: checking for pi-source.h" >&5
+echo "configure:4903: 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 4896 "configure"
+#line 4908 "configure"
#include "confdefs.h"
#include <pi-source.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4913: \"$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
@@ -4915,5 +4927,5 @@
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lpisock""... $ac_c" 1>&6
-echo "configure:4918: checking for main in -lpisock" >&5
+echo "configure:4930: 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
@@ -4923,5 +4935,5 @@
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4926 "configure"
+#line 4938 "configure"
#include "confdefs.h"
@@ -4930,5 +4942,5 @@
; return 0; }
EOF
-if { (eval echo configure:4933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:4945: \"$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"
@@ -4951,5 +4963,5 @@
MAKE_PISOCKLIB="PISOCK_LIB:=-lpisock"
echo $ac_n "checking for pi_setmaxspeed in -lpisock""... $ac_c" 1>&6
-echo "configure:4954: checking for pi_setmaxspeed in -lpisock" >&5
+echo "configure:4966: 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
@@ -4959,5 +4971,5 @@
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4962 "configure"
+#line 4974 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4970,5 +4982,5 @@
; return 0; }
EOF
-if { (eval echo configure:4973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:4985: \"$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"
@@ -4995,5 +5007,5 @@
echo $ac_n "checking for pi_accept_to in -lpisock""... $ac_c" 1>&6
-echo "configure:4998: checking for pi_accept_to in -lpisock" >&5
+echo "configure:5010: 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
@@ -5003,5 +5015,5 @@
LIBS="-lpisock $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5006 "configure"
+#line 5018 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -5014,5 +5026,5 @@
; return 0; }
EOF
-if { (eval echo configure:5017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:5029: \"$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"
@@ -5060,5 +5072,5 @@
*)
echo $ac_n "checking for libmal in lib""... $ac_c" 1>&6
-echo "configure:5063: checking for libmal in lib" >&5
+echo "configure:5075: 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
@@ -5079,15 +5091,15 @@
ac_safe=`echo "sqlite.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sqlite.h""... $ac_c" 1>&6
-echo "configure:5082: checking for sqlite.h" >&5
+echo "configure:5094: checking for sqlite.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 5087 "configure"
+#line 5099 "configure"
#include "confdefs.h"
#include <sqlite.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5104: \"$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
@@ -5106,5 +5118,5 @@
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lsqlite""... $ac_c" 1>&6
-echo "configure:5109: checking for main in -lsqlite" >&5
+echo "configure:5121: checking for main in -lsqlite" >&5
ac_lib_var=`echo sqlite'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -5114,5 +5126,5 @@
LIBS="-lsqlite $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5117 "configure"
+#line 5129 "configure"
#include "confdefs.h"
@@ -5121,5 +5133,5 @@
; return 0; }
EOF
-if { (eval echo configure:5124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
test -s conftest${ac_exeext}; then
+if { (eval echo configure:5136: \"$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"
@@ -5189,5 +5201,5 @@
auto|Auto|AUTO|1)
echo $ac_n "checking how to link modules""... $ac_c" 1>&6
-echo "configure:5192: checking how to link modules" >&5
+echo "configure:5204: checking how to link modules" >&5
if test "$USE_MAC" = 0; then
LDD="ldd"
@@ -5241,5 +5253,5 @@
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5244: checking for $ac_word" >&5
+echo "configure:5256: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5276,5 +5288,5 @@
set dummy latex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5279: checking for $ac_word" >&5
+echo "configure:5291: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5311,5 +5323,5 @@
set dummy makeindex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5314: checking for $ac_word" >&5
+echo "configure:5326: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MAKEINDEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5346,5 +5358,5 @@
set dummy dvips; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5349: checking for $ac_word" >&5
+echo "configure:5361: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_DVIPS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5381,5 +5393,5 @@
set dummy ps2pdf; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5384: checking for $ac_word" >&5
+echo "configure:5396: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PSTOPDF'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5416,5 +5428,5 @@
set dummy latex2html; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5419: checking for $ac_word" >&5
+echo "configure:5431: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LATEX2HTML'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5511,5 +5523,5 @@
if test "x$GXX" != "xyes"; then
echo $ac_n "checking whether ${CXX} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5514: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
+echo "configure:5526: 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
@@ -5534,5 +5546,5 @@
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c"
1>&6
-echo "configure:5537: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5549: 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: InterSystems CACHE
FREE OODBMS DOWNLOAD - A multidimensional database that combines
robust object and relational technologies, making it a perfect match
for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
