From 17234b26448daee577d6c536cbe23a1301f3d959 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Wed, 17 Jul 2002 16:58:05 +0000 Subject: [PATCH] Allow compiling wxMotif/GTK/X11 for Cygwin/XFree git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 1505 +++++++++++++++++++++-------------------- configure.in | 68 +- include/wx/wxchar.h | 2 + src/common/dircmn.cpp | 4 +- src/common/filefn.cpp | 4 +- 5 files changed, 827 insertions(+), 756 deletions(-) diff --git a/configure b/configure index bf32a0e732..ade452ac5d 100755 --- a/configure +++ b/configure @@ -1311,33 +1311,7 @@ EOF ;; *-*-cygwin* | *-*-mingw32* ) - USE_UNIX=0 - USE_WIN32=1 - SO_SUFFIX=dll - cat >> confdefs.h <<\EOF -#define __WIN32__ 1 -EOF - - cat >> confdefs.h <<\EOF -#define __WIN95__ 1 -EOF - - cat >> confdefs.h <<\EOF -#define __WINDOWS__ 1 -EOF - - cat >> confdefs.h <<\EOF -#define __GNUWIN32__ 1 -EOF - - cat >> confdefs.h <<\EOF -#define STRICT 1 -EOF - - cat >> confdefs.h <<\EOF -#define WINVER 0x0400 -EOF - + SO_SUFFIX=dll PROGRAM_EXT=".exe" RESCOMP=windres DEFAULT_DEFAULT_wxUSE_MSW=1 @@ -1395,14 +1369,6 @@ EOF { echo "configure: error: unknown system type ${host}." 1>&2; exit 1; } esac -if test "$USE_UNIX" = 1 ; then - wxUSE_UNIX=yes - cat >> confdefs.h <<\EOF -#define __UNIX__ 1 -EOF - -fi - @@ -1777,7 +1743,7 @@ done echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6 -echo "configure:1781: checking for --enable-gui" >&5 +echo "configure:1747: checking for --enable-gui" >&5 no_cache=0 # Check whether --enable-gui or --disable-gui was given. if test "${enable_gui+set}" = set; then @@ -1819,7 +1785,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6 -echo "configure:1823: checking for --enable-universal" >&5 +echo "configure:1789: checking for --enable-universal" >&5 no_cache=0 # Check whether --enable-universal or --disable-universal was given. if test "${enable_universal+set}" = set; then @@ -1912,7 +1878,7 @@ fi echo $ac_n "checking for --enable-nanox""... $ac_c" 1>&6 -echo "configure:1916: checking for --enable-nanox" >&5 +echo "configure:1882: checking for --enable-nanox" >&5 no_cache=0 # Check whether --enable-nanox or --disable-nanox was given. if test "${enable_nanox+set}" = set; then @@ -1961,7 +1927,7 @@ fi echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6 -echo "configure:1965: checking for --with-libpng" >&5 +echo "configure:1931: checking for --with-libpng" >&5 no_cache=0 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then @@ -2012,7 +1978,7 @@ fi echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6 -echo "configure:2016: checking for --with-libjpeg" >&5 +echo "configure:1982: checking for --with-libjpeg" >&5 no_cache=0 # Check whether --with-libjpeg or --without-libjpeg was given. if test "${with_libjpeg+set}" = set; then @@ -2063,7 +2029,7 @@ fi echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6 -echo "configure:2067: checking for --with-libtiff" >&5 +echo "configure:2033: checking for --with-libtiff" >&5 no_cache=0 # Check whether --with-libtiff or --without-libtiff was given. if test "${with_libtiff+set}" = set; then @@ -2114,7 +2080,7 @@ fi echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6 -echo "configure:2118: checking for --with-opengl" >&5 +echo "configure:2084: checking for --with-opengl" >&5 no_cache=0 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then @@ -2156,7 +2122,7 @@ fi echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6 -echo "configure:2160: checking for --with-dmalloc" >&5 +echo "configure:2126: checking for --with-dmalloc" >&5 no_cache=0 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -2195,7 +2161,7 @@ fi echo $ac_n "checking for --with-regex""... $ac_c" 1>&6 -echo "configure:2199: checking for --with-regex" >&5 +echo "configure:2165: checking for --with-regex" >&5 no_cache=0 # Check whether --with-regex or --without-regex was given. if test "${with_regex+set}" = set; then @@ -2246,7 +2212,7 @@ fi echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6 -echo "configure:2250: checking for --with-zlib" >&5 +echo "configure:2216: checking for --with-zlib" >&5 no_cache=0 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -2297,7 +2263,7 @@ fi echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6 -echo "configure:2301: checking for --with-odbc" >&5 +echo "configure:2267: checking for --with-odbc" >&5 no_cache=0 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then @@ -2338,7 +2304,7 @@ fi echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6 -echo "configure:2342: checking for --enable-shared" >&5 +echo "configure:2308: checking for --enable-shared" >&5 no_cache=0 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then @@ -2377,7 +2343,7 @@ fi echo $ac_n "checking for --enable-soname""... $ac_c" 1>&6 -echo "configure:2381: checking for --enable-soname" >&5 +echo "configure:2347: checking for --enable-soname" >&5 no_cache=0 # Check whether --enable-soname or --disable-soname was given. if test "${enable_soname+set}" = set; then @@ -2416,7 +2382,7 @@ fi echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6 -echo "configure:2420: checking for --enable-optimise" >&5 +echo "configure:2386: checking for --enable-optimise" >&5 no_cache=0 # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then @@ -2455,7 +2421,7 @@ fi echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6 -echo "configure:2459: checking for --enable-debug" >&5 +echo "configure:2425: checking for --enable-debug" >&5 no_cache=0 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -2495,7 +2461,7 @@ fi echo $ac_n "checking for --enable-precomp""... $ac_c" 1>&6 -echo "configure:2499: checking for --enable-precomp" >&5 +echo "configure:2465: checking for --enable-precomp" >&5 no_cache=0 # Check whether --enable-precomp or --disable-precomp was given. if test "${enable_precomp+set}" = set; then @@ -2543,7 +2509,7 @@ fi echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6 -echo "configure:2547: checking for --enable-debug_flag" >&5 +echo "configure:2513: checking for --enable-debug_flag" >&5 no_cache=0 # Check whether --enable-debug_flag or --disable-debug_flag was given. if test "${enable_debug_flag+set}" = set; then @@ -2582,7 +2548,7 @@ fi echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6 -echo "configure:2586: checking for --enable-debug_info" >&5 +echo "configure:2552: checking for --enable-debug_info" >&5 no_cache=0 # Check whether --enable-debug_info or --disable-debug_info was given. if test "${enable_debug_info+set}" = set; then @@ -2621,7 +2587,7 @@ fi echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6 -echo "configure:2625: checking for --enable-debug_gdb" >&5 +echo "configure:2591: checking for --enable-debug_gdb" >&5 no_cache=0 # Check whether --enable-debug_gdb or --disable-debug_gdb was given. if test "${enable_debug_gdb+set}" = set; then @@ -2660,7 +2626,7 @@ fi echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6 -echo "configure:2664: checking for --enable-debug_cntxt" >&5 +echo "configure:2630: checking for --enable-debug_cntxt" >&5 no_cache=0 # Check whether --enable-debug_cntxt or --disable-debug_cntxt was given. if test "${enable_debug_cntxt+set}" = set; then @@ -2699,7 +2665,7 @@ fi echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6 -echo "configure:2703: checking for --enable-mem_tracing" >&5 +echo "configure:2669: checking for --enable-mem_tracing" >&5 no_cache=0 # Check whether --enable-mem_tracing or --disable-mem_tracing was given. if test "${enable_mem_tracing+set}" = set; then @@ -2738,7 +2704,7 @@ fi echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6 -echo "configure:2742: checking for --enable-profile" >&5 +echo "configure:2708: checking for --enable-profile" >&5 no_cache=0 # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then @@ -2777,7 +2743,7 @@ fi echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6 -echo "configure:2781: checking for --enable-no_rtti" >&5 +echo "configure:2747: checking for --enable-no_rtti" >&5 no_cache=0 # Check whether --enable-no_rtti or --disable-no_rtti was given. if test "${enable_no_rtti+set}" = set; then @@ -2816,7 +2782,7 @@ fi echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6 -echo "configure:2820: checking for --enable-no_exceptions" >&5 +echo "configure:2786: checking for --enable-no_exceptions" >&5 no_cache=0 # Check whether --enable-no_exceptions or --disable-no_exceptions was given. if test "${enable_no_exceptions+set}" = set; then @@ -2855,7 +2821,7 @@ fi echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6 -echo "configure:2859: checking for --enable-permissive" >&5 +echo "configure:2825: checking for --enable-permissive" >&5 no_cache=0 # Check whether --enable-permissive or --disable-permissive was given. if test "${enable_permissive+set}" = set; then @@ -2894,7 +2860,7 @@ fi echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6 -echo "configure:2898: checking for --enable-no_deps" >&5 +echo "configure:2864: checking for --enable-no_deps" >&5 no_cache=0 # Check whether --enable-no_deps or --disable-no_deps was given. if test "${enable_no_deps+set}" = set; then @@ -2934,7 +2900,7 @@ fi echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6 -echo "configure:2938: checking for --enable-compat20" >&5 +echo "configure:2904: checking for --enable-compat20" >&5 no_cache=0 # Check whether --enable-compat20 or --disable-compat20 was given. if test "${enable_compat20+set}" = set; then @@ -2973,7 +2939,7 @@ fi echo $ac_n "checking for --enable-compat22""... $ac_c" 1>&6 -echo "configure:2977: checking for --enable-compat22" >&5 +echo "configure:2943: checking for --enable-compat22" >&5 no_cache=0 # Check whether --enable-compat22 or --disable-compat22 was given. if test "${enable_compat22+set}" = set; then @@ -3014,7 +2980,7 @@ fi echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6 -echo "configure:3018: checking for --enable-intl" >&5 +echo "configure:2984: checking for --enable-intl" >&5 no_cache=0 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then @@ -3053,7 +3019,7 @@ fi echo $ac_n "checking for --enable-config""... $ac_c" 1>&6 -echo "configure:3057: checking for --enable-config" >&5 +echo "configure:3023: checking for --enable-config" >&5 no_cache=0 # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -3093,7 +3059,7 @@ fi echo $ac_n "checking for --enable-protocols""... $ac_c" 1>&6 -echo "configure:3097: checking for --enable-protocols" >&5 +echo "configure:3063: checking for --enable-protocols" >&5 no_cache=0 # Check whether --enable-protocols or --disable-protocols was given. if test "${enable_protocols+set}" = set; then @@ -3132,7 +3098,7 @@ fi echo $ac_n "checking for --enable-ftp""... $ac_c" 1>&6 -echo "configure:3136: checking for --enable-ftp" >&5 +echo "configure:3102: checking for --enable-ftp" >&5 no_cache=0 # Check whether --enable-ftp or --disable-ftp was given. if test "${enable_ftp+set}" = set; then @@ -3171,7 +3137,7 @@ fi echo $ac_n "checking for --enable-http""... $ac_c" 1>&6 -echo "configure:3175: checking for --enable-http" >&5 +echo "configure:3141: checking for --enable-http" >&5 no_cache=0 # Check whether --enable-http or --disable-http was given. if test "${enable_http+set}" = set; then @@ -3210,7 +3176,7 @@ fi echo $ac_n "checking for --enable-fileproto""... $ac_c" 1>&6 -echo "configure:3214: checking for --enable-fileproto" >&5 +echo "configure:3180: checking for --enable-fileproto" >&5 no_cache=0 # Check whether --enable-fileproto or --disable-fileproto was given. if test "${enable_fileproto+set}" = set; then @@ -3249,7 +3215,7 @@ fi echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6 -echo "configure:3253: checking for --enable-sockets" >&5 +echo "configure:3219: checking for --enable-sockets" >&5 no_cache=0 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then @@ -3289,7 +3255,7 @@ fi echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6 -echo "configure:3293: checking for --enable-ipc" >&5 +echo "configure:3259: checking for --enable-ipc" >&5 no_cache=0 # Check whether --enable-ipc or --disable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -3329,7 +3295,7 @@ fi echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6 -echo "configure:3333: checking for --enable-cmdline" >&5 +echo "configure:3299: checking for --enable-cmdline" >&5 no_cache=0 # Check whether --enable-cmdline or --disable-cmdline was given. if test "${enable_cmdline+set}" = set; then @@ -3368,7 +3334,7 @@ fi echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6 -echo "configure:3372: checking for --enable-datetime" >&5 +echo "configure:3338: checking for --enable-datetime" >&5 no_cache=0 # Check whether --enable-datetime or --disable-datetime was given. if test "${enable_datetime+set}" = set; then @@ -3407,7 +3373,7 @@ fi echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6 -echo "configure:3411: checking for --enable-timedate" >&5 +echo "configure:3377: checking for --enable-timedate" >&5 no_cache=0 # Check whether --enable-timedate or --disable-timedate was given. if test "${enable_timedate+set}" = set; then @@ -3446,7 +3412,7 @@ fi echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6 -echo "configure:3450: checking for --enable-stopwatch" >&5 +echo "configure:3416: checking for --enable-stopwatch" >&5 no_cache=0 # Check whether --enable-stopwatch or --disable-stopwatch was given. if test "${enable_stopwatch+set}" = set; then @@ -3485,7 +3451,7 @@ fi echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6 -echo "configure:3489: checking for --enable-dialupman" >&5 +echo "configure:3455: checking for --enable-dialupman" >&5 no_cache=0 # Check whether --enable-dialupman or --disable-dialupman was given. if test "${enable_dialupman+set}" = set; then @@ -3524,7 +3490,7 @@ fi echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6 -echo "configure:3528: checking for --enable-apple_ieee" >&5 +echo "configure:3494: checking for --enable-apple_ieee" >&5 no_cache=0 # Check whether --enable-apple_ieee or --disable-apple_ieee was given. if test "${enable_apple_ieee+set}" = set; then @@ -3563,7 +3529,7 @@ fi echo $ac_n "checking for --enable-timer""... $ac_c" 1>&6 -echo "configure:3567: checking for --enable-timer" >&5 +echo "configure:3533: checking for --enable-timer" >&5 no_cache=0 # Check whether --enable-timer or --disable-timer was given. if test "${enable_timer+set}" = set; then @@ -3602,7 +3568,7 @@ fi echo $ac_n "checking for --enable-wave""... $ac_c" 1>&6 -echo "configure:3606: checking for --enable-wave" >&5 +echo "configure:3572: checking for --enable-wave" >&5 no_cache=0 # Check whether --enable-wave or --disable-wave was given. if test "${enable_wave+set}" = set; then @@ -3641,7 +3607,7 @@ fi echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6 -echo "configure:3645: checking for --enable-fraction" >&5 +echo "configure:3611: checking for --enable-fraction" >&5 no_cache=0 # Check whether --enable-fraction or --disable-fraction was given. if test "${enable_fraction+set}" = set; then @@ -3680,7 +3646,7 @@ fi echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6 -echo "configure:3684: checking for --enable-dynlib" >&5 +echo "configure:3650: checking for --enable-dynlib" >&5 no_cache=0 # Check whether --enable-dynlib or --disable-dynlib was given. if test "${enable_dynlib+set}" = set; then @@ -3719,7 +3685,7 @@ fi echo $ac_n "checking for --enable-dynamicloader""... $ac_c" 1>&6 -echo "configure:3723: checking for --enable-dynamicloader" >&5 +echo "configure:3689: checking for --enable-dynamicloader" >&5 no_cache=0 # Check whether --enable-dynamicloader or --disable-dynamicloader was given. if test "${enable_dynamicloader+set}" = set; then @@ -3758,7 +3724,7 @@ fi echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6 -echo "configure:3762: checking for --enable-longlong" >&5 +echo "configure:3728: checking for --enable-longlong" >&5 no_cache=0 # Check whether --enable-longlong or --disable-longlong was given. if test "${enable_longlong+set}" = set; then @@ -3797,7 +3763,7 @@ fi echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6 -echo "configure:3801: checking for --enable-geometry" >&5 +echo "configure:3767: checking for --enable-geometry" >&5 no_cache=0 # Check whether --enable-geometry or --disable-geometry was given. if test "${enable_geometry+set}" = set; then @@ -3836,7 +3802,7 @@ fi echo $ac_n "checking for --enable-log""... $ac_c" 1>&6 -echo "configure:3840: checking for --enable-log" >&5 +echo "configure:3806: checking for --enable-log" >&5 no_cache=0 # Check whether --enable-log or --disable-log was given. if test "${enable_log+set}" = set; then @@ -3875,7 +3841,7 @@ fi echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6 -echo "configure:3879: checking for --enable-streams" >&5 +echo "configure:3845: checking for --enable-streams" >&5 no_cache=0 # Check whether --enable-streams or --disable-streams was given. if test "${enable_streams+set}" = set; then @@ -3914,7 +3880,7 @@ fi echo $ac_n "checking for --enable-file""... $ac_c" 1>&6 -echo "configure:3918: checking for --enable-file" >&5 +echo "configure:3884: checking for --enable-file" >&5 no_cache=0 # Check whether --enable-file or --disable-file was given. if test "${enable_file+set}" = set; then @@ -3953,7 +3919,7 @@ fi echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6 -echo "configure:3957: checking for --enable-ffile" >&5 +echo "configure:3923: checking for --enable-ffile" >&5 no_cache=0 # Check whether --enable-ffile or --disable-ffile was given. if test "${enable_ffile+set}" = set; then @@ -3992,7 +3958,7 @@ fi echo $ac_n "checking for --enable-textbuf""... $ac_c" 1>&6 -echo "configure:3996: checking for --enable-textbuf" >&5 +echo "configure:3962: checking for --enable-textbuf" >&5 no_cache=0 # Check whether --enable-textbuf or --disable-textbuf was given. if test "${enable_textbuf+set}" = set; then @@ -4031,7 +3997,7 @@ fi echo $ac_n "checking for --enable-textfile""... $ac_c" 1>&6 -echo "configure:4035: checking for --enable-textfile" >&5 +echo "configure:4001: checking for --enable-textfile" >&5 no_cache=0 # Check whether --enable-textfile or --disable-textfile was given. if test "${enable_textfile+set}" = set; then @@ -4070,7 +4036,7 @@ fi echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6 -echo "configure:4074: checking for --enable-fontmap" >&5 +echo "configure:4040: checking for --enable-fontmap" >&5 no_cache=0 # Check whether --enable-fontmap or --disable-fontmap was given. if test "${enable_fontmap+set}" = set; then @@ -4109,7 +4075,7 @@ fi echo $ac_n "checking for --enable-unicode""... $ac_c" 1>&6 -echo "configure:4113: checking for --enable-unicode" >&5 +echo "configure:4079: checking for --enable-unicode" >&5 no_cache=0 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then @@ -4148,7 +4114,7 @@ fi echo $ac_n "checking for --enable-mslu""... $ac_c" 1>&6 -echo "configure:4152: checking for --enable-mslu" >&5 +echo "configure:4118: checking for --enable-mslu" >&5 no_cache=0 # Check whether --enable-mslu or --disable-mslu was given. if test "${enable_mslu+set}" = set; then @@ -4187,7 +4153,7 @@ fi echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6 -echo "configure:4191: checking for --enable-wxprintfv" >&5 +echo "configure:4157: checking for --enable-wxprintfv" >&5 no_cache=0 # Check whether --enable-wxprintfv or --disable-wxprintfv was given. if test "${enable_wxprintfv+set}" = set; then @@ -4226,7 +4192,7 @@ fi echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6 -echo "configure:4230: checking for --enable-std_iostreams" >&5 +echo "configure:4196: checking for --enable-std_iostreams" >&5 no_cache=0 # Check whether --enable-std_iostreams or --disable-std_iostreams was given. if test "${enable_std_iostreams+set}" = set; then @@ -4265,7 +4231,7 @@ fi echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6 -echo "configure:4269: checking for --enable-filesystem" >&5 +echo "configure:4235: checking for --enable-filesystem" >&5 no_cache=0 # Check whether --enable-filesystem or --disable-filesystem was given. if test "${enable_filesystem+set}" = set; then @@ -4304,7 +4270,7 @@ fi echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6 -echo "configure:4308: checking for --enable-fs_inet" >&5 +echo "configure:4274: checking for --enable-fs_inet" >&5 no_cache=0 # Check whether --enable-fs_inet or --disable-fs_inet was given. if test "${enable_fs_inet+set}" = set; then @@ -4343,7 +4309,7 @@ fi echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6 -echo "configure:4347: checking for --enable-fs_zip" >&5 +echo "configure:4313: checking for --enable-fs_zip" >&5 no_cache=0 # Check whether --enable-fs_zip or --disable-fs_zip was given. if test "${enable_fs_zip+set}" = set; then @@ -4382,7 +4348,7 @@ fi echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6 -echo "configure:4386: checking for --enable-zipstream" >&5 +echo "configure:4352: checking for --enable-zipstream" >&5 no_cache=0 # Check whether --enable-zipstream or --disable-zipstream was given. if test "${enable_zipstream+set}" = set; then @@ -4422,7 +4388,7 @@ fi echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6 -echo "configure:4426: checking for --enable-catch_segvs" >&5 +echo "configure:4392: checking for --enable-catch_segvs" >&5 no_cache=0 # Check whether --enable-catch_segvs or --disable-catch_segvs was given. if test "${enable_catch_segvs+set}" = set; then @@ -4461,7 +4427,7 @@ fi echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6 -echo "configure:4465: checking for --enable-snglinst" >&5 +echo "configure:4431: checking for --enable-snglinst" >&5 no_cache=0 # Check whether --enable-snglinst or --disable-snglinst was given. if test "${enable_snglinst+set}" = set; then @@ -4501,7 +4467,7 @@ fi echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6 -echo "configure:4505: checking for --enable-mimetype" >&5 +echo "configure:4471: checking for --enable-mimetype" >&5 no_cache=0 # Check whether --enable-mimetype or --disable-mimetype was given. if test "${enable_mimetype+set}" = set; then @@ -4540,7 +4506,7 @@ fi echo $ac_n "checking for --enable-system_options""... $ac_c" 1>&6 -echo "configure:4544: checking for --enable-system_options" >&5 +echo "configure:4510: checking for --enable-system_options" >&5 no_cache=0 # Check whether --enable-system_options or --disable-system_options was given. if test "${enable_system_options+set}" = set; then @@ -4580,7 +4546,7 @@ fi echo $ac_n "checking for --enable-url""... $ac_c" 1>&6 -echo "configure:4584: checking for --enable-url" >&5 +echo "configure:4550: checking for --enable-url" >&5 no_cache=0 # Check whether --enable-url or --disable-url was given. if test "${enable_url+set}" = set; then @@ -4619,7 +4585,7 @@ fi echo $ac_n "checking for --enable-protocol""... $ac_c" 1>&6 -echo "configure:4623: checking for --enable-protocol" >&5 +echo "configure:4589: checking for --enable-protocol" >&5 no_cache=0 # Check whether --enable-protocol or --disable-protocol was given. if test "${enable_protocol+set}" = set; then @@ -4658,7 +4624,7 @@ fi echo $ac_n "checking for --enable-protocol_http""... $ac_c" 1>&6 -echo "configure:4662: checking for --enable-protocol_http" >&5 +echo "configure:4628: checking for --enable-protocol_http" >&5 no_cache=0 # Check whether --enable-protocol_http or --disable-protocol_http was given. if test "${enable_protocol_http+set}" = set; then @@ -4697,7 +4663,7 @@ fi echo $ac_n "checking for --enable-protocol_ftp""... $ac_c" 1>&6 -echo "configure:4701: checking for --enable-protocol_ftp" >&5 +echo "configure:4667: checking for --enable-protocol_ftp" >&5 no_cache=0 # Check whether --enable-protocol_ftp or --disable-protocol_ftp was given. if test "${enable_protocol_ftp+set}" = set; then @@ -4736,7 +4702,7 @@ fi echo $ac_n "checking for --enable-protocol_file""... $ac_c" 1>&6 -echo "configure:4740: checking for --enable-protocol_file" >&5 +echo "configure:4706: checking for --enable-protocol_file" >&5 no_cache=0 # Check whether --enable-protocol_file or --disable-protocol_file was given. if test "${enable_protocol_file+set}" = set; then @@ -4778,7 +4744,7 @@ fi echo $ac_n "checking for --enable-threads""... $ac_c" 1>&6 -echo "configure:4782: checking for --enable-threads" >&5 +echo "configure:4748: checking for --enable-threads" >&5 no_cache=0 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then @@ -4821,7 +4787,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6 -echo "configure:4825: checking for --enable-docview" >&5 +echo "configure:4791: checking for --enable-docview" >&5 no_cache=0 # Check whether --enable-docview or --disable-docview was given. if test "${enable_docview+set}" = set; then @@ -4860,7 +4826,7 @@ fi echo $ac_n "checking for --enable-help""... $ac_c" 1>&6 -echo "configure:4864: checking for --enable-help" >&5 +echo "configure:4830: checking for --enable-help" >&5 no_cache=0 # Check whether --enable-help or --disable-help was given. if test "${enable_help+set}" = set; then @@ -4899,7 +4865,7 @@ fi echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6 -echo "configure:4903: checking for --enable-mshtmlhelp" >&5 +echo "configure:4869: checking for --enable-mshtmlhelp" >&5 no_cache=0 # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given. if test "${enable_mshtmlhelp+set}" = set; then @@ -4938,7 +4904,7 @@ fi echo $ac_n "checking for --enable-html""... $ac_c" 1>&6 -echo "configure:4942: checking for --enable-html" >&5 +echo "configure:4908: checking for --enable-html" >&5 no_cache=0 # Check whether --enable-html or --disable-html was given. if test "${enable_html+set}" = set; then @@ -4977,7 +4943,7 @@ fi echo $ac_n "checking for --enable-htmlhelp""... $ac_c" 1>&6 -echo "configure:4981: checking for --enable-htmlhelp" >&5 +echo "configure:4947: checking for --enable-htmlhelp" >&5 no_cache=0 # Check whether --enable-htmlhelp or --disable-htmlhelp was given. if test "${enable_htmlhelp+set}" = set; then @@ -5016,7 +4982,7 @@ fi echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6 -echo "configure:5020: checking for --enable-constraints" >&5 +echo "configure:4986: checking for --enable-constraints" >&5 no_cache=0 # Check whether --enable-constraints or --disable-constraints was given. if test "${enable_constraints+set}" = set; then @@ -5055,7 +5021,7 @@ fi echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6 -echo "configure:5059: checking for --enable-printarch" >&5 +echo "configure:5025: checking for --enable-printarch" >&5 no_cache=0 # Check whether --enable-printarch or --disable-printarch was given. if test "${enable_printarch+set}" = set; then @@ -5094,7 +5060,7 @@ fi echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6 -echo "configure:5098: checking for --enable-mdi" >&5 +echo "configure:5064: checking for --enable-mdi" >&5 no_cache=0 # Check whether --enable-mdi or --disable-mdi was given. if test "${enable_mdi+set}" = set; then @@ -5133,7 +5099,7 @@ fi echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6 -echo "configure:5137: checking for --enable-loggui" >&5 +echo "configure:5103: checking for --enable-loggui" >&5 no_cache=0 # Check whether --enable-loggui or --disable-loggui was given. if test "${enable_loggui+set}" = set; then @@ -5172,7 +5138,7 @@ fi echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6 -echo "configure:5176: checking for --enable-logwin" >&5 +echo "configure:5142: checking for --enable-logwin" >&5 no_cache=0 # Check whether --enable-logwin or --disable-logwin was given. if test "${enable_logwin+set}" = set; then @@ -5211,7 +5177,7 @@ fi echo $ac_n "checking for --enable-logdialog""... $ac_c" 1>&6 -echo "configure:5215: checking for --enable-logdialog" >&5 +echo "configure:5181: checking for --enable-logdialog" >&5 no_cache=0 # Check whether --enable-logdialog or --disable-logdialog was given. if test "${enable_logdialog+set}" = set; then @@ -5251,7 +5217,7 @@ fi echo $ac_n "checking for --enable-postscript""... $ac_c" 1>&6 -echo "configure:5255: checking for --enable-postscript" >&5 +echo "configure:5221: checking for --enable-postscript" >&5 no_cache=0 # Check whether --enable-postscript or --disable-postscript was given. if test "${enable_postscript+set}" = set; then @@ -5293,7 +5259,7 @@ fi echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6 -echo "configure:5297: checking for --enable-prologio" >&5 +echo "configure:5263: checking for --enable-prologio" >&5 no_cache=0 # Check whether --enable-prologio or --disable-prologio was given. if test "${enable_prologio+set}" = set; then @@ -5332,7 +5298,7 @@ fi echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6 -echo "configure:5336: checking for --enable-resources" >&5 +echo "configure:5302: checking for --enable-resources" >&5 no_cache=0 # Check whether --enable-resources or --disable-resources was given. if test "${enable_resources+set}" = set; then @@ -5372,7 +5338,7 @@ fi echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6 -echo "configure:5376: checking for --enable-xresources" >&5 +echo "configure:5342: checking for --enable-xresources" >&5 no_cache=0 # Check whether --enable-xresources or --disable-xresources was given. if test "${enable_xresources+set}" = set; then @@ -5413,7 +5379,7 @@ fi echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6 -echo "configure:5417: checking for --enable-clipboard" >&5 +echo "configure:5383: checking for --enable-clipboard" >&5 no_cache=0 # Check whether --enable-clipboard or --disable-clipboard was given. if test "${enable_clipboard+set}" = set; then @@ -5452,7 +5418,7 @@ fi echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6 -echo "configure:5456: checking for --enable-dnd" >&5 +echo "configure:5422: checking for --enable-dnd" >&5 no_cache=0 # Check whether --enable-dnd or --disable-dnd was given. if test "${enable_dnd+set}" = set; then @@ -5491,7 +5457,7 @@ fi echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6 -echo "configure:5495: checking for --enable-metafile" >&5 +echo "configure:5461: checking for --enable-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -5531,7 +5497,7 @@ fi echo $ac_n "checking for --enable-treelayout""... $ac_c" 1>&6 -echo "configure:5535: checking for --enable-treelayout" >&5 +echo "configure:5501: checking for --enable-treelayout" >&5 no_cache=0 # Check whether --enable-treelayout or --disable-treelayout was given. if test "${enable_treelayout+set}" = set; then @@ -5572,7 +5538,7 @@ fi echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6 -echo "configure:5576: checking for --enable-controls" >&5 +echo "configure:5542: checking for --enable-controls" >&5 no_cache=0 # Check whether --enable-controls or --disable-controls was given. if test "${enable_controls+set}" = set; then @@ -5692,7 +5658,7 @@ fi echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6 -echo "configure:5696: checking for --enable-accel" >&5 +echo "configure:5662: checking for --enable-accel" >&5 no_cache=0 # Check whether --enable-accel or --disable-accel was given. if test "${enable_accel+set}" = set; then @@ -5731,7 +5697,7 @@ fi echo $ac_n "checking for --enable-button""... $ac_c" 1>&6 -echo "configure:5735: checking for --enable-button" >&5 +echo "configure:5701: checking for --enable-button" >&5 no_cache=0 # Check whether --enable-button or --disable-button was given. if test "${enable_button+set}" = set; then @@ -5770,7 +5736,7 @@ fi echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6 -echo "configure:5774: checking for --enable-bmpbutton" >&5 +echo "configure:5740: checking for --enable-bmpbutton" >&5 no_cache=0 # Check whether --enable-bmpbutton or --disable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then @@ -5809,7 +5775,7 @@ fi echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6 -echo "configure:5813: checking for --enable-calendar" >&5 +echo "configure:5779: checking for --enable-calendar" >&5 no_cache=0 # Check whether --enable-calendar or --disable-calendar was given. if test "${enable_calendar+set}" = set; then @@ -5848,7 +5814,7 @@ fi echo $ac_n "checking for --enable-caret""... $ac_c" 1>&6 -echo "configure:5852: checking for --enable-caret" >&5 +echo "configure:5818: checking for --enable-caret" >&5 no_cache=0 # Check whether --enable-caret or --disable-caret was given. if test "${enable_caret+set}" = set; then @@ -5887,7 +5853,7 @@ fi echo $ac_n "checking for --enable-checkbox""... $ac_c" 1>&6 -echo "configure:5891: checking for --enable-checkbox" >&5 +echo "configure:5857: checking for --enable-checkbox" >&5 no_cache=0 # Check whether --enable-checkbox or --disable-checkbox was given. if test "${enable_checkbox+set}" = set; then @@ -5926,7 +5892,7 @@ fi echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6 -echo "configure:5930: checking for --enable-checklst" >&5 +echo "configure:5896: checking for --enable-checklst" >&5 no_cache=0 # Check whether --enable-checklst or --disable-checklst was given. if test "${enable_checklst+set}" = set; then @@ -5965,7 +5931,7 @@ fi echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6 -echo "configure:5969: checking for --enable-choice" >&5 +echo "configure:5935: checking for --enable-choice" >&5 no_cache=0 # Check whether --enable-choice or --disable-choice was given. if test "${enable_choice+set}" = set; then @@ -6004,7 +5970,7 @@ fi echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6 -echo "configure:6008: checking for --enable-combobox" >&5 +echo "configure:5974: checking for --enable-combobox" >&5 no_cache=0 # Check whether --enable-combobox or --disable-combobox was given. if test "${enable_combobox+set}" = set; then @@ -6043,7 +6009,7 @@ fi echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6 -echo "configure:6047: checking for --enable-gauge" >&5 +echo "configure:6013: checking for --enable-gauge" >&5 no_cache=0 # Check whether --enable-gauge or --disable-gauge was given. if test "${enable_gauge+set}" = set; then @@ -6082,7 +6048,7 @@ fi echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6 -echo "configure:6086: checking for --enable-grid" >&5 +echo "configure:6052: checking for --enable-grid" >&5 no_cache=0 # Check whether --enable-grid or --disable-grid was given. if test "${enable_grid+set}" = set; then @@ -6121,7 +6087,7 @@ fi echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6 -echo "configure:6125: checking for --enable-newgrid" >&5 +echo "configure:6091: checking for --enable-newgrid" >&5 no_cache=0 # Check whether --enable-newgrid or --disable-newgrid was given. if test "${enable_newgrid+set}" = set; then @@ -6160,7 +6126,7 @@ fi echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6 -echo "configure:6164: checking for --enable-imaglist" >&5 +echo "configure:6130: checking for --enable-imaglist" >&5 no_cache=0 # Check whether --enable-imaglist or --disable-imaglist was given. if test "${enable_imaglist+set}" = set; then @@ -6199,7 +6165,7 @@ fi echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6 -echo "configure:6203: checking for --enable-listbox" >&5 +echo "configure:6169: checking for --enable-listbox" >&5 no_cache=0 # Check whether --enable-listbox or --disable-listbox was given. if test "${enable_listbox+set}" = set; then @@ -6238,7 +6204,7 @@ fi echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6 -echo "configure:6242: checking for --enable-listctrl" >&5 +echo "configure:6208: checking for --enable-listctrl" >&5 no_cache=0 # Check whether --enable-listctrl or --disable-listctrl was given. if test "${enable_listctrl+set}" = set; then @@ -6277,7 +6243,7 @@ fi echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6 -echo "configure:6281: checking for --enable-notebook" >&5 +echo "configure:6247: checking for --enable-notebook" >&5 no_cache=0 # Check whether --enable-notebook or --disable-notebook was given. if test "${enable_notebook+set}" = set; then @@ -6316,7 +6282,7 @@ fi echo $ac_n "checking for --enable-propsheet""... $ac_c" 1>&6 -echo "configure:6320: checking for --enable-propsheet" >&5 +echo "configure:6286: checking for --enable-propsheet" >&5 no_cache=0 # Check whether --enable-propsheet or --disable-propsheet was given. if test "${enable_propsheet+set}" = set; then @@ -6355,7 +6321,7 @@ fi echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6 -echo "configure:6359: checking for --enable-radiobox" >&5 +echo "configure:6325: checking for --enable-radiobox" >&5 no_cache=0 # Check whether --enable-radiobox or --disable-radiobox was given. if test "${enable_radiobox+set}" = set; then @@ -6394,7 +6360,7 @@ fi echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6 -echo "configure:6398: checking for --enable-radiobtn" >&5 +echo "configure:6364: checking for --enable-radiobtn" >&5 no_cache=0 # Check whether --enable-radiobtn or --disable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then @@ -6433,7 +6399,7 @@ fi echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6 -echo "configure:6437: checking for --enable-sash" >&5 +echo "configure:6403: checking for --enable-sash" >&5 no_cache=0 # Check whether --enable-sash or --disable-sash was given. if test "${enable_sash+set}" = set; then @@ -6472,7 +6438,7 @@ fi echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6 -echo "configure:6476: checking for --enable-scrollbar" >&5 +echo "configure:6442: checking for --enable-scrollbar" >&5 no_cache=0 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -6511,7 +6477,7 @@ fi echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6 -echo "configure:6515: checking for --enable-slider" >&5 +echo "configure:6481: checking for --enable-slider" >&5 no_cache=0 # Check whether --enable-slider or --disable-slider was given. if test "${enable_slider+set}" = set; then @@ -6550,7 +6516,7 @@ fi echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6 -echo "configure:6554: checking for --enable-spinbtn" >&5 +echo "configure:6520: checking for --enable-spinbtn" >&5 no_cache=0 # Check whether --enable-spinbtn or --disable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then @@ -6589,7 +6555,7 @@ fi echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6 -echo "configure:6593: checking for --enable-spinctrl" >&5 +echo "configure:6559: checking for --enable-spinctrl" >&5 no_cache=0 # Check whether --enable-spinctrl or --disable-spinctrl was given. if test "${enable_spinctrl+set}" = set; then @@ -6628,7 +6594,7 @@ fi echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6 -echo "configure:6632: checking for --enable-splitter" >&5 +echo "configure:6598: checking for --enable-splitter" >&5 no_cache=0 # Check whether --enable-splitter or --disable-splitter was given. if test "${enable_splitter+set}" = set; then @@ -6667,7 +6633,7 @@ fi echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6 -echo "configure:6671: checking for --enable-statbmp" >&5 +echo "configure:6637: checking for --enable-statbmp" >&5 no_cache=0 # Check whether --enable-statbmp or --disable-statbmp was given. if test "${enable_statbmp+set}" = set; then @@ -6706,7 +6672,7 @@ fi echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6 -echo "configure:6710: checking for --enable-statbox" >&5 +echo "configure:6676: checking for --enable-statbox" >&5 no_cache=0 # Check whether --enable-statbox or --disable-statbox was given. if test "${enable_statbox+set}" = set; then @@ -6745,7 +6711,7 @@ fi echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6 -echo "configure:6749: checking for --enable-statline" >&5 +echo "configure:6715: checking for --enable-statline" >&5 no_cache=0 # Check whether --enable-statline or --disable-statline was given. if test "${enable_statline+set}" = set; then @@ -6784,7 +6750,7 @@ fi echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6 -echo "configure:6788: checking for --enable-stattext" >&5 +echo "configure:6754: checking for --enable-stattext" >&5 no_cache=0 # Check whether --enable-stattext or --disable-stattext was given. if test "${enable_stattext+set}" = set; then @@ -6823,7 +6789,7 @@ fi echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6 -echo "configure:6827: checking for --enable-statusbar" >&5 +echo "configure:6793: checking for --enable-statusbar" >&5 no_cache=0 # Check whether --enable-statusbar or --disable-statusbar was given. if test "${enable_statusbar+set}" = set; then @@ -6862,7 +6828,7 @@ fi echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6 -echo "configure:6866: checking for --enable-tabdialog" >&5 +echo "configure:6832: checking for --enable-tabdialog" >&5 no_cache=0 # Check whether --enable-tabdialog or --disable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then @@ -6901,7 +6867,7 @@ fi echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6 -echo "configure:6905: checking for --enable-textctrl" >&5 +echo "configure:6871: checking for --enable-textctrl" >&5 no_cache=0 # Check whether --enable-textctrl or --disable-textctrl was given. if test "${enable_textctrl+set}" = set; then @@ -6940,7 +6906,7 @@ fi echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6 -echo "configure:6944: checking for --enable-togglebtn" >&5 +echo "configure:6910: checking for --enable-togglebtn" >&5 no_cache=0 # Check whether --enable-togglebtn or --disable-togglebtn was given. if test "${enable_togglebtn+set}" = set; then @@ -6979,7 +6945,7 @@ fi echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6 -echo "configure:6983: checking for --enable-toolbar" >&5 +echo "configure:6949: checking for --enable-toolbar" >&5 no_cache=0 # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then @@ -7018,7 +6984,7 @@ fi echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6 -echo "configure:7022: checking for --enable-tbarnative" >&5 +echo "configure:6988: checking for --enable-tbarnative" >&5 no_cache=0 # Check whether --enable-tbarnative or --disable-tbarnative was given. if test "${enable_tbarnative+set}" = set; then @@ -7057,7 +7023,7 @@ fi echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6 -echo "configure:7061: checking for --enable-tbarsmpl" >&5 +echo "configure:7027: checking for --enable-tbarsmpl" >&5 no_cache=0 # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given. if test "${enable_tbarsmpl+set}" = set; then @@ -7096,7 +7062,7 @@ fi echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6 -echo "configure:7100: checking for --enable-treectrl" >&5 +echo "configure:7066: checking for --enable-treectrl" >&5 no_cache=0 # Check whether --enable-treectrl or --disable-treectrl was given. if test "${enable_treectrl+set}" = set; then @@ -7135,7 +7101,7 @@ fi echo $ac_n "checking for --enable-tipwindow""... $ac_c" 1>&6 -echo "configure:7139: checking for --enable-tipwindow" >&5 +echo "configure:7105: checking for --enable-tipwindow" >&5 no_cache=0 # Check whether --enable-tipwindow or --disable-tipwindow was given. if test "${enable_tipwindow+set}" = set; then @@ -7174,7 +7140,7 @@ fi echo $ac_n "checking for --enable-popupwin""... $ac_c" 1>&6 -echo "configure:7178: checking for --enable-popupwin" >&5 +echo "configure:7144: checking for --enable-popupwin" >&5 no_cache=0 # Check whether --enable-popupwin or --disable-popupwin was given. if test "${enable_popupwin+set}" = set; then @@ -7215,7 +7181,7 @@ fi echo $ac_n "checking for --enable-commondlg""... $ac_c" 1>&6 -echo "configure:7219: checking for --enable-commondlg" >&5 +echo "configure:7185: checking for --enable-commondlg" >&5 no_cache=0 # Check whether --enable-commondlg or --disable-commondlg was given. if test "${enable_commondlg+set}" = set; then @@ -7254,7 +7220,7 @@ fi echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6 -echo "configure:7258: checking for --enable-choicedlg" >&5 +echo "configure:7224: checking for --enable-choicedlg" >&5 no_cache=0 # Check whether --enable-choicedlg or --disable-choicedlg was given. if test "${enable_choicedlg+set}" = set; then @@ -7293,7 +7259,7 @@ fi echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6 -echo "configure:7297: checking for --enable-coldlg" >&5 +echo "configure:7263: checking for --enable-coldlg" >&5 no_cache=0 # Check whether --enable-coldlg or --disable-coldlg was given. if test "${enable_coldlg+set}" = set; then @@ -7332,7 +7298,7 @@ fi echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6 -echo "configure:7336: checking for --enable-filedlg" >&5 +echo "configure:7302: checking for --enable-filedlg" >&5 no_cache=0 # Check whether --enable-filedlg or --disable-filedlg was given. if test "${enable_filedlg+set}" = set; then @@ -7371,7 +7337,7 @@ fi echo $ac_n "checking for --enable-finddlg""... $ac_c" 1>&6 -echo "configure:7375: checking for --enable-finddlg" >&5 +echo "configure:7341: checking for --enable-finddlg" >&5 no_cache=0 # Check whether --enable-finddlg or --disable-finddlg was given. if test "${enable_finddlg+set}" = set; then @@ -7410,7 +7376,7 @@ fi echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6 -echo "configure:7414: checking for --enable-fontdlg" >&5 +echo "configure:7380: checking for --enable-fontdlg" >&5 no_cache=0 # Check whether --enable-fontdlg or --disable-fontdlg was given. if test "${enable_fontdlg+set}" = set; then @@ -7449,7 +7415,7 @@ fi echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6 -echo "configure:7453: checking for --enable-dirdlg" >&5 +echo "configure:7419: checking for --enable-dirdlg" >&5 no_cache=0 # Check whether --enable-dirdlg or --disable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then @@ -7488,7 +7454,7 @@ fi echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6 -echo "configure:7492: checking for --enable-msgdlg" >&5 +echo "configure:7458: checking for --enable-msgdlg" >&5 no_cache=0 # Check whether --enable-msgdlg or --disable-msgdlg was given. if test "${enable_msgdlg+set}" = set; then @@ -7527,7 +7493,7 @@ fi echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6 -echo "configure:7531: checking for --enable-numberdlg" >&5 +echo "configure:7497: checking for --enable-numberdlg" >&5 no_cache=0 # Check whether --enable-numberdlg or --disable-numberdlg was given. if test "${enable_numberdlg+set}" = set; then @@ -7566,7 +7532,7 @@ fi echo $ac_n "checking for --enable-splash""... $ac_c" 1>&6 -echo "configure:7570: checking for --enable-splash" >&5 +echo "configure:7536: checking for --enable-splash" >&5 no_cache=0 # Check whether --enable-splash or --disable-splash was given. if test "${enable_splash+set}" = set; then @@ -7605,7 +7571,7 @@ fi echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6 -echo "configure:7609: checking for --enable-textdlg" >&5 +echo "configure:7575: checking for --enable-textdlg" >&5 no_cache=0 # Check whether --enable-textdlg or --disable-textdlg was given. if test "${enable_textdlg+set}" = set; then @@ -7644,7 +7610,7 @@ fi echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6 -echo "configure:7648: checking for --enable-tipdlg" >&5 +echo "configure:7614: checking for --enable-tipdlg" >&5 no_cache=0 # Check whether --enable-tipdlg or --disable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then @@ -7683,7 +7649,7 @@ fi echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6 -echo "configure:7687: checking for --enable-progressdlg" >&5 +echo "configure:7653: checking for --enable-progressdlg" >&5 no_cache=0 # Check whether --enable-progressdlg or --disable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then @@ -7722,7 +7688,7 @@ fi echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6 -echo "configure:7726: checking for --enable-wizarddlg" >&5 +echo "configure:7692: checking for --enable-wizarddlg" >&5 no_cache=0 # Check whether --enable-wizarddlg or --disable-wizarddlg was given. if test "${enable_wizarddlg+set}" = set; then @@ -7763,7 +7729,7 @@ fi echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6 -echo "configure:7767: checking for --enable-menus" >&5 +echo "configure:7733: checking for --enable-menus" >&5 no_cache=0 # Check whether --enable-menus or --disable-menus was given. if test "${enable_menus+set}" = set; then @@ -7802,7 +7768,7 @@ fi echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6 -echo "configure:7806: checking for --enable-miniframe" >&5 +echo "configure:7772: checking for --enable-miniframe" >&5 no_cache=0 # Check whether --enable-miniframe or --disable-miniframe was given. if test "${enable_miniframe+set}" = set; then @@ -7841,7 +7807,7 @@ fi echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6 -echo "configure:7845: checking for --enable-tooltips" >&5 +echo "configure:7811: checking for --enable-tooltips" >&5 no_cache=0 # Check whether --enable-tooltips or --disable-tooltips was given. if test "${enable_tooltips+set}" = set; then @@ -7880,7 +7846,7 @@ fi echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6 -echo "configure:7884: checking for --enable-splines" >&5 +echo "configure:7850: checking for --enable-splines" >&5 no_cache=0 # Check whether --enable-splines or --disable-splines was given. if test "${enable_splines+set}" = set; then @@ -7919,7 +7885,7 @@ fi echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6 -echo "configure:7923: checking for --enable-validators" >&5 +echo "configure:7889: checking for --enable-validators" >&5 no_cache=0 # Check whether --enable-validators or --disable-validators was given. if test "${enable_validators+set}" = set; then @@ -7958,7 +7924,7 @@ fi echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6 -echo "configure:7962: checking for --enable-busyinfo" >&5 +echo "configure:7928: checking for --enable-busyinfo" >&5 no_cache=0 # Check whether --enable-busyinfo or --disable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then @@ -7997,7 +7963,7 @@ fi echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6 -echo "configure:8001: checking for --enable-joystick" >&5 +echo "configure:7967: checking for --enable-joystick" >&5 no_cache=0 # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then @@ -8036,7 +8002,7 @@ fi echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6 -echo "configure:8040: checking for --enable-metafile" >&5 +echo "configure:8006: checking for --enable-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -8075,7 +8041,7 @@ fi echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6 -echo "configure:8079: checking for --enable-dragimage" >&5 +echo "configure:8045: checking for --enable-dragimage" >&5 no_cache=0 # Check whether --enable-dragimage or --disable-dragimage was given. if test "${enable_dragimage+set}" = set; then @@ -8116,7 +8082,7 @@ fi echo $ac_n "checking for --enable-palette""... $ac_c" 1>&6 -echo "configure:8120: checking for --enable-palette" >&5 +echo "configure:8086: checking for --enable-palette" >&5 no_cache=0 # Check whether --enable-palette or --disable-palette was given. if test "${enable_palette+set}" = set; then @@ -8155,7 +8121,7 @@ fi echo $ac_n "checking for --enable-image""... $ac_c" 1>&6 -echo "configure:8159: checking for --enable-image" >&5 +echo "configure:8125: checking for --enable-image" >&5 no_cache=0 # Check whether --enable-image or --disable-image was given. if test "${enable_image+set}" = set; then @@ -8194,7 +8160,7 @@ fi echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6 -echo "configure:8198: checking for --enable-gif" >&5 +echo "configure:8164: checking for --enable-gif" >&5 no_cache=0 # Check whether --enable-gif or --disable-gif was given. if test "${enable_gif+set}" = set; then @@ -8233,7 +8199,7 @@ fi echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6 -echo "configure:8237: checking for --enable-pcx" >&5 +echo "configure:8203: checking for --enable-pcx" >&5 no_cache=0 # Check whether --enable-pcx or --disable-pcx was given. if test "${enable_pcx+set}" = set; then @@ -8272,7 +8238,7 @@ fi echo $ac_n "checking for --enable-iff""... $ac_c" 1>&6 -echo "configure:8276: checking for --enable-iff" >&5 +echo "configure:8242: checking for --enable-iff" >&5 no_cache=0 # Check whether --enable-iff or --disable-iff was given. if test "${enable_iff+set}" = set; then @@ -8311,7 +8277,7 @@ fi echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6 -echo "configure:8315: checking for --enable-pnm" >&5 +echo "configure:8281: checking for --enable-pnm" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -8350,7 +8316,7 @@ fi echo $ac_n "checking for --enable-xpm""... $ac_c" 1>&6 -echo "configure:8354: checking for --enable-xpm" >&5 +echo "configure:8320: checking for --enable-xpm" >&5 no_cache=0 # Check whether --enable-xpm or --disable-xpm was given. if test "${enable_xpm+set}" = set; then @@ -8389,7 +8355,7 @@ fi echo $ac_n "checking for --enable-ico_cur""... $ac_c" 1>&6 -echo "configure:8393: checking for --enable-ico_cur" >&5 +echo "configure:8359: checking for --enable-ico_cur" >&5 no_cache=0 # Check whether --enable-ico_cur or --disable-ico_cur was given. if test "${enable_ico_cur+set}" = set; then @@ -8447,7 +8413,7 @@ esac echo $ac_n "checking for toolkit""... $ac_c" 1>&6 -echo "configure:8451: checking for toolkit" >&5 +echo "configure:8417: checking for toolkit" >&5 if test "$wxUSE_GUI" = "yes"; then @@ -8510,6 +8476,59 @@ else fi +define_win32=0 +case "${host}" in + *-*-cygwin*) + if test "$wxUSE_MSW" = 1 ; then + define_win32=1 + fi + ;; + *-*-mingw*) + define_win32=1 + ;; +esac + +if test "$define_win32" = 1 ; then + USE_UNIX=0 + USE_WIN32=1 + cat >> confdefs.h <<\EOF +#define __WIN32__ 1 +EOF + + cat >> confdefs.h <<\EOF +#define __WIN95__ 1 +EOF + + cat >> confdefs.h <<\EOF +#define __WINDOWS__ 1 +EOF + + cat >> confdefs.h <<\EOF +#define __GNUWIN32__ 1 +EOF + + cat >> confdefs.h <<\EOF +#define STRICT 1 +EOF + + cat >> confdefs.h <<\EOF +#define WINVER 0x0400 +EOF + +else + USE_UNIX=1 + USE_WIN32=0 +fi + +if test "$USE_UNIX" = 1 ; then + wxUSE_UNIX=yes + cat >> confdefs.h <<\EOF +#define __UNIX__ 1 +EOF + +fi + + cat > confcache <<\EOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -8578,7 +8597,7 @@ CFLAGS=${CFLAGS:=} # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8582: checking for $ac_word" >&5 +echo "configure:8601: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8608,7 +8627,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8612: checking for $ac_word" >&5 +echo "configure:8631: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8659,7 +8678,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8663: checking for $ac_word" >&5 +echo "configure:8682: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8691,7 +8710,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:8695: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:8714: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -8702,12 +8721,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 8706 "configure" +#line 8725 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:8711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -8733,12 +8752,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:8737: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:8756: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:8742: checking whether we are using GNU C" >&5 +echo "configure:8761: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8747,7 +8766,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:8751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:8770: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -8766,7 +8785,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:8770: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:8789: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8799,7 +8818,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:8803: checking how to run the C preprocessor" >&5 +echo "configure:8822: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -8814,13 +8833,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8843: \"$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 : @@ -8831,13 +8850,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8860: \"$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 : @@ -8848,13 +8867,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8877: \"$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 : @@ -8880,13 +8899,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:8884: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:8903: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -8904,7 +8923,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -8941,7 +8960,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8945: checking for $ac_word" >&5 +echo "configure:8964: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8973,7 +8992,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:8977: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:8996: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -8984,12 +9003,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 8988 "configure" +#line 9007 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:8993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -9015,12 +9034,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:9019: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:9038: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:9024: checking whether we are using GNU C++" >&5 +echo "configure:9043: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9029,7 +9048,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:9033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:9052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -9048,7 +9067,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:9052: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:9071: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9091,7 +9110,7 @@ cross_compiling=$ac_cv_prog_cc_cross # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9095: checking for $ac_word" >&5 +echo "configure:9114: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9122,7 +9141,7 @@ fi # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9126: checking for $ac_word" >&5 +echo "configure:9145: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9162,7 +9181,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:9166: checking for a BSD compatible install" >&5 +echo "configure:9185: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9236,7 +9255,7 @@ esac # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9240: checking for $ac_word" >&5 +echo "configure:9259: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9265,7 +9284,7 @@ fi echo $ac_n "checking if make is GNU make""... $ac_c" 1>&6 -echo "configure:9269: checking if make is GNU make" >&5 +echo "configure:9288: checking if make is GNU make" >&5 if eval "test \"`echo '$''{'wx_cv_prog_makeisgnu'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9291,7 +9310,7 @@ fi if test "x$wx_cv_prog_makeisgnu" != "xyes"; then echo $ac_n "checking if make supports VPATH""... $ac_c" 1>&6 -echo "configure:9295: checking if make supports VPATH" >&5 +echo "configure:9314: checking if make supports VPATH" >&5 if eval "test \"`echo '$''{'wx_cv_prog_makevpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9338,7 +9357,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9342: checking for $ac_word" >&5 +echo "configure:9361: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9372,7 +9391,7 @@ test -n "$YACC" || YACC="yacc" # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9376: checking for $ac_word" >&5 +echo "configure:9395: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9406,7 +9425,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:9410: checking for yywrap in -l$ac_lib" >&5 +echo "configure:9429: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9414,7 +9433,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9448: \"$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 @@ -9449,7 +9468,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:9453: checking whether ln -s works" >&5 +echo "configure:9472: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9476,17 +9495,17 @@ if test "$wxUSE_MAC" != 1; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9480: checking for $ac_hdr" >&5 +echo "configure:9499: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9509: \"$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* @@ -9518,17 +9537,17 @@ for ac_hdr in stdlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9522: checking for $ac_hdr" >&5 +echo "configure:9541: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9551: \"$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* @@ -9558,17 +9577,17 @@ for ac_hdr in malloc.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9562: checking for $ac_hdr" >&5 +echo "configure:9581: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9591: \"$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* @@ -9598,17 +9617,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9602: checking for $ac_hdr" >&5 +echo "configure:9621: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9631: \"$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* @@ -9638,17 +9657,17 @@ for ac_hdr in wchar.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9642: checking for $ac_hdr" >&5 +echo "configure:9661: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9671: \"$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* @@ -9680,17 +9699,17 @@ if test "$ac_cv_header_wchar_h" != "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9684: checking for $ac_hdr" >&5 +echo "configure:9703: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9713: \"$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* @@ -9723,17 +9742,17 @@ for ac_hdr in fnmatch.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9727: checking for $ac_hdr" >&5 +echo "configure:9746: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9756: \"$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* @@ -9764,12 +9783,12 @@ if test "x$ac_cv_header_fnmatch_h" = "xyes"; then for ac_func in fnmatch do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9768: checking for $ac_func" >&5 +echo "configure:9787: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9822,17 +9841,17 @@ for ac_hdr in langinfo.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9826: checking for $ac_hdr" >&5 +echo "configure:9845: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9855: \"$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* @@ -9865,17 +9884,17 @@ if test "$wxUSE_GUI" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9869: checking for $ac_hdr" >&5 +echo "configure:9888: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9898: \"$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* @@ -9906,12 +9925,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:9910: checking for working const" >&5 +echo "configure:9929: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -9981,21 +10000,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:9985: checking for inline" >&5 +echo "configure:10004: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -10022,7 +10041,7 @@ esac echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:10026: checking size of char" >&5 +echo "configure:10045: checking size of char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10030,9 +10049,10 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -10041,7 +10061,7 @@ main() exit(0); } EOF -if { (eval echo configure:10045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -10061,7 +10081,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:10065: checking size of short" >&5 +echo "configure:10085: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10069,9 +10089,10 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -10080,7 +10101,7 @@ main() exit(0); } EOF -if { (eval echo configure:10084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -10100,7 +10121,7 @@ EOF echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:10104: checking size of void *" >&5 +echo "configure:10125: checking size of void *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10108,9 +10129,10 @@ else ac_cv_sizeof_void_p=4 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -10119,7 +10141,7 @@ main() exit(0); } EOF -if { (eval echo configure:10123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_void_p=`cat conftestval` else @@ -10139,7 +10161,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:10143: checking size of int" >&5 +echo "configure:10165: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10147,9 +10169,10 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -10158,7 +10181,7 @@ main() exit(0); } EOF -if { (eval echo configure:10162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -10178,7 +10201,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:10182: checking size of long" >&5 +echo "configure:10205: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10186,9 +10209,10 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -10197,7 +10221,7 @@ main() exit(0); } EOF -if { (eval echo configure:10201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -10220,7 +10244,7 @@ EOF case "${host}" in arm-*-linux* ) echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:10224: checking size of long long" >&5 +echo "configure:10248: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10228,9 +10252,10 @@ else ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -10239,7 +10264,7 @@ main() exit(0); } EOF -if { (eval echo configure:10243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -10261,7 +10286,7 @@ EOF ;; * ) echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:10265: checking size of long long" >&5 +echo "configure:10290: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10269,9 +10294,10 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -10280,7 +10306,7 @@ main() exit(0); } EOF -if { (eval echo configure:10284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -10302,7 +10328,7 @@ EOF esac echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6 -echo "configure:10306: checking size of wchar_t" >&5 +echo "configure:10332: checking size of wchar_t" >&5 if eval "test \"`echo '$''{'wx_cv_sizeof_wchar_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10312,7 +10338,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wx_cv_sizeof_wchar_t=`cat conftestval` else @@ -10366,13 +10392,13 @@ if test "$enable_largefile" != no; then wx_largefile=no echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6 -echo "configure:10370: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +echo "configure:10396: checking for _FILE_OFFSET_BITS value needed for large files" >&5 if eval "test \"`echo '$''{'ac_cv_sys_file_offset_bits'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -10383,7 +10409,7 @@ typedef struct { ; return 0; } EOF -if { (eval echo configure:10387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sys_file_offset_bits=64 else @@ -10410,13 +10436,13 @@ EOF if test "x$wx_largefile" != "xyes"; then echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6 -echo "configure:10414: checking for _LARGE_FILES value needed for large files" >&5 +echo "configure:10440: checking for _LARGE_FILES value needed for large files" >&5 if eval "test \"`echo '$''{'ac_cv_sys_large_files'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -10427,7 +10453,7 @@ typedef struct { ; return 0; } EOF -if { (eval echo configure:10431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sys_large_files=1 else @@ -10454,7 +10480,7 @@ EOF fi echo $ac_n "checking if large file support is available""... $ac_c" 1>&6 -echo "configure:10458: checking if large file support is available" >&5 +echo "configure:10484: checking if large file support is available" >&5 if test "x$wx_largefile" = "xyes"; then cat >> confdefs.h <<\EOF #define HAVE_LARGEFILE_SUPPORT 1 @@ -10466,14 +10492,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:10470: checking whether byte ordering is bigendian" >&5 +echo "configure:10496: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -10484,11 +10510,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:10488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -10499,7 +10525,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:10503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -10519,7 +10545,7 @@ if test "$cross_compiling" = yes; then ac_cv_c_bigendian=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -10560,7 +10586,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:10564: checking how to run the C++ preprocessor" >&5 +echo "configure:10590: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10573,12 +10599,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10608: \"$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 : @@ -10622,17 +10648,17 @@ cross_compiling=$ac_cv_prog_cxx_cross do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10626: checking for $ac_hdr" >&5 +echo "configure:10652: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10662: \"$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* @@ -10680,7 +10706,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:10684: checking if C++ compiler supports bool" >&5 +echo "configure:10710: checking if C++ compiler supports bool" >&5 if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10695,7 +10721,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_cpp_bool=yes @@ -10745,7 +10771,7 @@ EOF echo $ac_n "checking if C++ compiler supports the explicit keyword""... $ac_c" 1>&6 -echo "configure:10749: checking if C++ compiler supports the explicit keyword" >&5 +echo "configure:10775: checking if C++ compiler supports the explicit keyword" >&5 if eval "test \"`echo '$''{'wx_cv_explicit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10760,7 +10786,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_explicit=no else @@ -10950,13 +10976,13 @@ rm -f confcache if test "$USE_LINUX" = 1; then echo $ac_n "checking for glibc 2.1 or later""... $ac_c" 1>&6 -echo "configure:10954: checking for glibc 2.1 or later" >&5 +echo "configure:10980: checking for glibc 2.1 or later" >&5 if eval "test \"`echo '$''{'wx_cv_lib_glibc21'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -10967,7 +10993,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_lib_glibc21=yes @@ -11006,17 +11032,17 @@ EOF if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for regex.h""... $ac_c" 1>&6 -echo "configure:11010: checking for regex.h" >&5 +echo "configure:11036: checking for regex.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11046: \"$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* @@ -11035,12 +11061,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then for ac_func in regcomp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11039: checking for $ac_func" >&5 +echo "configure:11065: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11121,17 +11147,17 @@ EOF if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 -echo "configure:11125: checking for zlib.h" >&5 +echo "configure:11151: checking for zlib.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11161: \"$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* @@ -11148,7 +11174,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:11152: checking for deflate in -lz" >&5 +echo "configure:11178: checking for deflate in -lz" >&5 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11156,7 +11182,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11197: \"$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 @@ -11232,17 +11258,17 @@ EOF if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:11236: checking for png.h" >&5 +echo "configure:11262: checking for png.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11272: \"$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* @@ -11259,7 +11285,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6 -echo "configure:11263: checking for png_check_sig in -lpng" >&5 +echo "configure:11289: checking for png_check_sig in -lpng" >&5 ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11267,7 +11293,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11308: \"$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 @@ -11341,12 +11367,12 @@ EOF if test "$wxUSE_MGL" != 1 ; then if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:11345: checking for jpeglib.h" >&5 +echo "configure:11371: checking for jpeglib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_jpeglib_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_jpeglib_h=yes else @@ -11376,7 +11402,7 @@ fi if test "$ac_cv_header_jpeglib_h" = "yes"; then echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:11380: checking for jpeg_read_header in -ljpeg" >&5 +echo "configure:11406: checking for jpeg_read_header in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11384,7 +11410,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11425: \"$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 @@ -11447,17 +11473,17 @@ EOF if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:11451: checking for tiffio.h" >&5 +echo "configure:11477: checking for tiffio.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11487: \"$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* @@ -11474,7 +11500,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6 -echo "configure:11478: checking for TIFFError in -ltiff" >&5 +echo "configure:11504: checking for TIFFError in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11482,7 +11508,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11523: \"$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 @@ -11548,17 +11574,17 @@ if test "$USE_WIN32" = 1 ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11552: checking for $ac_hdr" >&5 +echo "configure:11578: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11588: \"$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* @@ -11586,17 +11612,17 @@ done ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for windows.h""... $ac_c" 1>&6 -echo "configure:11590: checking for windows.h" >&5 +echo "configure:11616: checking for windows.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11626: \"$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* @@ -11622,13 +11648,13 @@ fi echo $ac_n "checking if w32api has good enough MSIE support""... $ac_c" 1>&6 -echo "configure:11626: checking if w32api has good enough MSIE support" >&5 +echo "configure:11652: checking if w32api has good enough MSIE support" >&5 if eval "test \"`echo '$''{'wx_cv_w32api_win32_ie'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -11644,7 +11670,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_w32api_win32_ie=yes @@ -11703,7 +11729,7 @@ if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_GTK" = 1; then echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6 -echo "configure:11707: checking for GTK+ version" >&5 +echo "configure:11733: checking for GTK+ version" >&5 gtk_version_cached=1 if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then @@ -11744,7 +11770,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:11748: checking for $ac_word" >&5 +echo "configure:11774: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11792,7 +11818,7 @@ fi min_gtk_version=2.0.0 echo $ac_n "checking for GTK+ - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:11796: checking for GTK+ - version >= $min_gtk_version" >&5 +echo "configure:11822: checking for GTK+ - version >= $min_gtk_version" >&5 if test x$PKG_CONFIG != xno ; then ## don't try to run the test against uninstalled libtool libs @@ -11827,7 +11853,7 @@ echo "configure:11796: checking for GTK+ - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -11902,7 +11928,7 @@ main () } EOF -if { (eval echo configure:11906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -11934,7 +11960,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -11944,7 +11970,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:11948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK+ or finding the wrong" @@ -12030,7 +12056,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12034: checking for $ac_word" >&5 +echo "configure:12060: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12065,7 +12091,7 @@ fi min_gtk_version=1.2.7 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:12069: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:12095: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -12088,7 +12114,7 @@ echo "configure:12069: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -12166,7 +12192,7 @@ main () } EOF -if { (eval echo configure:12170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -12200,7 +12226,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -12210,7 +12236,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:12214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -12301,7 +12327,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12305: checking for $ac_word" >&5 +echo "configure:12331: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12336,7 +12362,7 @@ fi min_gtk_version=1.2.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:12340: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:12366: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -12359,7 +12385,7 @@ echo "configure:12340: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -12437,7 +12463,7 @@ main () } EOF -if { (eval echo configure:12441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -12471,7 +12497,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -12481,7 +12507,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:12485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -12561,7 +12587,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. GUIDIST=GTK_DIST echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 -echo "configure:12565: checking for gdk_im_open in -lgdk" >&5 +echo "configure:12591: checking for gdk_im_open in -lgdk" >&5 ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12569,7 +12595,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgdk $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12610: \"$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 @@ -12607,7 +12633,7 @@ fi if test "$wxUSE_MGL" = 1; then echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6 -echo "configure:12611: checking for SciTech MGL library" >&5 +echo "configure:12637: checking for SciTech MGL library" >&5 if test "x$MGL_ROOT" = x ; then echo "$ac_t""not found" 1>&6 { echo "configure: error: Cannot find MGL library. Make sure MGL_ROOT is set." 1>&2; exit 1; } @@ -12655,7 +12681,7 @@ echo "configure:12611: checking for SciTech MGL library" >&5 if test "$wxUSE_MICROWIN" = 1; then echo $ac_n "checking for MicroWindows""... $ac_c" 1>&6 -echo "configure:12659: checking for MicroWindows" >&5 +echo "configure:12685: checking for MicroWindows" >&5 if test "x$MICROWINDOWS" = x ; then echo "$ac_t""not found" 1>&6 { echo "configure: error: Cannot find MicroWindows library. Make sure MICROWINDOWS is set." 1>&2; exit 1; } @@ -12687,7 +12713,7 @@ echo "configure:12659: checking for MicroWindows" >&5 # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:12691: checking for X" >&5 +echo "configure:12717: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -12749,12 +12775,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12784: \"$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* @@ -12823,14 +12849,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -12936,17 +12962,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:12940: checking whether -R must be followed by a space" >&5 +echo "configure:12966: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -12962,14 +12988,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -13001,7 +13027,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:13005: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:13031: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13009,7 +13035,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13050: \"$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 @@ -13042,7 +13068,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:13046: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:13072: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13050,7 +13076,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13091: \"$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 @@ -13090,12 +13116,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:13094: checking for gethostbyname" >&5 +echo "configure:13120: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -13139,7 +13165,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:13143: checking for gethostbyname in -lnsl" >&5 +echo "configure:13169: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13147,7 +13173,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13188: \"$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 @@ -13188,12 +13214,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:13192: checking for connect" >&5 +echo "configure:13218: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -13237,7 +13263,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:13241: checking for connect in -lsocket" >&5 +echo "configure:13267: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13245,7 +13271,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13286: \"$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 @@ -13280,12 +13306,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:13284: checking for remove" >&5 +echo "configure:13310: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -13329,7 +13355,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:13333: checking for remove in -lposix" >&5 +echo "configure:13359: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13337,7 +13363,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13378: \"$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 @@ -13372,12 +13398,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:13376: checking for shmat" >&5 +echo "configure:13402: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -13421,7 +13447,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:13425: checking for shmat in -lipc" >&5 +echo "configure:13451: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13429,7 +13455,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13470: \"$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 @@ -13473,7 +13499,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:13477: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:13503: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13481,7 +13507,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13522: \"$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 @@ -13528,7 +13554,7 @@ fi if test "$wxUSE_NANOX" = "yes"; then echo $ac_n "checking for MicroWindows/NanoX distribution""... $ac_c" 1>&6 -echo "configure:13532: checking for MicroWindows/NanoX distribution" >&5 +echo "configure:13558: checking for MicroWindows/NanoX distribution" >&5 if test "x$MICROWIN" = x ; then echo "$ac_t""not found" 1>&6 { echo "configure: error: Cannot find MicroWindows library. Make sure MICROWIN is set." 1>&2; exit 1; } @@ -13543,7 +13569,7 @@ EOF xpm_link= echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:13547: checking for Xpm library" >&5 +echo "configure:13573: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -13575,7 +13601,7 @@ EOF echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -13587,7 +13613,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* xpm_link=" -lXpm" @@ -13629,17 +13655,17 @@ rm -f conftest* if test "$wxUSE_WINE" = 1; then ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for windows.h""... $ac_c" 1>&6 -echo "configure:13633: checking for windows.h" >&5 +echo "configure:13659: checking for windows.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13669: \"$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* @@ -13666,7 +13692,7 @@ fi xpm_link= echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:13670: checking for Xpm library" >&5 +echo "configure:13696: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -13694,7 +13720,7 @@ EOF mesa_link= echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 -echo "configure:13698: checking for Mesa library" >&5 +echo "configure:13724: checking for Mesa library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -13742,17 +13768,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:13746: checking whether -R must be followed by a space" >&5 +echo "configure:13772: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -13768,14 +13794,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -13807,7 +13833,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:13811: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:13837: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13815,7 +13841,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13856: \"$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 @@ -13848,7 +13874,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:13852: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:13878: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13856,7 +13882,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13897: \"$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 @@ -13896,12 +13922,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:13900: checking for gethostbyname" >&5 +echo "configure:13926: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -13945,7 +13971,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:13949: checking for gethostbyname in -lnsl" >&5 +echo "configure:13975: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13953,7 +13979,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13994: \"$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 @@ -13994,12 +14020,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:13998: checking for connect" >&5 +echo "configure:14024: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -14043,7 +14069,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:14047: checking for connect in -lsocket" >&5 +echo "configure:14073: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14051,7 +14077,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14092: \"$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 @@ -14086,12 +14112,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:14090: checking for remove" >&5 +echo "configure:14116: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -14135,7 +14161,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:14139: checking for remove in -lposix" >&5 +echo "configure:14165: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14143,7 +14169,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14184: \"$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 @@ -14178,12 +14204,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:14182: checking for shmat" >&5 +echo "configure:14208: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -14227,7 +14253,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:14231: checking for shmat in -lipc" >&5 +echo "configure:14257: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14235,7 +14261,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14276: \"$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 @@ -14279,7 +14305,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:14283: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:14309: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14287,7 +14313,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14328: \"$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 @@ -14333,7 +14359,7 @@ fi COMPILED_X_PROGRAM=0 echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 -echo "configure:14337: checking for Motif/Lesstif headers" >&5 +echo "configure:14363: checking for Motif/Lesstif headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -14348,7 +14374,7 @@ for ac_dir in $SEARCH_INCLUDE; echo "$ac_t""found $ac_find_includes" 1>&6 else cat > conftest.$ac_ext < @@ -14360,7 +14386,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -14381,7 +14407,7 @@ rm -f conftest* if test "$COMPILED_X_PROGRAM" = 0; then echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 -echo "configure:14385: checking for Motif/Lesstif library" >&5 +echo "configure:14411: checking for Motif/Lesstif library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -14420,7 +14446,7 @@ for ac_dir in $SEARCH_LIB; echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -14432,7 +14458,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -14454,7 +14480,7 @@ rm -f conftest* xpm_link= echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:14458: checking for Xpm library" >&5 +echo "configure:14484: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -14486,7 +14512,7 @@ EOF echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -14498,7 +14524,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* xpm_link=" -lXpm" @@ -14522,7 +14548,14 @@ fi rm -f conftest* fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link -lXmu -lXext -lXt -lX11" + xt_needs_sm_ice= + case "${host}" in + *-*-cygwin* ) + xt_needs_sm_ice=" -lSM -lICE" + ;; + esac + + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link -lXmu -lXext -lXt${xt_needs_sm_ice} -lX11" TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo" TOOLKIT=MOTIF GUIDIST=MOTIF_DIST @@ -14643,17 +14676,17 @@ if test "$wxUSE_OPENGL" = "yes"; then else ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6 -echo "configure:14647: checking for GL/gl.h" >&5 +echo "configure:14680: checking for GL/gl.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14690: \"$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* @@ -14671,7 +14704,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for -lGL""... $ac_c" 1>&6 -echo "configure:14675: checking for -lGL" >&5 +echo "configure:14708: checking for -lGL" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -14704,7 +14737,7 @@ for ac_dir in $SEARCH_LIB; else echo "$ac_t""no" 1>&6 echo $ac_n "checking for -lMesaGL""... $ac_c" 1>&6 -echo "configure:14708: checking for -lMesaGL" >&5 +echo "configure:14741: checking for -lMesaGL" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -14800,7 +14833,7 @@ case "${host}" in - if test "$cross_compiling" != "yes"; then + if test "$cross_compiling" != "yes" -a "$TOOLKIT_DIR" = "msw"; then WX_LIBRARY="wxmsw${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}" WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}" WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}" @@ -14880,13 +14913,13 @@ if test "$wxUSE_SHARED" = "yes"; then *-*-linux* ) if test "$GCC" != "yes"; then echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6 -echo "configure:14884: checking for Intel compiler" >&5 +echo "configure:14917: checking for Intel compiler" >&5 if eval "test \"`echo '$''{'wx_cv_prog_icc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_prog_icc=yes else @@ -14948,7 +14981,7 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6 # Extract the first word of "makeC++SharedLib", so it can be a program name with args. set dummy makeC++SharedLib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14952: checking for $ac_word" >&5 +echo "configure:14985: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AIX_CXX_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15052,7 +15085,7 @@ if test "$wxUSE_MAC" = 1; then # Extract the first word of "Rez", so it can be a program name with args. set dummy Rez; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15056: checking for $ac_word" >&5 +echo "configure:15089: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RESCOMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15082,7 +15115,7 @@ fi # Extract the first word of "DeRez", so it can be a program name with args. set dummy DeRez; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15086: checking for $ac_word" >&5 +echo "configure:15119: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15125,12 +15158,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:15129: checking for ANSI C header files" >&5 +echo "configure:15162: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -15138,7 +15171,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15175: \"$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* @@ -15155,7 +15188,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -15173,7 +15206,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -15194,7 +15227,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -15205,7 +15238,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:15209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:15242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -15229,12 +15262,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:15233: checking for mode_t" >&5 +echo "configure:15266: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -15262,12 +15295,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:15266: checking for off_t" >&5 +echo "configure:15299: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -15295,12 +15328,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:15299: checking for pid_t" >&5 +echo "configure:15332: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -15328,12 +15361,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:15332: checking for size_t" >&5 +echo "configure:15365: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -15361,12 +15394,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:15365: checking for uid_t in sys/types.h" >&5 +echo "configure:15398: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -15404,12 +15437,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6 -echo "configure:15408: checking if size_t is unsigned int" >&5 +echo "configure:15441: checking if size_t is unsigned int" >&5 if eval "test \"`echo '$''{'wx_cv_size_t_is_uint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -15422,7 +15455,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_uint=no else @@ -15445,12 +15478,12 @@ EOF else echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6 -echo "configure:15449: checking if size_t is unsigned long" >&5 +echo "configure:15482: checking if size_t is unsigned long" >&5 if eval "test \"`echo '$''{'wx_cv_size_t_is_ulong'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -15463,7 +15496,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_ulong=no else @@ -15497,13 +15530,13 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6 -echo "configure:15501: checking for pw_gecos in struct passwd" >&5 +echo "configure:15534: checking for pw_gecos in struct passwd" >&5 if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -15514,7 +15547,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_pw_gecos=yes @@ -15549,12 +15582,12 @@ if test "$wx_cv_sizeof_wchar_t" != "0"; then for ac_func in wcslen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15553: checking for $ac_func" >&5 +echo "configure:15586: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15611,7 +15644,7 @@ done if test "$WCHAR_OK" = 0; then if test "$TOOLKIT" = "MSW"; then echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6 -echo "configure:15615: checking for wcslen in -lmsvcrt" >&5 +echo "configure:15648: checking for wcslen in -lmsvcrt" >&5 ac_lib_var=`echo msvcrt'_'wcslen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15619,7 +15652,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmsvcrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15667: \"$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 @@ -15658,7 +15691,7 @@ fi else echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:15662: checking for wcslen in -lw" >&5 +echo "configure:15695: checking for wcslen in -lw" >&5 ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15666,7 +15699,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15714: \"$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 @@ -15717,12 +15750,12 @@ EOF for ac_func in wcsrtombs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15721: checking for $ac_func" >&5 +echo "configure:15754: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15781,12 +15814,12 @@ EOF fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:15785: checking for vprintf" >&5 +echo "configure:15818: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -15833,12 +15866,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:15837: checking for _doprnt" >&5 +echo "configure:15870: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -15891,13 +15924,13 @@ fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:15895: checking for vsnprintf" >&5 +echo "configure:15928: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'wx_cv_func_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -15922,7 +15955,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* wx_cv_func_vsnprintf=yes @@ -15933,7 +15966,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -15958,7 +15991,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* wx_cv_func_vsnprintf=yes @@ -15990,13 +16023,13 @@ else fi echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 -echo "configure:15994: checking for vsscanf" >&5 +echo "configure:16027: checking for vsscanf" >&5 if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -16019,7 +16052,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_vsscanf=yes @@ -16071,7 +16104,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:16075: checking for iconv" >&5 +echo "configure:16108: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16079,7 +16112,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -16089,7 +16122,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:16093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -16101,7 +16134,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -16111,7 +16144,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:16115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -16132,12 +16165,12 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking if iconv needs const""... $ac_c" 1>&6 -echo "configure:16136: checking if iconv needs const" >&5 +echo "configure:16169: checking if iconv needs const" >&5 if eval "test \"`echo '$''{'wx_cv_func_iconv_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -16156,7 +16189,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_iconv_const="no" else @@ -16201,12 +16234,12 @@ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then for ac_func in sigaction do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16205: checking for $ac_func" >&5 +echo "configure:16238: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16270,13 +16303,13 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6 -echo "configure:16274: checking for sa_handler type" >&5 +echo "configure:16307: checking for sa_handler type" >&5 if eval "test \"`echo '$''{'wx_cv_type_sa_handler'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -16288,7 +16321,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_sa_handler=int @@ -16325,12 +16358,12 @@ fi for ac_func in vfork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16329: checking for $ac_func" >&5 +echo "configure:16362: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16381,12 +16414,12 @@ done for ac_func in mkstemp mktemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16385: checking for $ac_func" >&5 +echo "configure:16418: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16435,12 +16468,12 @@ done echo $ac_n "checking for statfs""... $ac_c" 1>&6 -echo "configure:16439: checking for statfs" >&5 +echo "configure:16472: checking for statfs" >&5 if eval "test \"`echo '$''{'wx_cv_func_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_statfs=yes @@ -16488,12 +16521,12 @@ EOF else echo $ac_n "checking for statvfs""... $ac_c" 1>&6 -echo "configure:16492: checking for statvfs" >&5 +echo "configure:16525: checking for statvfs" >&5 if eval "test \"`echo '$''{'wx_cv_func_statvfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -16509,7 +16542,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_statvfs=yes @@ -16543,12 +16576,12 @@ if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then for ac_func in fcntl flock do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16547: checking for $ac_func" >&5 +echo "configure:16580: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16605,12 +16638,12 @@ fi for ac_func in timegm do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16609: checking for $ac_func" >&5 +echo "configure:16642: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16661,12 +16694,12 @@ done for ac_func in putenv setenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16665: checking for $ac_func" >&5 +echo "configure:16698: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16736,12 +16769,12 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then for ac_func in nanosleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16740: checking for $ac_func" >&5 +echo "configure:16773: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16789,7 +16822,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:16793: checking for nanosleep in -lposix4" >&5 +echo "configure:16826: checking for nanosleep in -lposix4" >&5 ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16797,7 +16830,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16845: \"$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 @@ -16836,12 +16869,12 @@ else for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16840: checking for $ac_func" >&5 +echo "configure:16873: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16907,12 +16940,12 @@ fi for ac_func in uname gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16911: checking for $ac_func" >&5 +echo "configure:16944: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16972,12 +17005,12 @@ cross_compiling=$ac_cv_prog_cxx_cross for ac_func in strtok_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16976: checking for $ac_func" >&5 +echo "configure:17009: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17040,12 +17073,12 @@ INET_LINK= for ac_func in inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17044: checking for $ac_func" >&5 +echo "configure:17077: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17093,7 +17126,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 -echo "configure:17097: checking for inet_addr in -lnsl" >&5 +echo "configure:17130: checking for inet_addr in -lnsl" >&5 ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17101,7 +17134,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17149: \"$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 @@ -17131,7 +17164,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6 -echo "configure:17135: checking for inet_addr in -lresolv" >&5 +echo "configure:17168: checking for inet_addr in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17139,7 +17172,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17187: \"$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 @@ -17169,7 +17202,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lsocket""... $ac_c" 1>&6 -echo "configure:17173: checking for inet_addr in -lsocket" >&5 +echo "configure:17206: checking for inet_addr in -lsocket" >&5 ac_lib_var=`echo socket'_'inet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17177,7 +17210,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17225: \"$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 @@ -17224,12 +17257,12 @@ done for ac_func in inet_aton do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17228: checking for $ac_func" >&5 +echo "configure:17261: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17277,7 +17310,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6 -echo "configure:17281: checking for inet_aton in -l$INET_LINK" >&5 +echo "configure:17314: checking for inet_aton in -l$INET_LINK" >&5 ac_lib_var=`echo $INET_LINK'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17285,7 +17318,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$INET_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17333: \"$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 @@ -17416,8 +17449,8 @@ if test "$TOOLKIT" != "MSW"; then *-*-freebsd*) THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r" ;; - *-*-darwin*) - THREAD_OPTS="" + *-*-darwin* | *-*-cygwin* ) + THREAD_OPTS="" ;; *-*-aix*) THREAD_OPTS="pthreads" @@ -17431,18 +17464,18 @@ if test "$TOOLKIT" != "MSW"; then case $flag in none) echo $ac_n "checking whether pthreads work without any flags""... $ac_c" 1>&6 -echo "configure:17435: checking whether pthreads work without any flags" >&5 +echo "configure:17468: checking whether pthreads work without any flags" >&5 ;; -*) echo $ac_n "checking whether pthreads work with $flag""... $ac_c" 1>&6 -echo "configure:17440: checking whether pthreads work with $flag" >&5 +echo "configure:17473: checking whether pthreads work with $flag" >&5 THREADS_CFLAGS="$flag" ;; *) echo $ac_n "checking for the pthreads library -l$flag""... $ac_c" 1>&6 -echo "configure:17446: checking for the pthreads library -l$flag" >&5 +echo "configure:17479: checking for the pthreads library -l$flag" >&5 THREADS_LINK="-l$flag" ;; esac @@ -17453,14 +17486,14 @@ echo "configure:17446: checking for the pthreads library -l$flag" >&5 CFLAGS="$THREADS_CFLAGS $CFLAGS" cat > conftest.$ac_ext < int main() { pthread_create(0,0,0,0); ; return 0; } EOF -if { (eval echo configure:17464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* THREADS_OK=yes else @@ -17488,7 +17521,7 @@ rm -f conftest* LIBS="$THREADS_LINK $THREADS_CFLAGS $LIBS" echo $ac_n "checking if more special flags are required for pthreads""... $ac_c" 1>&6 -echo "configure:17492: checking if more special flags are required for pthreads" >&5 +echo "configure:17525: checking if more special flags are required for pthreads" >&5 flag=no case "${host}" in *-aix* | *-freebsd*) @@ -17514,12 +17547,12 @@ echo "configure:17492: checking if more special flags are required for pthreads" for ac_func in thr_setconcurrency do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17518: checking for $ac_func" >&5 +echo "configure:17551: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17571,17 +17604,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:17575: checking for $ac_hdr" >&5 +echo "configure:17608: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:17585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:17618: \"$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* @@ -17609,12 +17642,12 @@ done if test "$ac_cv_header_sched_h" = "yes"; then echo $ac_n "checking for sched_yield""... $ac_c" 1>&6 -echo "configure:17613: checking for sched_yield" >&5 +echo "configure:17646: checking for sched_yield" >&5 if eval "test \"`echo '$''{'ac_cv_func_sched_yield'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sched_yield=yes" else @@ -17659,7 +17692,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6 -echo "configure:17663: checking for sched_yield in -lposix4" >&5 +echo "configure:17696: checking for sched_yield in -lposix4" >&5 ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17667,7 +17700,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17715: \"$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 @@ -17711,12 +17744,12 @@ fi HAVE_PRIOR_FUNCS=0 echo $ac_n "checking for pthread_attr_getschedpolicy""... $ac_c" 1>&6 -echo "configure:17715: checking for pthread_attr_getschedpolicy" >&5 +echo "configure:17748: checking for pthread_attr_getschedpolicy" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_getschedpolicy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_attr_getschedpolicy=yes" else @@ -17754,12 +17787,12 @@ fi if eval "test \"`echo '$ac_cv_func_'pthread_attr_getschedpolicy`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for pthread_attr_setschedparam""... $ac_c" 1>&6 -echo "configure:17758: checking for pthread_attr_setschedparam" >&5 +echo "configure:17791: checking for pthread_attr_setschedparam" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_setschedparam'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_attr_setschedparam=yes" else @@ -17797,12 +17830,12 @@ fi if eval "test \"`echo '$ac_cv_func_'pthread_attr_setschedparam`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for sched_get_priority_max""... $ac_c" 1>&6 -echo "configure:17801: checking for sched_get_priority_max" >&5 +echo "configure:17834: checking for sched_get_priority_max" >&5 if eval "test \"`echo '$''{'ac_cv_func_sched_get_priority_max'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sched_get_priority_max=yes" else @@ -17845,7 +17878,7 @@ if eval "test \"`echo '$ac_cv_func_'sched_get_priority_max`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6 -echo "configure:17849: checking for sched_get_priority_max in -lposix4" >&5 +echo "configure:17882: checking for sched_get_priority_max in -lposix4" >&5 ac_lib_var=`echo posix4'_'sched_get_priority_max | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17853,7 +17886,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17901: \"$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 @@ -17909,12 +17942,12 @@ EOF fi echo $ac_n "checking for pthread_cancel""... $ac_c" 1>&6 -echo "configure:17913: checking for pthread_cancel" >&5 +echo "configure:17946: checking for pthread_cancel" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_cancel'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_cancel=yes" else @@ -17962,13 +17995,13 @@ fi echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 -echo "configure:17966: checking for pthread_cleanup_push/pop" >&5 +echo "configure:17999: checking for pthread_cleanup_push/pop" >&5 if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -17978,7 +18011,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_pthread_cleanup_push=yes @@ -18010,13 +18043,13 @@ EOF fi echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6 -echo "configure:18014: checking for pthread_mutexattr_t" >&5 +echo "configure:18047: checking for pthread_mutexattr_t" >&5 if eval "test \"`echo '$''{'wx_cv_type_pthread_mutexattr_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -18026,7 +18059,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18063: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_pthread_mutexattr_t=yes @@ -18053,13 +18086,13 @@ EOF else echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6 -echo "configure:18057: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 +echo "configure:18090: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -18068,7 +18101,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_pthread_rec_mutex_init=yes @@ -18110,7 +18143,7 @@ EOF else if test "$ac_cv_func_strtok_r" = "yes"; then echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6 -echo "configure:18114: checking if -D_REENTRANT is needed" >&5 +echo "configure:18147: checking if -D_REENTRANT is needed" >&5 if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT" echo "$ac_t""yes" 1>&6 @@ -18495,12 +18528,12 @@ if test "$wxUSE_DATETIME" = "yes"; then for ac_func in strptime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18499: checking for $ac_func" >&5 +echo "configure:18532: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18549,13 +18582,13 @@ done echo $ac_n "checking for timezone variable in ""... $ac_c" 1>&6 -echo "configure:18553: checking for timezone variable in " >&5 +echo "configure:18586: checking for timezone variable in " >&5 if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -18567,7 +18600,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=timezone @@ -18578,7 +18611,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -18590,7 +18623,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=_timezone @@ -18601,7 +18634,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -18613,7 +18646,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=__timezone @@ -18654,12 +18687,12 @@ EOF for ac_func in localtime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18658: checking for $ac_func" >&5 +echo "configure:18691: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18709,13 +18742,13 @@ done if test "$ac_cv_func_localtime" = "yes"; then echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:18713: checking for tm_gmtoff in struct tm" >&5 +echo "configure:18746: checking for tm_gmtoff in struct tm" >&5 if eval "test \"`echo '$''{'wx_cv_struct_tm_has_gmtoff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -18727,7 +18760,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_tm_has_gmtoff=yes @@ -18756,12 +18789,12 @@ EOF for ac_func in gettimeofday ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18760: checking for $ac_func" >&5 +echo "configure:18793: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18811,7 +18844,7 @@ done if test "$ac_cv_func_gettimeofday" = "yes"; then echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6 -echo "configure:18815: checking whether gettimeofday takes two arguments" >&5 +echo "configure:18848: checking whether gettimeofday takes two arguments" >&5 if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18826,7 +18859,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -18839,7 +18872,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=yes else @@ -18847,7 +18880,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -18860,7 +18893,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=no else @@ -18920,12 +18953,12 @@ fi if test "$wxUSE_SOCKETS" = "yes"; then if test "$TOOLKIT" != "MSW"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:18924: checking for socket" >&5 +echo "configure:18957: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -18966,7 +18999,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:18970: checking for socket in -lsocket" >&5 +echo "configure:19003: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18974,7 +19007,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19022: \"$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 @@ -19021,7 +19054,7 @@ fi if test "$wxUSE_SOCKETS" = "yes" ; then if test "$TOOLKIT" != "MSW"; then echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6 -echo "configure:19025: checking what is the type of the third argument of getsockname" >&5 +echo "configure:19058: checking what is the type of the third argument of getsockname" >&5 if eval "test \"`echo '$''{'wx_cv_type_getsockname3'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19036,7 +19069,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -19049,7 +19082,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=socklen_t else @@ -19057,7 +19090,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -19070,7 +19103,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=size_t else @@ -19078,7 +19111,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -19091,7 +19124,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=int else @@ -19163,17 +19196,17 @@ if test "$wxUSE_GUI" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:19167: checking for $ac_hdr" >&5 +echo "configure:19200: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:19177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:19210: \"$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* @@ -19227,12 +19260,12 @@ if test "$TOOLKIT" != "MSW"; then for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19231: checking for $ac_func" >&5 +echo "configure:19264: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -19283,7 +19316,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:19287: checking for dlopen in -ldl" >&5 +echo "configure:19320: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -19291,7 +19324,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19339: \"$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 @@ -19331,12 +19364,12 @@ else for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19335: checking for $ac_func" >&5 +echo "configure:19368: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -19387,7 +19420,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6 -echo "configure:19391: checking for dld in -lshl_load" >&5 +echo "configure:19424: checking for dld in -lshl_load" >&5 ac_lib_var=`echo shl_load'_'dld | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -19395,7 +19428,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lshl_load $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19443: \"$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 @@ -19445,12 +19478,12 @@ done for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19449: checking for $ac_func" >&5 +echo "configure:19482: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -19498,7 +19531,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6 -echo "configure:19502: checking for dlerror in -ldl" >&5 +echo "configure:19535: checking for dlerror in -ldl" >&5 ac_lib_var=`echo dl'_'dlerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -19506,7 +19539,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19554: \"$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 @@ -19592,7 +19625,7 @@ EOF if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then echo $ac_n "checking for main in -lunicows""... $ac_c" 1>&6 -echo "configure:19596: checking for main in -lunicows" >&5 +echo "configure:19629: checking for main in -lunicows" >&5 ac_lib_var=`echo unicows'_'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 @@ -19600,14 +19633,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lunicows $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19644: \"$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 @@ -19787,17 +19820,17 @@ if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:19791: checking for $ac_hdr" >&5 +echo "configure:19824: checking for $ac_hdr" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:19801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:19834: \"$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* @@ -20788,7 +20821,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:20792: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:20825: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 diff --git a/configure.in b/configure.in index 544985221c..81cc4a6e6d 100644 --- a/configure.in +++ b/configure.in @@ -234,15 +234,10 @@ case "${host}" in ;; *-*-cygwin* | *-*-mingw32* ) - USE_UNIX=0 - USE_WIN32=1 + dnl MBN: some of the defines have been moved after toolkit detection + dnl because for wxMotif/wxGTK/wxX11 to build on Cygwin + dnl USE_UNIX must be set and not USE_WIN32 SO_SUFFIX=dll - AC_DEFINE(__WIN32__) - AC_DEFINE(__WIN95__) - AC_DEFINE(__WINDOWS__) - AC_DEFINE(__GNUWIN32__) - AC_DEFINE(STRICT) - AC_DEFINE(WINVER, 0x0400) PROGRAM_EXT=".exe" RESCOMP=windres DEFAULT_DEFAULT_wxUSE_MSW=1 @@ -284,11 +279,6 @@ case "${host}" in AC_MSG_ERROR(unknown system type ${host}.) esac -if test "$USE_UNIX" = 1 ; then - wxUSE_UNIX=yes - AC_DEFINE(__UNIX__) -fi - dnl --------------------------------------------------------------------------- dnl command line options for configure dnl --------------------------------------------------------------------------- @@ -1121,6 +1111,42 @@ else AC_MSG_RESULT(base ($host_alias hosted) only) fi +dnl --------------------------------------------------------------------------- +dnl When we are using Cygwin with Motif/GTK+, we want it to appear like +dnl 'just' a POSIX platform, so the Win32 API must not be available +dnl --------------------------------------------------------------------------- + +define_win32=0 +case "${host}" in + *-*-cygwin*) + if test "$wxUSE_MSW" = 1 ; then + define_win32=1 + fi + ;; + *-*-mingw*) + define_win32=1 + ;; +esac + +if test "$define_win32" = 1 ; then + USE_UNIX=0 + USE_WIN32=1 + AC_DEFINE(__WIN32__) + AC_DEFINE(__WIN95__) + AC_DEFINE(__WINDOWS__) + AC_DEFINE(__GNUWIN32__) + AC_DEFINE(STRICT) + AC_DEFINE(WINVER, 0x0400) +else + USE_UNIX=1 + USE_WIN32=0 +fi + +if test "$USE_UNIX" = 1 ; then + wxUSE_UNIX=yes + AC_DEFINE(__UNIX__) +fi + dnl --------------------------------------------------------------------------- dnl Checks for programs dnl --------------------------------------------------------------------------- @@ -2197,7 +2223,16 @@ equivalent variable and GTK+ is version 1.2.3 or above. ) fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link -lXmu -lXext -lXt -lX11" + dnl MBN: this should really be an AC_TRY_LINK, but it is faster + dnl to special case it + xt_needs_sm_ice= + case "${host}" in + *-*-cygwin* ) + xt_needs_sm_ice=" -lSM -lICE" + ;; + esac + + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link -lXmu -lXext -lXt${xt_needs_sm_ice} -lX11" TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo" TOOLKIT=MOTIF GUIDIST=MOTIF_DIST @@ -2429,7 +2464,7 @@ case "${host}" in dnl FIXME: is this GL stuff actually even used for wxMSW? should it be?? - if test "$cross_compiling" != "yes"; then + if test "$cross_compiling" != "yes" -a "$TOOLKIT_DIR" = "msw"; then WX_LIBRARY="wxmsw${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}" WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}" WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}" @@ -3207,8 +3242,9 @@ if test "$TOOLKIT" != "MSW"; then dnl and finally the userland threads THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r" ;; - *-*-darwin*) + *-*-darwin* | *-*-cygwin* ) dnl Darwin / Mac OS X just uses -lpthread tested below + dnl and so does Cygwin THREAD_OPTS="" ;; *-*-aix*) diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index b2ded4870d..68d1a6a1ba 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -303,6 +303,8 @@ typedef _TUCHAR wxUChar; # if wxUSE_WCHAR_T # ifdef HAVE_WCHAR_H // include wchar.h to get wcslen() declaration used by wx/buffer.h + // stddef.h is needed for Cygwin +# include # include # elif defined(HAVE_WCSTR_H) // old compilers have wcslen() here diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp index 074cd75f9e..dc0b24bbc1 100644 --- a/src/common/dircmn.cpp +++ b/src/common/dircmn.cpp @@ -56,9 +56,7 @@ bool wxDir::HasFiles(const wxString& spec) } // we have a (much) faster version for Unix -// MBN: Cygwin should use the Unix version, but with the current build sistem -// this is painful -#if defined(__CYGWIN__) || !defined(__UNIX_LIKE__) || defined(__WXMAC__) +#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__WXMAC__) bool wxDir::HasSubDirs(const wxString& spec) { diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index a45a871c00..bcd3a92295 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -1477,7 +1477,9 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) } #endif // __DJGPP__ -#ifdef __CYGWIN__ +// MBN: we hope that in the case the user is compiling a GTK+/Motif app, +// he needs Unix as opposed to Win32 pathnames +#if defined( __CYGWIN__ ) && defined( __WINDOWS__ ) // another example of DOS/Unix mix (Cygwin) wxString pathUnix = buf; cygwin_conv_to_full_win32_path(pathUnix, buf); -- 2.45.2