X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f79bd02d8e266982041053fece8076abf89cd5d3..67fade3398f9c35a8e042749ed340c898f7e7bdd:/configure?ds=sidebyside diff --git a/configure b/configure index 861a5e6c28..72e79c606f 100755 --- a/configure +++ b/configure @@ -87,6 +87,8 @@ ac_help="$ac_help --with-microwin use MicroWindows" ac_help="$ac_help --with-x11 use X11" +ac_help="$ac_help + --enable-nanox use NanoX" ac_help="$ac_help --enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL)" ac_help="$ac_help @@ -95,8 +97,6 @@ ac_help="$ac_help --with-libjpeg use libjpeg (JPEG file format)" ac_help="$ac_help --with-libtiff use libtiff (TIFF file format)" -ac_help="$ac_help - --with-freetype use freetype (font rasterizer)" ac_help="$ac_help --with-opengl use OpenGL (or Mesa)" ac_help="$ac_help @@ -1344,7 +1344,6 @@ EOF PROGRAM_EXT=".exe" DEFAULT_DEFAULT_wxUSE_MGL=1 - DEFAULT_DEFAULT_wxUSE_SHARED=0 ;; *-pc-os2_emx | *-pc-os2-emx ) @@ -1398,13 +1397,13 @@ fi if test "$USE_LINUX" = 1; then echo $ac_n "checking for glibc 2.1 or later""... $ac_c" 1>&6 -echo "configure:1402: checking for glibc 2.1 or later" >&5 +echo "configure:1401: checking for glibc 2.1 or later" >&5 if eval "test \"`echo '$''{'wx_lib_glibc21'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -1415,7 +1414,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_lib_glibc21=yes @@ -1456,6 +1455,8 @@ DEBUG_CONFIGURE=0 if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_UNIVERSAL=no + DEFAULT_wxUSE_NANOX=no + DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes @@ -1489,7 +1490,6 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_LIBJPEG=no DEFAULT_wxUSE_LIBTIFF=no DEFAULT_wxUSE_ODBC=no - DEFAULT_wxUSE_FREETYPE=no DEFAULT_wxUSE_OPENGL=no DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no @@ -1629,6 +1629,8 @@ if test $DEBUG_CONFIGURE = 1; then else DEFAULT_wxUSE_UNIVERSAL=no + DEFAULT_wxUSE_NANOX=no + DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes @@ -1661,7 +1663,6 @@ else DEFAULT_wxUSE_LIBJPEG=yes DEFAULT_wxUSE_LIBTIFF=yes DEFAULT_wxUSE_ODBC=no - DEFAULT_wxUSE_FREETYPE=no DEFAULT_wxUSE_OPENGL=no DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes @@ -1814,7 +1815,7 @@ done echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6 -echo "configure:1818: checking for --enable-gui" >&5 +echo "configure:1819: checking for --enable-gui" >&5 no_cache=0 # Check whether --enable-gui or --disable-gui was given. if test "${enable_gui+set}" = set; then @@ -1856,7 +1857,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6 -echo "configure:1860: checking for --enable-universal" >&5 +echo "configure:1861: checking for --enable-universal" >&5 no_cache=0 # Check whether --enable-universal or --disable-universal was given. if test "${enable_universal+set}" = set; then @@ -1944,10 +1945,49 @@ fi # Check whether --with-x11 or --without-x11 was given. if test "${with_x11+set}" = set; then withval="$with_x11" - wxUSE_X11="$withval" CACHE_X11=1 TOOLKIT_GIVEN=1 + wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1 fi + echo $ac_n "checking for --enable-nanox""... $ac_c" 1>&6 +echo "configure:1954: checking for --enable-nanox" >&5 + no_cache=0 + # Check whether --enable-nanox or --disable-nanox was given. +if test "${enable_nanox+set}" = set; then + enableval="$enable_nanox" + + if test "$enableval" = yes; then + ac_cv_use_nanox='wxUSE_NANOX=yes' + else + ac_cv_use_nanox='wxUSE_NANOX=no' + fi + +else + + LINE=`grep "wxUSE_NANOX" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_nanox='wxUSE_NANOX='$DEFAULT_wxUSE_NANOX + +fi + + + eval "$ac_cv_use_nanox" + if test "$no_cache" != 1; then + echo $ac_cv_use_nanox >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_NANOX" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + # Check whether --enable-gtk2 or --disable-gtk2 was given. if test "${enable_gtk2+set}" = set; then enableval="$enable_gtk2" @@ -1959,7 +1999,7 @@ fi echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6 -echo "configure:1963: checking for --with-libpng" >&5 +echo "configure:2003: checking for --with-libpng" >&5 no_cache=0 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then @@ -2010,7 +2050,7 @@ fi echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6 -echo "configure:2014: checking for --with-libjpeg" >&5 +echo "configure:2054: checking for --with-libjpeg" >&5 no_cache=0 # Check whether --with-libjpeg or --without-libjpeg was given. if test "${with_libjpeg+set}" = set; then @@ -2061,7 +2101,7 @@ fi echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6 -echo "configure:2065: checking for --with-libtiff" >&5 +echo "configure:2105: checking for --with-libtiff" >&5 no_cache=0 # Check whether --with-libtiff or --without-libtiff was given. if test "${with_libtiff+set}" = set; then @@ -2111,59 +2151,8 @@ fi fi - echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6 -echo "configure:2116: checking for --with-freetype" >&5 - no_cache=0 - # Check whether --with-freetype or --without-freetype was given. -if test "${with_freetype+set}" = set; then - withval="$with_freetype" - - if test "$withval" = yes; then - ac_cv_use_freetype='wxUSE_FREETYPE=yes' - elif test "$withval" = no; then - ac_cv_use_freetype='wxUSE_FREETYPE=no' - elif test "$withval" = sys; then - ac_cv_use_freetype='wxUSE_FREETYPE=sys' - elif test "$withval" = builtin; then - ac_cv_use_freetype='wxUSE_FREETYPE=builtin' - else - { echo "configure: error: Invalid value for --with-freetype: should be yes, no, sys, or builtin" 1>&2; exit 1; } - fi - -else - - LINE=`grep "wxUSE_FREETYPE" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - ac_cv_use_freetype='wxUSE_FREETYPE='$DEFAULT_wxUSE_FREETYPE - -fi - - - eval "$ac_cv_use_freetype" - if test "$no_cache" != 1; then - echo $ac_cv_use_freetype >> ${wx_arg_cache_file}.tmp - fi - - if test "$wxUSE_FREETYPE" = yes; then - echo "$ac_t""yes" 1>&6 - elif test "$wxUSE_FREETYPE" = no; then - echo "$ac_t""no" 1>&6 - elif test "$wxUSE_FREETYPE" = sys; then - echo "$ac_t""system version" 1>&6 - elif test "$wxUSE_FREETYPE" = builtin; then - echo "$ac_t""builtin version" 1>&6 - else - { echo "configure: error: Invalid value for --with-freetype: should be yes, no, sys, or builtin" 1>&2; exit 1; } - fi - - echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6 -echo "configure:2167: checking for --with-opengl" >&5 +echo "configure:2156: checking for --with-opengl" >&5 no_cache=0 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then @@ -2205,7 +2194,7 @@ fi echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6 -echo "configure:2209: checking for --with-dmalloc" >&5 +echo "configure:2198: checking for --with-dmalloc" >&5 no_cache=0 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -2244,7 +2233,7 @@ fi echo $ac_n "checking for --with-regex""... $ac_c" 1>&6 -echo "configure:2248: checking for --with-regex" >&5 +echo "configure:2237: checking for --with-regex" >&5 no_cache=0 # Check whether --with-regex or --without-regex was given. if test "${with_regex+set}" = set; then @@ -2295,7 +2284,7 @@ fi echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6 -echo "configure:2299: checking for --with-zlib" >&5 +echo "configure:2288: checking for --with-zlib" >&5 no_cache=0 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -2346,7 +2335,7 @@ fi echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6 -echo "configure:2350: checking for --with-odbc" >&5 +echo "configure:2339: checking for --with-odbc" >&5 no_cache=0 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then @@ -2387,7 +2376,7 @@ fi echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6 -echo "configure:2391: checking for --enable-shared" >&5 +echo "configure:2380: checking for --enable-shared" >&5 no_cache=0 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then @@ -2426,7 +2415,7 @@ fi echo $ac_n "checking for --enable-soname""... $ac_c" 1>&6 -echo "configure:2430: checking for --enable-soname" >&5 +echo "configure:2419: checking for --enable-soname" >&5 no_cache=0 # Check whether --enable-soname or --disable-soname was given. if test "${enable_soname+set}" = set; then @@ -2465,7 +2454,7 @@ fi echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6 -echo "configure:2469: checking for --enable-optimise" >&5 +echo "configure:2458: checking for --enable-optimise" >&5 no_cache=0 # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then @@ -2504,7 +2493,7 @@ fi echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6 -echo "configure:2508: checking for --enable-debug" >&5 +echo "configure:2497: checking for --enable-debug" >&5 no_cache=0 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -2544,7 +2533,7 @@ fi echo $ac_n "checking for --enable-precomp""... $ac_c" 1>&6 -echo "configure:2548: checking for --enable-precomp" >&5 +echo "configure:2537: checking for --enable-precomp" >&5 no_cache=0 # Check whether --enable-precomp or --disable-precomp was given. if test "${enable_precomp+set}" = set; then @@ -2592,7 +2581,7 @@ fi echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6 -echo "configure:2596: checking for --enable-debug_flag" >&5 +echo "configure:2585: 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 @@ -2631,7 +2620,7 @@ fi echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6 -echo "configure:2635: checking for --enable-debug_info" >&5 +echo "configure:2624: 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 @@ -2670,7 +2659,7 @@ fi echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6 -echo "configure:2674: checking for --enable-debug_gdb" >&5 +echo "configure:2663: 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 @@ -2709,7 +2698,7 @@ fi echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6 -echo "configure:2713: checking for --enable-debug_cntxt" >&5 +echo "configure:2702: 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 @@ -2748,7 +2737,7 @@ fi echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6 -echo "configure:2752: checking for --enable-mem_tracing" >&5 +echo "configure:2741: 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 @@ -2787,7 +2776,7 @@ fi echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6 -echo "configure:2791: checking for --enable-profile" >&5 +echo "configure:2780: checking for --enable-profile" >&5 no_cache=0 # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then @@ -2826,7 +2815,7 @@ fi echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6 -echo "configure:2830: checking for --enable-no_rtti" >&5 +echo "configure:2819: 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 @@ -2865,7 +2854,7 @@ fi echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6 -echo "configure:2869: checking for --enable-no_exceptions" >&5 +echo "configure:2858: 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 @@ -2904,7 +2893,7 @@ fi echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6 -echo "configure:2908: checking for --enable-permissive" >&5 +echo "configure:2897: checking for --enable-permissive" >&5 no_cache=0 # Check whether --enable-permissive or --disable-permissive was given. if test "${enable_permissive+set}" = set; then @@ -2943,7 +2932,7 @@ fi echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6 -echo "configure:2947: checking for --enable-no_deps" >&5 +echo "configure:2936: 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 @@ -2983,7 +2972,7 @@ fi echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6 -echo "configure:2987: checking for --enable-compat20" >&5 +echo "configure:2976: checking for --enable-compat20" >&5 no_cache=0 # Check whether --enable-compat20 or --disable-compat20 was given. if test "${enable_compat20+set}" = set; then @@ -3022,7 +3011,7 @@ fi echo $ac_n "checking for --enable-compat22""... $ac_c" 1>&6 -echo "configure:3026: checking for --enable-compat22" >&5 +echo "configure:3015: checking for --enable-compat22" >&5 no_cache=0 # Check whether --enable-compat22 or --disable-compat22 was given. if test "${enable_compat22+set}" = set; then @@ -3063,7 +3052,7 @@ fi echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6 -echo "configure:3067: checking for --enable-intl" >&5 +echo "configure:3056: checking for --enable-intl" >&5 no_cache=0 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then @@ -3102,7 +3091,7 @@ fi echo $ac_n "checking for --enable-config""... $ac_c" 1>&6 -echo "configure:3106: checking for --enable-config" >&5 +echo "configure:3095: checking for --enable-config" >&5 no_cache=0 # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -3142,7 +3131,7 @@ fi echo $ac_n "checking for --enable-protocols""... $ac_c" 1>&6 -echo "configure:3146: checking for --enable-protocols" >&5 +echo "configure:3135: checking for --enable-protocols" >&5 no_cache=0 # Check whether --enable-protocols or --disable-protocols was given. if test "${enable_protocols+set}" = set; then @@ -3181,7 +3170,7 @@ fi echo $ac_n "checking for --enable-ftp""... $ac_c" 1>&6 -echo "configure:3185: checking for --enable-ftp" >&5 +echo "configure:3174: checking for --enable-ftp" >&5 no_cache=0 # Check whether --enable-ftp or --disable-ftp was given. if test "${enable_ftp+set}" = set; then @@ -3220,7 +3209,7 @@ fi echo $ac_n "checking for --enable-http""... $ac_c" 1>&6 -echo "configure:3224: checking for --enable-http" >&5 +echo "configure:3213: checking for --enable-http" >&5 no_cache=0 # Check whether --enable-http or --disable-http was given. if test "${enable_http+set}" = set; then @@ -3259,7 +3248,7 @@ fi echo $ac_n "checking for --enable-fileproto""... $ac_c" 1>&6 -echo "configure:3263: checking for --enable-fileproto" >&5 +echo "configure:3252: checking for --enable-fileproto" >&5 no_cache=0 # Check whether --enable-fileproto or --disable-fileproto was given. if test "${enable_fileproto+set}" = set; then @@ -3298,7 +3287,7 @@ fi echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6 -echo "configure:3302: checking for --enable-sockets" >&5 +echo "configure:3291: checking for --enable-sockets" >&5 no_cache=0 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then @@ -3338,7 +3327,7 @@ fi echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6 -echo "configure:3342: checking for --enable-ipc" >&5 +echo "configure:3331: checking for --enable-ipc" >&5 no_cache=0 # Check whether --enable-ipc or --disable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -3378,7 +3367,7 @@ fi echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6 -echo "configure:3382: checking for --enable-cmdline" >&5 +echo "configure:3371: checking for --enable-cmdline" >&5 no_cache=0 # Check whether --enable-cmdline or --disable-cmdline was given. if test "${enable_cmdline+set}" = set; then @@ -3417,7 +3406,7 @@ fi echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6 -echo "configure:3421: checking for --enable-datetime" >&5 +echo "configure:3410: checking for --enable-datetime" >&5 no_cache=0 # Check whether --enable-datetime or --disable-datetime was given. if test "${enable_datetime+set}" = set; then @@ -3456,7 +3445,7 @@ fi echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6 -echo "configure:3460: checking for --enable-timedate" >&5 +echo "configure:3449: checking for --enable-timedate" >&5 no_cache=0 # Check whether --enable-timedate or --disable-timedate was given. if test "${enable_timedate+set}" = set; then @@ -3495,7 +3484,7 @@ fi echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6 -echo "configure:3499: checking for --enable-stopwatch" >&5 +echo "configure:3488: checking for --enable-stopwatch" >&5 no_cache=0 # Check whether --enable-stopwatch or --disable-stopwatch was given. if test "${enable_stopwatch+set}" = set; then @@ -3534,7 +3523,7 @@ fi echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6 -echo "configure:3538: checking for --enable-dialupman" >&5 +echo "configure:3527: checking for --enable-dialupman" >&5 no_cache=0 # Check whether --enable-dialupman or --disable-dialupman was given. if test "${enable_dialupman+set}" = set; then @@ -3573,7 +3562,7 @@ fi echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6 -echo "configure:3577: checking for --enable-apple_ieee" >&5 +echo "configure:3566: 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 @@ -3612,7 +3601,7 @@ fi echo $ac_n "checking for --enable-timer""... $ac_c" 1>&6 -echo "configure:3616: checking for --enable-timer" >&5 +echo "configure:3605: checking for --enable-timer" >&5 no_cache=0 # Check whether --enable-timer or --disable-timer was given. if test "${enable_timer+set}" = set; then @@ -3651,7 +3640,7 @@ fi echo $ac_n "checking for --enable-wave""... $ac_c" 1>&6 -echo "configure:3655: checking for --enable-wave" >&5 +echo "configure:3644: checking for --enable-wave" >&5 no_cache=0 # Check whether --enable-wave or --disable-wave was given. if test "${enable_wave+set}" = set; then @@ -3690,7 +3679,7 @@ fi echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6 -echo "configure:3694: checking for --enable-fraction" >&5 +echo "configure:3683: checking for --enable-fraction" >&5 no_cache=0 # Check whether --enable-fraction or --disable-fraction was given. if test "${enable_fraction+set}" = set; then @@ -3729,7 +3718,7 @@ fi echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6 -echo "configure:3733: checking for --enable-dynlib" >&5 +echo "configure:3722: checking for --enable-dynlib" >&5 no_cache=0 # Check whether --enable-dynlib or --disable-dynlib was given. if test "${enable_dynlib+set}" = set; then @@ -3768,7 +3757,7 @@ fi echo $ac_n "checking for --enable-dynamicloader""... $ac_c" 1>&6 -echo "configure:3772: checking for --enable-dynamicloader" >&5 +echo "configure:3761: checking for --enable-dynamicloader" >&5 no_cache=0 # Check whether --enable-dynamicloader or --disable-dynamicloader was given. if test "${enable_dynamicloader+set}" = set; then @@ -3807,7 +3796,7 @@ fi echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6 -echo "configure:3811: checking for --enable-longlong" >&5 +echo "configure:3800: checking for --enable-longlong" >&5 no_cache=0 # Check whether --enable-longlong or --disable-longlong was given. if test "${enable_longlong+set}" = set; then @@ -3846,7 +3835,7 @@ fi echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6 -echo "configure:3850: checking for --enable-geometry" >&5 +echo "configure:3839: checking for --enable-geometry" >&5 no_cache=0 # Check whether --enable-geometry or --disable-geometry was given. if test "${enable_geometry+set}" = set; then @@ -3885,7 +3874,7 @@ fi echo $ac_n "checking for --enable-log""... $ac_c" 1>&6 -echo "configure:3889: checking for --enable-log" >&5 +echo "configure:3878: checking for --enable-log" >&5 no_cache=0 # Check whether --enable-log or --disable-log was given. if test "${enable_log+set}" = set; then @@ -3924,7 +3913,7 @@ fi echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6 -echo "configure:3928: checking for --enable-streams" >&5 +echo "configure:3917: checking for --enable-streams" >&5 no_cache=0 # Check whether --enable-streams or --disable-streams was given. if test "${enable_streams+set}" = set; then @@ -3963,7 +3952,7 @@ fi echo $ac_n "checking for --enable-file""... $ac_c" 1>&6 -echo "configure:3967: checking for --enable-file" >&5 +echo "configure:3956: checking for --enable-file" >&5 no_cache=0 # Check whether --enable-file or --disable-file was given. if test "${enable_file+set}" = set; then @@ -4002,7 +3991,7 @@ fi echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6 -echo "configure:4006: checking for --enable-ffile" >&5 +echo "configure:3995: checking for --enable-ffile" >&5 no_cache=0 # Check whether --enable-ffile or --disable-ffile was given. if test "${enable_ffile+set}" = set; then @@ -4041,7 +4030,7 @@ fi echo $ac_n "checking for --enable-textbuf""... $ac_c" 1>&6 -echo "configure:4045: checking for --enable-textbuf" >&5 +echo "configure:4034: checking for --enable-textbuf" >&5 no_cache=0 # Check whether --enable-textbuf or --disable-textbuf was given. if test "${enable_textbuf+set}" = set; then @@ -4080,7 +4069,7 @@ fi echo $ac_n "checking for --enable-textfile""... $ac_c" 1>&6 -echo "configure:4084: checking for --enable-textfile" >&5 +echo "configure:4073: checking for --enable-textfile" >&5 no_cache=0 # Check whether --enable-textfile or --disable-textfile was given. if test "${enable_textfile+set}" = set; then @@ -4119,7 +4108,7 @@ fi echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6 -echo "configure:4123: checking for --enable-fontmap" >&5 +echo "configure:4112: checking for --enable-fontmap" >&5 no_cache=0 # Check whether --enable-fontmap or --disable-fontmap was given. if test "${enable_fontmap+set}" = set; then @@ -4158,7 +4147,7 @@ fi echo $ac_n "checking for --enable-unicode""... $ac_c" 1>&6 -echo "configure:4162: checking for --enable-unicode" >&5 +echo "configure:4151: checking for --enable-unicode" >&5 no_cache=0 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then @@ -4197,7 +4186,7 @@ fi echo $ac_n "checking for --enable-mslu""... $ac_c" 1>&6 -echo "configure:4201: checking for --enable-mslu" >&5 +echo "configure:4190: checking for --enable-mslu" >&5 no_cache=0 # Check whether --enable-mslu or --disable-mslu was given. if test "${enable_mslu+set}" = set; then @@ -4236,7 +4225,7 @@ fi echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6 -echo "configure:4240: checking for --enable-wxprintfv" >&5 +echo "configure:4229: checking for --enable-wxprintfv" >&5 no_cache=0 # Check whether --enable-wxprintfv or --disable-wxprintfv was given. if test "${enable_wxprintfv+set}" = set; then @@ -4275,7 +4264,7 @@ fi echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6 -echo "configure:4279: checking for --enable-std_iostreams" >&5 +echo "configure:4268: 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 @@ -4314,7 +4303,7 @@ fi echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6 -echo "configure:4318: checking for --enable-filesystem" >&5 +echo "configure:4307: checking for --enable-filesystem" >&5 no_cache=0 # Check whether --enable-filesystem or --disable-filesystem was given. if test "${enable_filesystem+set}" = set; then @@ -4353,7 +4342,7 @@ fi echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6 -echo "configure:4357: checking for --enable-fs_inet" >&5 +echo "configure:4346: 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 @@ -4392,7 +4381,7 @@ fi echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6 -echo "configure:4396: checking for --enable-fs_zip" >&5 +echo "configure:4385: 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 @@ -4431,7 +4420,7 @@ fi echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6 -echo "configure:4435: checking for --enable-zipstream" >&5 +echo "configure:4424: checking for --enable-zipstream" >&5 no_cache=0 # Check whether --enable-zipstream or --disable-zipstream was given. if test "${enable_zipstream+set}" = set; then @@ -4471,7 +4460,7 @@ fi echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6 -echo "configure:4475: checking for --enable-catch_segvs" >&5 +echo "configure:4464: 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 @@ -4510,7 +4499,7 @@ fi echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6 -echo "configure:4514: checking for --enable-snglinst" >&5 +echo "configure:4503: checking for --enable-snglinst" >&5 no_cache=0 # Check whether --enable-snglinst or --disable-snglinst was given. if test "${enable_snglinst+set}" = set; then @@ -4550,7 +4539,7 @@ fi echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6 -echo "configure:4554: checking for --enable-mimetype" >&5 +echo "configure:4543: checking for --enable-mimetype" >&5 no_cache=0 # Check whether --enable-mimetype or --disable-mimetype was given. if test "${enable_mimetype+set}" = set; then @@ -4589,7 +4578,7 @@ fi echo $ac_n "checking for --enable-system_options""... $ac_c" 1>&6 -echo "configure:4593: checking for --enable-system_options" >&5 +echo "configure:4582: 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 @@ -4629,7 +4618,7 @@ fi echo $ac_n "checking for --enable-url""... $ac_c" 1>&6 -echo "configure:4633: checking for --enable-url" >&5 +echo "configure:4622: checking for --enable-url" >&5 no_cache=0 # Check whether --enable-url or --disable-url was given. if test "${enable_url+set}" = set; then @@ -4668,7 +4657,7 @@ fi echo $ac_n "checking for --enable-protocol""... $ac_c" 1>&6 -echo "configure:4672: checking for --enable-protocol" >&5 +echo "configure:4661: checking for --enable-protocol" >&5 no_cache=0 # Check whether --enable-protocol or --disable-protocol was given. if test "${enable_protocol+set}" = set; then @@ -4707,7 +4696,7 @@ fi echo $ac_n "checking for --enable-protocol_http""... $ac_c" 1>&6 -echo "configure:4711: checking for --enable-protocol_http" >&5 +echo "configure:4700: 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 @@ -4746,7 +4735,7 @@ fi echo $ac_n "checking for --enable-protocol_ftp""... $ac_c" 1>&6 -echo "configure:4750: checking for --enable-protocol_ftp" >&5 +echo "configure:4739: 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 @@ -4785,7 +4774,7 @@ fi echo $ac_n "checking for --enable-protocol_file""... $ac_c" 1>&6 -echo "configure:4789: checking for --enable-protocol_file" >&5 +echo "configure:4778: 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 @@ -4827,7 +4816,7 @@ fi echo $ac_n "checking for --enable-threads""... $ac_c" 1>&6 -echo "configure:4831: checking for --enable-threads" >&5 +echo "configure:4820: checking for --enable-threads" >&5 no_cache=0 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then @@ -4870,7 +4859,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6 -echo "configure:4874: checking for --enable-docview" >&5 +echo "configure:4863: checking for --enable-docview" >&5 no_cache=0 # Check whether --enable-docview or --disable-docview was given. if test "${enable_docview+set}" = set; then @@ -4909,7 +4898,7 @@ fi echo $ac_n "checking for --enable-help""... $ac_c" 1>&6 -echo "configure:4913: checking for --enable-help" >&5 +echo "configure:4902: checking for --enable-help" >&5 no_cache=0 # Check whether --enable-help or --disable-help was given. if test "${enable_help+set}" = set; then @@ -4948,7 +4937,7 @@ fi echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6 -echo "configure:4952: checking for --enable-mshtmlhelp" >&5 +echo "configure:4941: checking for --enable-mshtmlhelp" >&5 no_cache=0 # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given. if test "${enable_mshtmlhelp+set}" = set; then @@ -4987,7 +4976,7 @@ fi echo $ac_n "checking for --enable-html""... $ac_c" 1>&6 -echo "configure:4991: checking for --enable-html" >&5 +echo "configure:4980: checking for --enable-html" >&5 no_cache=0 # Check whether --enable-html or --disable-html was given. if test "${enable_html+set}" = set; then @@ -5026,7 +5015,7 @@ fi echo $ac_n "checking for --enable-htmlhelp""... $ac_c" 1>&6 -echo "configure:5030: checking for --enable-htmlhelp" >&5 +echo "configure:5019: checking for --enable-htmlhelp" >&5 no_cache=0 # Check whether --enable-htmlhelp or --disable-htmlhelp was given. if test "${enable_htmlhelp+set}" = set; then @@ -5065,7 +5054,7 @@ fi echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6 -echo "configure:5069: checking for --enable-constraints" >&5 +echo "configure:5058: checking for --enable-constraints" >&5 no_cache=0 # Check whether --enable-constraints or --disable-constraints was given. if test "${enable_constraints+set}" = set; then @@ -5104,7 +5093,7 @@ fi echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6 -echo "configure:5108: checking for --enable-printarch" >&5 +echo "configure:5097: checking for --enable-printarch" >&5 no_cache=0 # Check whether --enable-printarch or --disable-printarch was given. if test "${enable_printarch+set}" = set; then @@ -5143,7 +5132,7 @@ fi echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6 -echo "configure:5147: checking for --enable-mdi" >&5 +echo "configure:5136: checking for --enable-mdi" >&5 no_cache=0 # Check whether --enable-mdi or --disable-mdi was given. if test "${enable_mdi+set}" = set; then @@ -5182,7 +5171,7 @@ fi echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6 -echo "configure:5186: checking for --enable-loggui" >&5 +echo "configure:5175: checking for --enable-loggui" >&5 no_cache=0 # Check whether --enable-loggui or --disable-loggui was given. if test "${enable_loggui+set}" = set; then @@ -5221,7 +5210,7 @@ fi echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6 -echo "configure:5225: checking for --enable-logwin" >&5 +echo "configure:5214: checking for --enable-logwin" >&5 no_cache=0 # Check whether --enable-logwin or --disable-logwin was given. if test "${enable_logwin+set}" = set; then @@ -5260,7 +5249,7 @@ fi echo $ac_n "checking for --enable-logdialog""... $ac_c" 1>&6 -echo "configure:5264: checking for --enable-logdialog" >&5 +echo "configure:5253: checking for --enable-logdialog" >&5 no_cache=0 # Check whether --enable-logdialog or --disable-logdialog was given. if test "${enable_logdialog+set}" = set; then @@ -5300,7 +5289,7 @@ fi echo $ac_n "checking for --enable-postscript""... $ac_c" 1>&6 -echo "configure:5304: checking for --enable-postscript" >&5 +echo "configure:5293: checking for --enable-postscript" >&5 no_cache=0 # Check whether --enable-postscript or --disable-postscript was given. if test "${enable_postscript+set}" = set; then @@ -5342,7 +5331,7 @@ fi echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6 -echo "configure:5346: checking for --enable-prologio" >&5 +echo "configure:5335: checking for --enable-prologio" >&5 no_cache=0 # Check whether --enable-prologio or --disable-prologio was given. if test "${enable_prologio+set}" = set; then @@ -5381,7 +5370,7 @@ fi echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6 -echo "configure:5385: checking for --enable-resources" >&5 +echo "configure:5374: checking for --enable-resources" >&5 no_cache=0 # Check whether --enable-resources or --disable-resources was given. if test "${enable_resources+set}" = set; then @@ -5421,7 +5410,7 @@ fi echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6 -echo "configure:5425: checking for --enable-xresources" >&5 +echo "configure:5414: checking for --enable-xresources" >&5 no_cache=0 # Check whether --enable-xresources or --disable-xresources was given. if test "${enable_xresources+set}" = set; then @@ -5462,7 +5451,7 @@ fi echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6 -echo "configure:5466: checking for --enable-clipboard" >&5 +echo "configure:5455: checking for --enable-clipboard" >&5 no_cache=0 # Check whether --enable-clipboard or --disable-clipboard was given. if test "${enable_clipboard+set}" = set; then @@ -5501,7 +5490,7 @@ fi echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6 -echo "configure:5505: checking for --enable-dnd" >&5 +echo "configure:5494: checking for --enable-dnd" >&5 no_cache=0 # Check whether --enable-dnd or --disable-dnd was given. if test "${enable_dnd+set}" = set; then @@ -5540,7 +5529,7 @@ fi echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6 -echo "configure:5544: checking for --enable-metafile" >&5 +echo "configure:5533: checking for --enable-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -5580,7 +5569,7 @@ fi echo $ac_n "checking for --enable-treelayout""... $ac_c" 1>&6 -echo "configure:5584: checking for --enable-treelayout" >&5 +echo "configure:5573: checking for --enable-treelayout" >&5 no_cache=0 # Check whether --enable-treelayout or --disable-treelayout was given. if test "${enable_treelayout+set}" = set; then @@ -5621,7 +5610,7 @@ fi echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6 -echo "configure:5625: checking for --enable-controls" >&5 +echo "configure:5614: checking for --enable-controls" >&5 no_cache=0 # Check whether --enable-controls or --disable-controls was given. if test "${enable_controls+set}" = set; then @@ -5741,7 +5730,7 @@ fi echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6 -echo "configure:5745: checking for --enable-accel" >&5 +echo "configure:5734: checking for --enable-accel" >&5 no_cache=0 # Check whether --enable-accel or --disable-accel was given. if test "${enable_accel+set}" = set; then @@ -5780,7 +5769,7 @@ fi echo $ac_n "checking for --enable-button""... $ac_c" 1>&6 -echo "configure:5784: checking for --enable-button" >&5 +echo "configure:5773: checking for --enable-button" >&5 no_cache=0 # Check whether --enable-button or --disable-button was given. if test "${enable_button+set}" = set; then @@ -5819,7 +5808,7 @@ fi echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6 -echo "configure:5823: checking for --enable-bmpbutton" >&5 +echo "configure:5812: checking for --enable-bmpbutton" >&5 no_cache=0 # Check whether --enable-bmpbutton or --disable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then @@ -5858,7 +5847,7 @@ fi echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6 -echo "configure:5862: checking for --enable-calendar" >&5 +echo "configure:5851: checking for --enable-calendar" >&5 no_cache=0 # Check whether --enable-calendar or --disable-calendar was given. if test "${enable_calendar+set}" = set; then @@ -5897,7 +5886,7 @@ fi echo $ac_n "checking for --enable-caret""... $ac_c" 1>&6 -echo "configure:5901: checking for --enable-caret" >&5 +echo "configure:5890: checking for --enable-caret" >&5 no_cache=0 # Check whether --enable-caret or --disable-caret was given. if test "${enable_caret+set}" = set; then @@ -5936,7 +5925,7 @@ fi echo $ac_n "checking for --enable-checkbox""... $ac_c" 1>&6 -echo "configure:5940: checking for --enable-checkbox" >&5 +echo "configure:5929: checking for --enable-checkbox" >&5 no_cache=0 # Check whether --enable-checkbox or --disable-checkbox was given. if test "${enable_checkbox+set}" = set; then @@ -5975,7 +5964,7 @@ fi echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6 -echo "configure:5979: checking for --enable-checklst" >&5 +echo "configure:5968: checking for --enable-checklst" >&5 no_cache=0 # Check whether --enable-checklst or --disable-checklst was given. if test "${enable_checklst+set}" = set; then @@ -6014,7 +6003,7 @@ fi echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6 -echo "configure:6018: checking for --enable-choice" >&5 +echo "configure:6007: checking for --enable-choice" >&5 no_cache=0 # Check whether --enable-choice or --disable-choice was given. if test "${enable_choice+set}" = set; then @@ -6053,7 +6042,7 @@ fi echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6 -echo "configure:6057: checking for --enable-combobox" >&5 +echo "configure:6046: checking for --enable-combobox" >&5 no_cache=0 # Check whether --enable-combobox or --disable-combobox was given. if test "${enable_combobox+set}" = set; then @@ -6092,7 +6081,7 @@ fi echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6 -echo "configure:6096: checking for --enable-gauge" >&5 +echo "configure:6085: checking for --enable-gauge" >&5 no_cache=0 # Check whether --enable-gauge or --disable-gauge was given. if test "${enable_gauge+set}" = set; then @@ -6131,7 +6120,7 @@ fi echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6 -echo "configure:6135: checking for --enable-grid" >&5 +echo "configure:6124: checking for --enable-grid" >&5 no_cache=0 # Check whether --enable-grid or --disable-grid was given. if test "${enable_grid+set}" = set; then @@ -6170,7 +6159,7 @@ fi echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6 -echo "configure:6174: checking for --enable-newgrid" >&5 +echo "configure:6163: checking for --enable-newgrid" >&5 no_cache=0 # Check whether --enable-newgrid or --disable-newgrid was given. if test "${enable_newgrid+set}" = set; then @@ -6209,7 +6198,7 @@ fi echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6 -echo "configure:6213: checking for --enable-imaglist" >&5 +echo "configure:6202: checking for --enable-imaglist" >&5 no_cache=0 # Check whether --enable-imaglist or --disable-imaglist was given. if test "${enable_imaglist+set}" = set; then @@ -6248,7 +6237,7 @@ fi echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6 -echo "configure:6252: checking for --enable-listbox" >&5 +echo "configure:6241: checking for --enable-listbox" >&5 no_cache=0 # Check whether --enable-listbox or --disable-listbox was given. if test "${enable_listbox+set}" = set; then @@ -6287,7 +6276,7 @@ fi echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6 -echo "configure:6291: checking for --enable-listctrl" >&5 +echo "configure:6280: checking for --enable-listctrl" >&5 no_cache=0 # Check whether --enable-listctrl or --disable-listctrl was given. if test "${enable_listctrl+set}" = set; then @@ -6326,7 +6315,7 @@ fi echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6 -echo "configure:6330: checking for --enable-notebook" >&5 +echo "configure:6319: checking for --enable-notebook" >&5 no_cache=0 # Check whether --enable-notebook or --disable-notebook was given. if test "${enable_notebook+set}" = set; then @@ -6365,7 +6354,7 @@ fi echo $ac_n "checking for --enable-propsheet""... $ac_c" 1>&6 -echo "configure:6369: checking for --enable-propsheet" >&5 +echo "configure:6358: checking for --enable-propsheet" >&5 no_cache=0 # Check whether --enable-propsheet or --disable-propsheet was given. if test "${enable_propsheet+set}" = set; then @@ -6404,7 +6393,7 @@ fi echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6 -echo "configure:6408: checking for --enable-radiobox" >&5 +echo "configure:6397: checking for --enable-radiobox" >&5 no_cache=0 # Check whether --enable-radiobox or --disable-radiobox was given. if test "${enable_radiobox+set}" = set; then @@ -6443,7 +6432,7 @@ fi echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6 -echo "configure:6447: checking for --enable-radiobtn" >&5 +echo "configure:6436: checking for --enable-radiobtn" >&5 no_cache=0 # Check whether --enable-radiobtn or --disable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then @@ -6482,7 +6471,7 @@ fi echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6 -echo "configure:6486: checking for --enable-sash" >&5 +echo "configure:6475: checking for --enable-sash" >&5 no_cache=0 # Check whether --enable-sash or --disable-sash was given. if test "${enable_sash+set}" = set; then @@ -6521,7 +6510,7 @@ fi echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6 -echo "configure:6525: checking for --enable-scrollbar" >&5 +echo "configure:6514: checking for --enable-scrollbar" >&5 no_cache=0 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -6560,7 +6549,7 @@ fi echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6 -echo "configure:6564: checking for --enable-slider" >&5 +echo "configure:6553: checking for --enable-slider" >&5 no_cache=0 # Check whether --enable-slider or --disable-slider was given. if test "${enable_slider+set}" = set; then @@ -6599,7 +6588,7 @@ fi echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6 -echo "configure:6603: checking for --enable-spinbtn" >&5 +echo "configure:6592: checking for --enable-spinbtn" >&5 no_cache=0 # Check whether --enable-spinbtn or --disable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then @@ -6638,7 +6627,7 @@ fi echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6 -echo "configure:6642: checking for --enable-spinctrl" >&5 +echo "configure:6631: checking for --enable-spinctrl" >&5 no_cache=0 # Check whether --enable-spinctrl or --disable-spinctrl was given. if test "${enable_spinctrl+set}" = set; then @@ -6677,7 +6666,7 @@ fi echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6 -echo "configure:6681: checking for --enable-splitter" >&5 +echo "configure:6670: checking for --enable-splitter" >&5 no_cache=0 # Check whether --enable-splitter or --disable-splitter was given. if test "${enable_splitter+set}" = set; then @@ -6716,7 +6705,7 @@ fi echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6 -echo "configure:6720: checking for --enable-statbmp" >&5 +echo "configure:6709: checking for --enable-statbmp" >&5 no_cache=0 # Check whether --enable-statbmp or --disable-statbmp was given. if test "${enable_statbmp+set}" = set; then @@ -6755,7 +6744,7 @@ fi echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6 -echo "configure:6759: checking for --enable-statbox" >&5 +echo "configure:6748: checking for --enable-statbox" >&5 no_cache=0 # Check whether --enable-statbox or --disable-statbox was given. if test "${enable_statbox+set}" = set; then @@ -6794,7 +6783,7 @@ fi echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6 -echo "configure:6798: checking for --enable-statline" >&5 +echo "configure:6787: checking for --enable-statline" >&5 no_cache=0 # Check whether --enable-statline or --disable-statline was given. if test "${enable_statline+set}" = set; then @@ -6833,7 +6822,7 @@ fi echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6 -echo "configure:6837: checking for --enable-stattext" >&5 +echo "configure:6826: checking for --enable-stattext" >&5 no_cache=0 # Check whether --enable-stattext or --disable-stattext was given. if test "${enable_stattext+set}" = set; then @@ -6872,7 +6861,7 @@ fi echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6 -echo "configure:6876: checking for --enable-statusbar" >&5 +echo "configure:6865: checking for --enable-statusbar" >&5 no_cache=0 # Check whether --enable-statusbar or --disable-statusbar was given. if test "${enable_statusbar+set}" = set; then @@ -6911,7 +6900,7 @@ fi echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6 -echo "configure:6915: checking for --enable-tabdialog" >&5 +echo "configure:6904: checking for --enable-tabdialog" >&5 no_cache=0 # Check whether --enable-tabdialog or --disable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then @@ -6950,7 +6939,7 @@ fi echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6 -echo "configure:6954: checking for --enable-textctrl" >&5 +echo "configure:6943: checking for --enable-textctrl" >&5 no_cache=0 # Check whether --enable-textctrl or --disable-textctrl was given. if test "${enable_textctrl+set}" = set; then @@ -6989,7 +6978,7 @@ fi echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6 -echo "configure:6993: checking for --enable-togglebtn" >&5 +echo "configure:6982: checking for --enable-togglebtn" >&5 no_cache=0 # Check whether --enable-togglebtn or --disable-togglebtn was given. if test "${enable_togglebtn+set}" = set; then @@ -7028,7 +7017,7 @@ fi echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6 -echo "configure:7032: checking for --enable-toolbar" >&5 +echo "configure:7021: checking for --enable-toolbar" >&5 no_cache=0 # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then @@ -7067,7 +7056,7 @@ fi echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6 -echo "configure:7071: checking for --enable-tbarnative" >&5 +echo "configure:7060: checking for --enable-tbarnative" >&5 no_cache=0 # Check whether --enable-tbarnative or --disable-tbarnative was given. if test "${enable_tbarnative+set}" = set; then @@ -7106,7 +7095,7 @@ fi echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6 -echo "configure:7110: checking for --enable-tbarsmpl" >&5 +echo "configure:7099: checking for --enable-tbarsmpl" >&5 no_cache=0 # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given. if test "${enable_tbarsmpl+set}" = set; then @@ -7145,7 +7134,7 @@ fi echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6 -echo "configure:7149: checking for --enable-treectrl" >&5 +echo "configure:7138: checking for --enable-treectrl" >&5 no_cache=0 # Check whether --enable-treectrl or --disable-treectrl was given. if test "${enable_treectrl+set}" = set; then @@ -7184,7 +7173,7 @@ fi echo $ac_n "checking for --enable-tipwindow""... $ac_c" 1>&6 -echo "configure:7188: checking for --enable-tipwindow" >&5 +echo "configure:7177: checking for --enable-tipwindow" >&5 no_cache=0 # Check whether --enable-tipwindow or --disable-tipwindow was given. if test "${enable_tipwindow+set}" = set; then @@ -7223,7 +7212,7 @@ fi echo $ac_n "checking for --enable-popupwin""... $ac_c" 1>&6 -echo "configure:7227: checking for --enable-popupwin" >&5 +echo "configure:7216: checking for --enable-popupwin" >&5 no_cache=0 # Check whether --enable-popupwin or --disable-popupwin was given. if test "${enable_popupwin+set}" = set; then @@ -7264,7 +7253,7 @@ fi echo $ac_n "checking for --enable-commondlg""... $ac_c" 1>&6 -echo "configure:7268: checking for --enable-commondlg" >&5 +echo "configure:7257: checking for --enable-commondlg" >&5 no_cache=0 # Check whether --enable-commondlg or --disable-commondlg was given. if test "${enable_commondlg+set}" = set; then @@ -7303,7 +7292,7 @@ fi echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6 -echo "configure:7307: checking for --enable-choicedlg" >&5 +echo "configure:7296: checking for --enable-choicedlg" >&5 no_cache=0 # Check whether --enable-choicedlg or --disable-choicedlg was given. if test "${enable_choicedlg+set}" = set; then @@ -7342,7 +7331,7 @@ fi echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6 -echo "configure:7346: checking for --enable-coldlg" >&5 +echo "configure:7335: checking for --enable-coldlg" >&5 no_cache=0 # Check whether --enable-coldlg or --disable-coldlg was given. if test "${enable_coldlg+set}" = set; then @@ -7381,7 +7370,7 @@ fi echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6 -echo "configure:7385: checking for --enable-filedlg" >&5 +echo "configure:7374: checking for --enable-filedlg" >&5 no_cache=0 # Check whether --enable-filedlg or --disable-filedlg was given. if test "${enable_filedlg+set}" = set; then @@ -7420,7 +7409,7 @@ fi echo $ac_n "checking for --enable-finddlg""... $ac_c" 1>&6 -echo "configure:7424: checking for --enable-finddlg" >&5 +echo "configure:7413: checking for --enable-finddlg" >&5 no_cache=0 # Check whether --enable-finddlg or --disable-finddlg was given. if test "${enable_finddlg+set}" = set; then @@ -7459,7 +7448,7 @@ fi echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6 -echo "configure:7463: checking for --enable-fontdlg" >&5 +echo "configure:7452: checking for --enable-fontdlg" >&5 no_cache=0 # Check whether --enable-fontdlg or --disable-fontdlg was given. if test "${enable_fontdlg+set}" = set; then @@ -7498,7 +7487,7 @@ fi echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6 -echo "configure:7502: checking for --enable-dirdlg" >&5 +echo "configure:7491: checking for --enable-dirdlg" >&5 no_cache=0 # Check whether --enable-dirdlg or --disable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then @@ -7537,7 +7526,7 @@ fi echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6 -echo "configure:7541: checking for --enable-msgdlg" >&5 +echo "configure:7530: checking for --enable-msgdlg" >&5 no_cache=0 # Check whether --enable-msgdlg or --disable-msgdlg was given. if test "${enable_msgdlg+set}" = set; then @@ -7576,7 +7565,7 @@ fi echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6 -echo "configure:7580: checking for --enable-numberdlg" >&5 +echo "configure:7569: checking for --enable-numberdlg" >&5 no_cache=0 # Check whether --enable-numberdlg or --disable-numberdlg was given. if test "${enable_numberdlg+set}" = set; then @@ -7615,7 +7604,7 @@ fi echo $ac_n "checking for --enable-splash""... $ac_c" 1>&6 -echo "configure:7619: checking for --enable-splash" >&5 +echo "configure:7608: checking for --enable-splash" >&5 no_cache=0 # Check whether --enable-splash or --disable-splash was given. if test "${enable_splash+set}" = set; then @@ -7654,7 +7643,7 @@ fi echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6 -echo "configure:7658: checking for --enable-textdlg" >&5 +echo "configure:7647: checking for --enable-textdlg" >&5 no_cache=0 # Check whether --enable-textdlg or --disable-textdlg was given. if test "${enable_textdlg+set}" = set; then @@ -7693,7 +7682,7 @@ fi echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6 -echo "configure:7697: checking for --enable-tipdlg" >&5 +echo "configure:7686: checking for --enable-tipdlg" >&5 no_cache=0 # Check whether --enable-tipdlg or --disable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then @@ -7732,7 +7721,7 @@ fi echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6 -echo "configure:7736: checking for --enable-progressdlg" >&5 +echo "configure:7725: checking for --enable-progressdlg" >&5 no_cache=0 # Check whether --enable-progressdlg or --disable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then @@ -7771,7 +7760,7 @@ fi echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6 -echo "configure:7775: checking for --enable-wizarddlg" >&5 +echo "configure:7764: checking for --enable-wizarddlg" >&5 no_cache=0 # Check whether --enable-wizarddlg or --disable-wizarddlg was given. if test "${enable_wizarddlg+set}" = set; then @@ -7812,7 +7801,7 @@ fi echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6 -echo "configure:7816: checking for --enable-menus" >&5 +echo "configure:7805: checking for --enable-menus" >&5 no_cache=0 # Check whether --enable-menus or --disable-menus was given. if test "${enable_menus+set}" = set; then @@ -7851,7 +7840,7 @@ fi echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6 -echo "configure:7855: checking for --enable-miniframe" >&5 +echo "configure:7844: checking for --enable-miniframe" >&5 no_cache=0 # Check whether --enable-miniframe or --disable-miniframe was given. if test "${enable_miniframe+set}" = set; then @@ -7890,7 +7879,7 @@ fi echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6 -echo "configure:7894: checking for --enable-tooltips" >&5 +echo "configure:7883: checking for --enable-tooltips" >&5 no_cache=0 # Check whether --enable-tooltips or --disable-tooltips was given. if test "${enable_tooltips+set}" = set; then @@ -7929,7 +7918,7 @@ fi echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6 -echo "configure:7933: checking for --enable-splines" >&5 +echo "configure:7922: checking for --enable-splines" >&5 no_cache=0 # Check whether --enable-splines or --disable-splines was given. if test "${enable_splines+set}" = set; then @@ -7968,7 +7957,7 @@ fi echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6 -echo "configure:7972: checking for --enable-validators" >&5 +echo "configure:7961: checking for --enable-validators" >&5 no_cache=0 # Check whether --enable-validators or --disable-validators was given. if test "${enable_validators+set}" = set; then @@ -8007,7 +7996,7 @@ fi echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6 -echo "configure:8011: checking for --enable-busyinfo" >&5 +echo "configure:8000: checking for --enable-busyinfo" >&5 no_cache=0 # Check whether --enable-busyinfo or --disable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then @@ -8046,7 +8035,7 @@ fi echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6 -echo "configure:8050: checking for --enable-joystick" >&5 +echo "configure:8039: checking for --enable-joystick" >&5 no_cache=0 # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then @@ -8085,7 +8074,7 @@ fi echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6 -echo "configure:8089: checking for --enable-metafile" >&5 +echo "configure:8078: checking for --enable-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -8124,7 +8113,7 @@ fi echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6 -echo "configure:8128: checking for --enable-dragimage" >&5 +echo "configure:8117: checking for --enable-dragimage" >&5 no_cache=0 # Check whether --enable-dragimage or --disable-dragimage was given. if test "${enable_dragimage+set}" = set; then @@ -8165,7 +8154,7 @@ fi echo $ac_n "checking for --enable-palette""... $ac_c" 1>&6 -echo "configure:8169: checking for --enable-palette" >&5 +echo "configure:8158: checking for --enable-palette" >&5 no_cache=0 # Check whether --enable-palette or --disable-palette was given. if test "${enable_palette+set}" = set; then @@ -8204,7 +8193,7 @@ fi echo $ac_n "checking for --enable-image""... $ac_c" 1>&6 -echo "configure:8208: checking for --enable-image" >&5 +echo "configure:8197: checking for --enable-image" >&5 no_cache=0 # Check whether --enable-image or --disable-image was given. if test "${enable_image+set}" = set; then @@ -8243,7 +8232,7 @@ fi echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6 -echo "configure:8247: checking for --enable-gif" >&5 +echo "configure:8236: checking for --enable-gif" >&5 no_cache=0 # Check whether --enable-gif or --disable-gif was given. if test "${enable_gif+set}" = set; then @@ -8282,7 +8271,7 @@ fi echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6 -echo "configure:8286: checking for --enable-pcx" >&5 +echo "configure:8275: checking for --enable-pcx" >&5 no_cache=0 # Check whether --enable-pcx or --disable-pcx was given. if test "${enable_pcx+set}" = set; then @@ -8321,7 +8310,7 @@ fi echo $ac_n "checking for --enable-iff""... $ac_c" 1>&6 -echo "configure:8325: checking for --enable-iff" >&5 +echo "configure:8314: checking for --enable-iff" >&5 no_cache=0 # Check whether --enable-iff or --disable-iff was given. if test "${enable_iff+set}" = set; then @@ -8360,7 +8349,7 @@ fi echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6 -echo "configure:8364: checking for --enable-pnm" >&5 +echo "configure:8353: checking for --enable-pnm" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -8399,7 +8388,7 @@ fi echo $ac_n "checking for --enable-xpm""... $ac_c" 1>&6 -echo "configure:8403: checking for --enable-xpm" >&5 +echo "configure:8392: checking for --enable-xpm" >&5 no_cache=0 # Check whether --enable-xpm or --disable-xpm was given. if test "${enable_xpm+set}" = set; then @@ -8438,7 +8427,7 @@ fi echo $ac_n "checking for --enable-ico_cur""... $ac_c" 1>&6 -echo "configure:8442: checking for --enable-ico_cur" >&5 +echo "configure:8431: 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 @@ -8485,7 +8474,7 @@ fi echo $ac_n "checking for toolkit""... $ac_c" 1>&6 -echo "configure:8489: checking for toolkit" >&5 +echo "configure:8478: checking for toolkit" >&5 if test "$wxUSE_GUI" = "yes"; then @@ -8623,7 +8612,7 @@ fi # 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:8627: checking for $ac_word" >&5 +echo "configure:8616: 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 @@ -8653,7 +8642,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:8657: checking for $ac_word" >&5 +echo "configure:8646: 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 @@ -8704,7 +8693,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:8708: checking for $ac_word" >&5 +echo "configure:8697: 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 @@ -8736,7 +8725,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:8740: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:8729: 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. @@ -8747,12 +8736,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 8751 "configure" +#line 8740 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:8756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8745: \"$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 @@ -8778,12 +8767,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:8782: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:8771: 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:8787: checking whether we are using GNU C" >&5 +echo "configure:8776: 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 @@ -8792,7 +8781,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:8796: \"$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:8785: \"$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 @@ -8811,7 +8800,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:8815: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:8804: 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 @@ -8846,7 +8835,7 @@ fi CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'` echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:8850: checking how to run the C preprocessor" >&5 +echo "configure:8839: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -8861,13 +8850,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:8871: \"$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 : @@ -8878,13 +8867,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:8888: \"$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 : @@ -8895,13 +8884,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:8905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8894: \"$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 : @@ -8927,13 +8916,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:8931: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:8920: 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 @@ -8951,7 +8940,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -8987,7 +8976,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:8991: checking for $ac_word" >&5 +echo "configure:8980: 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 @@ -9019,7 +9008,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:9023: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:9012: 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. @@ -9030,12 +9019,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 9034 "configure" +#line 9023 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:9039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9028: \"$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 @@ -9061,12 +9050,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:9065: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:9054: 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:9070: checking whether we are using GNU C++" >&5 +echo "configure:9059: 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 @@ -9075,7 +9064,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:9079: \"$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:9068: \"$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 @@ -9094,7 +9083,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:9098: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:9087: 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 @@ -9135,7 +9124,7 @@ for ac_declaration in \ 'void exit (int);' do cat > conftest.$ac_ext < $ac_declaration @@ -9143,7 +9132,7 @@ int main() { exit (42); ; return 0; } EOF -if { (eval echo configure:9147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -9153,14 +9142,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* break else @@ -9190,7 +9179,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:9194: checking for $ac_word" >&5 +echo "configure:9183: 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 @@ -9221,7 +9210,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:9225: checking for $ac_word" >&5 +echo "configure:9214: 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 @@ -9261,7 +9250,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:9265: checking for a BSD compatible install" >&5 +echo "configure:9254: 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 @@ -9326,7 +9315,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:9330: checking for $ac_word" >&5 +echo "configure:9319: 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 @@ -9355,13 +9344,13 @@ fi echo $ac_n "checking if make is GNU make""... $ac_c" 1>&6 -echo "configure:9359: checking if make is GNU make" >&5 +echo "configure:9348: 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 if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null | - egrep -s GNU); then + egrep qs GNU > /dev/null); then wx_cv_prog_makeisgnu="yes" else wx_cv_prog_makeisgnu="no" @@ -9381,7 +9370,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:9385: checking if make supports VPATH" >&5 +echo "configure:9374: 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 @@ -9428,7 +9417,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:9432: checking for $ac_word" >&5 +echo "configure:9421: 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 @@ -9462,7 +9451,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:9466: checking for $ac_word" >&5 +echo "configure:9455: 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 @@ -9496,7 +9485,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:9500: checking for yywrap in -l$ac_lib" >&5 +echo "configure:9489: 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 @@ -9504,7 +9493,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:9508: \"$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 @@ -9539,7 +9528,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:9543: checking whether ln -s works" >&5 +echo "configure:9532: 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 @@ -9691,17 +9680,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:9695: checking for regex.h" >&5 +echo "configure:9684: 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:9705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9694: \"$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* @@ -9720,12 +9709,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:9724: checking for $ac_func" >&5 +echo "configure:9713: 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:9741: \"$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 @@ -9806,17 +9795,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:9810: checking for zlib.h" >&5 +echo "configure:9799: 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:9820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9809: \"$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* @@ -9833,7 +9822,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:9837: checking for deflate in -lz" >&5 +echo "configure:9826: 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 @@ -9841,7 +9830,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:9845: \"$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 @@ -9917,17 +9906,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:9921: checking for png.h" >&5 +echo "configure:9910: 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:9931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9920: \"$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* @@ -9944,7 +9933,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:9948: checking for png_check_sig in -lpng" >&5 +echo "configure:9937: 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 @@ -9952,7 +9941,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:9956: \"$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 @@ -10026,12 +10015,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:10030: checking for jpeglib.h" >&5 +echo "configure:10019: 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:10036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_jpeglib_h=yes else @@ -10061,7 +10050,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:10065: checking for jpeg_read_header in -ljpeg" >&5 +echo "configure:10054: 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 @@ -10069,7 +10058,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:10073: \"$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 @@ -10132,17 +10121,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:10136: checking for tiffio.h" >&5 +echo "configure:10125: 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:10146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10135: \"$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* @@ -10159,7 +10148,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:10163: checking for TIFFError in -ltiff" >&5 +echo "configure:10152: 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 @@ -10167,7 +10156,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:10171: \"$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 @@ -10222,107 +10211,6 @@ fi fi -FREETYPE_INCLUDE= -FREETYPE_LINK= -if test "$wxUSE_FREETYPE" != "no" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_FREETYPE 1 -EOF - - - if test "$wxUSE_FREETYPE" = "sys" -o "$wxUSE_FREETYPE" = "yes" ; then - ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for freetype.h""... $ac_c" 1>&6 -echo "configure:10237: checking for freetype.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:10247: \"$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* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6 -echo "configure:10264: checking for FT_Render_Glyph in -lfreetype" >&5 -ac_lib_var=`echo freetype'_'FT_Render_Glyph | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lfreetype -lm $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - FREETYPE_LINK=" -lfreetype" -else - echo "$ac_t""no" 1>&6 -fi - - -else - echo "$ac_t""no" 1>&6 -fi - - - if test "x$FREETYPE_LINK" = "x" ; then - if test "$wxUSE_FREETYPE" = "sys" ; then - { echo "configure: error: system freetype library not found! Use --with-freetype=builtin to use built-in version" 1>&2; exit 1; } - else - echo "configure: warning: system freetype library not found, will use built-in instead" 1>&2 - wxUSE_FREETYPE=builtin - fi - else - wxUSE_FREETYPE=sys - fi - fi - - if test "$wxUSE_FREETYPE" = "builtin" ; then - FREETYPE_INCLUDE="-I\${top_srcdir}/src/freetype" - fi -fi - - AFMINSTALL= TOOLKIT= @@ -10334,17 +10222,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:10338: checking for $ac_hdr" >&5 +echo "configure:10226: 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:10348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10236: \"$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* @@ -10372,17 +10260,17 @@ done ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for windows.h""... $ac_c" 1>&6 -echo "configure:10376: checking for windows.h" >&5 +echo "configure:10264: 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:10386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10274: \"$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* @@ -10408,13 +10296,13 @@ fi echo $ac_n "checking if w32api has good enough MSIE support""... $ac_c" 1>&6 -echo "configure:10412: checking if w32api has good enough MSIE support" >&5 +echo "configure:10300: 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() { @@ -10430,7 +10318,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_w32api_win32_ie=yes @@ -10489,7 +10377,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:10493: checking for GTK+ version" >&5 +echo "configure:10381: checking for GTK+ version" >&5 gtk_version_cached=1 if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then @@ -10556,7 +10444,7 @@ fi # Extract the first word of "gtk-config-2.0", so it can be a program name with args. set dummy gtk-config-2.0; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10560: checking for $ac_word" >&5 +echo "configure:10448: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG_2_0'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10591,7 +10479,7 @@ fi min_gtk_version=1.3.1 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:10595: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:10483: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG_2_0" = "no" ; then no_gtk=yes @@ -10614,7 +10502,7 @@ echo "configure:10595: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -10692,7 +10580,7 @@ main () } EOF -if { (eval echo configure:10696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -10726,7 +10614,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -10736,7 +10624,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:10740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10628: \"$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" @@ -10827,7 +10715,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:10831: checking for $ac_word" >&5 +echo "configure:10719: 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 @@ -10862,7 +10750,7 @@ fi min_gtk_version=1.2.7 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:10866: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:10754: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -10885,7 +10773,7 @@ echo "configure:10866: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -10963,7 +10851,7 @@ main () } EOF -if { (eval echo configure:10967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -10997,7 +10885,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -11007,7 +10895,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:11011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10899: \"$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" @@ -11098,7 +10986,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:11102: checking for $ac_word" >&5 +echo "configure:10990: 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 @@ -11133,7 +11021,7 @@ fi min_gtk_version=1.2.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:11137: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:11025: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -11156,7 +11044,7 @@ echo "configure:11137: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -11234,7 +11122,7 @@ main () } EOF -if { (eval echo configure:11238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -11268,7 +11156,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -11278,7 +11166,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:11282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11170: \"$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" @@ -11358,7 +11246,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:11362: checking for gdk_im_open in -lgdk" >&5 +echo "configure:11250: 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 @@ -11366,7 +11254,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:11269: \"$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 @@ -11404,7 +11292,7 @@ fi if test "$wxUSE_MGL" = 1; then echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6 -echo "configure:11408: checking for SciTech MGL library" >&5 +echo "configure:11296: 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; } @@ -11450,7 +11338,7 @@ echo "configure:11408: checking for SciTech MGL library" >&5 if test "$wxUSE_MICROWIN" = 1; then echo $ac_n "checking for MicroWindows""... $ac_c" 1>&6 -echo "configure:11454: checking for MicroWindows" >&5 +echo "configure:11342: 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; } @@ -11480,7 +11368,7 @@ echo "configure:11454: 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:11484: checking for X" >&5 +echo "configure:11372: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -11542,12 +11430,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:11551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11439: \"$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* @@ -11616,14 +11504,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:11515: \"$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. @@ -11729,17 +11617,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:11733: checking whether -R must be followed by a space" >&5 +echo "configure:11621: 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:11631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -11755,14 +11643,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:11654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -11794,7 +11682,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:11798: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:11686: 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 @@ -11802,7 +11690,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:11705: \"$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 @@ -11835,7 +11723,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:11839: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:11727: 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 @@ -11843,7 +11731,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:11746: \"$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 @@ -11883,12 +11771,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:11887: checking for gethostbyname" >&5 +echo "configure:11775: 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:11803: \"$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 @@ -11932,7 +11820,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:11936: checking for gethostbyname in -lnsl" >&5 +echo "configure:11824: 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 @@ -11940,7 +11828,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:11843: \"$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 @@ -11981,12 +11869,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:11985: checking for connect" >&5 +echo "configure:11873: 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:11901: \"$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 @@ -12030,7 +11918,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:12034: checking for connect in -lsocket" >&5 +echo "configure:11922: 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 @@ -12038,7 +11926,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:11941: \"$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 @@ -12073,12 +11961,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:12077: checking for remove" >&5 +echo "configure:11965: 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:11993: \"$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 @@ -12122,7 +12010,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:12126: checking for remove in -lposix" >&5 +echo "configure:12014: 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 @@ -12130,7 +12018,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:12033: \"$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 @@ -12165,12 +12053,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:12169: checking for shmat" >&5 +echo "configure:12057: 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:12085: \"$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 @@ -12214,7 +12102,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:12218: checking for shmat in -lipc" >&5 +echo "configure:12106: 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 @@ -12222,7 +12110,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:12125: \"$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 @@ -12266,7 +12154,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:12270: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:12158: 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 @@ -12274,7 +12162,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:12177: \"$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 @@ -12319,9 +12207,20 @@ fi AFMINSTALL=afminstall COMPILED_X_PROGRAM=0 + if test "$wxUSE_NANOX" = "yes"; then + echo $ac_n "checking for MicroWindows/NanoX distribution""... $ac_c" 1>&6 +echo "configure:12213: 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; } + else + echo "$ac_t""$MICROWIN" 1>&6 + fi + fi + xpm_link= echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:12325: checking for Xpm library" >&5 +echo "configure:12224: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -12353,7 +12252,7 @@ EOF echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -12365,7 +12264,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* xpm_link=" -lXpm" @@ -12389,27 +12288,33 @@ fi rm -f conftest* fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext -lXt -lX11" + if test "$wxUSE_NANOX" = "yes"; then + TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$MICROWIN/src/lib/libnano-X.a \$MICROWIN/src/lib/libmwengine.a \$MICROWIN/src/lib/libmwfonts.a \$MICROWIN/src/lib/libmwdrivers.a \$MICROWIN/src/lib/libmwobjects.a" + else + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link" + fi + TOOLKIT_VPATH="\${top_srcdir}/src/x11" TOOLKIT=X11 GUIDIST=X11_DIST - TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__ -D__WXX11__" fi 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:12403: checking for windows.h" >&5 +echo "configure:12308: 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:12413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12318: \"$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* @@ -12436,7 +12341,7 @@ fi xpm_link= echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:12440: checking for Xpm library" >&5 +echo "configure:12345: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -12464,7 +12369,7 @@ EOF mesa_link= echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 -echo "configure:12468: checking for Mesa library" >&5 +echo "configure:12373: checking for Mesa library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -12512,17 +12417,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:12516: checking whether -R must be followed by a space" >&5 +echo "configure:12421: 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:12431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -12538,14 +12443,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:12454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -12577,7 +12482,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:12581: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:12486: 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 @@ -12585,7 +12490,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:12505: \"$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 @@ -12618,7 +12523,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:12622: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:12527: 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 @@ -12626,7 +12531,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:12546: \"$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 @@ -12666,12 +12571,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:12670: checking for gethostbyname" >&5 +echo "configure:12575: 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:12603: \"$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 @@ -12715,7 +12620,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:12719: checking for gethostbyname in -lnsl" >&5 +echo "configure:12624: 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 @@ -12723,7 +12628,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:12643: \"$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 @@ -12764,12 +12669,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:12768: checking for connect" >&5 +echo "configure:12673: 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:12701: \"$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 @@ -12813,7 +12718,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:12817: checking for connect in -lsocket" >&5 +echo "configure:12722: 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 @@ -12821,7 +12726,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:12741: \"$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 @@ -12856,12 +12761,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:12860: checking for remove" >&5 +echo "configure:12765: 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:12793: \"$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 @@ -12905,7 +12810,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:12909: checking for remove in -lposix" >&5 +echo "configure:12814: 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 @@ -12913,7 +12818,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:12833: \"$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 @@ -12948,12 +12853,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:12952: checking for shmat" >&5 +echo "configure:12857: 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:12885: \"$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 @@ -12997,7 +12902,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:13001: checking for shmat in -lipc" >&5 +echo "configure:12906: 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 @@ -13005,7 +12910,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:12925: \"$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 @@ -13049,7 +12954,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:13053: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:12958: 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 @@ -13057,7 +12962,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:12977: \"$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 @@ -13103,7 +13008,7 @@ fi COMPILED_X_PROGRAM=0 echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 -echo "configure:13107: checking for Motif/Lesstif headers" >&5 +echo "configure:13012: checking for Motif/Lesstif headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -13118,7 +13023,7 @@ for ac_dir in $SEARCH_INCLUDE; echo "$ac_t""found $ac_find_includes" 1>&6 else cat > conftest.$ac_ext < @@ -13130,7 +13035,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -13151,7 +13056,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:13155: checking for Motif/Lesstif library" >&5 +echo "configure:13060: checking for Motif/Lesstif library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -13190,7 +13095,7 @@ for ac_dir in $SEARCH_LIB; echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -13202,7 +13107,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -13224,7 +13129,7 @@ rm -f conftest* xpm_link= echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:13228: checking for Xpm library" >&5 +echo "configure:13133: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -13256,7 +13161,7 @@ EOF echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -13268,7 +13173,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* xpm_link=" -lXpm" @@ -13359,9 +13264,6 @@ rm -f conftest* if test "$wxUSE_LIBPNG" = "builtin" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)" fi - if test "$wxUSE_FREETYPE" = "builtin" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)" - fi GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST" DISTDIR="wx\$(TOOLKIT)" @@ -13380,6 +13282,9 @@ else TOOLKIT_VPATH="\${top_srcdir}/src/unix" fi + ALL_SOURCES="\$(ALL_SOURCES)" + ALL_HEADERS="\$(ALL_HEADERS)" + PORT_FILES="\${top_srcdir}/src/files.lst" GUIDIST="BASE_DIST" @@ -13405,17 +13310,17 @@ if test "$wxUSE_OPENGL" = "yes"; then ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6 -echo "configure:13409: checking for GL/gl.h" >&5 +echo "configure:13314: 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:13419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13324: \"$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* @@ -13433,7 +13338,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:13437: checking for -lGL" >&5 +echo "configure:13342: checking for -lGL" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -13466,7 +13371,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:13470: checking for -lMesaGL" >&5 +echo "configure:13375: checking for -lMesaGL" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -13608,6 +13513,16 @@ fi +if test "$wxUSE_SHARED" = "yes"; then + case "${host}" in + *-pc-os2_emx | *-pc-os2-emx | \ + *-pc-msdosdjgpp ) + wxUSE_SHARED=no + echo "configure: warning: Host system doesn't support shared libraries, disabling" 1>&2 + ;; + esac +fi + if test "$wxUSE_SHARED" = "yes"; then if test "$wxUSE_OPENGL" = "yes"; then @@ -13646,13 +13561,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:13650: checking for Intel compiler" >&5 +echo "configure:13565: 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:13582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_prog_icc=yes else @@ -13729,10 +13644,6 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6 fi ;; - *-pc-os2_emx | *-pc-os2-emx ) - wxUSE_SHARED=no - ;; - *-*-beos* ) SHARED_LD="${LD} -shared -o" ;; @@ -13788,7 +13699,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:13792: checking for $ac_word" >&5 +echo "configure:13703: 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 @@ -13818,7 +13729,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:13822: checking for $ac_word" >&5 +echo "configure:13733: 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 @@ -13856,17 +13767,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:13860: checking for $ac_hdr" >&5 +echo "configure:13771: 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:13870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13781: \"$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* @@ -13898,17 +13809,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:13902: checking for $ac_hdr" >&5 +echo "configure:13813: 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:13912: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13823: \"$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* @@ -13938,17 +13849,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:13942: checking for $ac_hdr" >&5 +echo "configure:13853: 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:13952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13863: \"$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* @@ -13978,17 +13889,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:13982: checking for $ac_hdr" >&5 +echo "configure:13893: 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:13992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13903: \"$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* @@ -14018,17 +13929,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:14022: checking for $ac_hdr" >&5 +echo "configure:13933: 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:14032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13943: \"$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* @@ -14058,17 +13969,17 @@ for ac_hdr in wcstr.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:14062: checking for $ac_hdr" >&5 +echo "configure:13973: 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:14072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13983: \"$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* @@ -14098,17 +14009,17 @@ for ac_hdr in wctype.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:14102: checking for $ac_hdr" >&5 +echo "configure:14013: 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:14112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14023: \"$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* @@ -14138,17 +14049,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:14142: checking for $ac_hdr" >&5 +echo "configure:14053: 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:14152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14063: \"$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* @@ -14178,17 +14089,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:14182: checking for $ac_hdr" >&5 +echo "configure:14093: 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:14192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14103: \"$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* @@ -14221,17 +14132,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:14225: checking for $ac_hdr" >&5 +echo "configure:14136: 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:14235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14146: \"$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* @@ -14262,12 +14173,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:14266: checking for ANSI C header files" >&5 +echo "configure:14177: 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 @@ -14275,7 +14186,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14190: \"$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* @@ -14292,7 +14203,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 @@ -14310,7 +14221,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 @@ -14331,7 +14242,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -14342,7 +14253,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:14346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -14366,12 +14277,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:14370: checking for mode_t" >&5 +echo "configure:14281: 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 @@ -14399,12 +14310,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:14403: checking for off_t" >&5 +echo "configure:14314: 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 @@ -14432,12 +14343,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:14436: checking for pid_t" >&5 +echo "configure:14347: 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 @@ -14465,12 +14376,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:14469: checking for size_t" >&5 +echo "configure:14380: 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 @@ -14498,12 +14409,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:14502: checking for uid_t in sys/types.h" >&5 +echo "configure:14413: 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 @@ -14533,13 +14444,13 @@ fi echo $ac_n "checking for wchar_t""... $ac_c" 1>&6 -echo "configure:14537: checking for wchar_t" >&5 +echo "configure:14448: checking for wchar_t" >&5 if eval "test \"`echo '$''{'wx_cv_type_wchar_t'+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:14475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_wchar_t=yes else @@ -14592,12 +14503,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:14596: checking if size_t is unsigned int" >&5 +echo "configure:14507: 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() { @@ -14610,7 +14521,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14525: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_uint=no else @@ -14633,12 +14544,12 @@ EOF else echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6 -echo "configure:14637: checking if size_t is unsigned long" >&5 +echo "configure:14548: 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() { @@ -14651,7 +14562,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_ulong=no else @@ -14685,13 +14596,13 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6 -echo "configure:14689: checking for pw_gecos in struct passwd" >&5 +echo "configure:14600: 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() { @@ -14702,7 +14613,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_pw_gecos=yes @@ -14732,12 +14643,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:14736: checking for working const" >&5 +echo "configure:14647: 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:14701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -14807,21 +14718,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:14811: checking for inline" >&5 +echo "configure:14722: 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:14736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -14848,7 +14759,7 @@ esac echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:14852: checking size of char" >&5 +echo "configure:14763: 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 @@ -14856,7 +14767,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < int main() @@ -14867,7 +14778,7 @@ int main() return(0); } EOF -if { (eval echo configure:14871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14782: \"$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 @@ -14887,7 +14798,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:14891: checking size of short" >&5 +echo "configure:14802: 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 @@ -14895,7 +14806,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < int main() @@ -14906,7 +14817,7 @@ int main() return(0); } EOF -if { (eval echo configure:14910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14821: \"$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 @@ -14926,7 +14837,7 @@ EOF echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:14930: checking size of int *" >&5 +echo "configure:14841: checking size of int *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14934,7 +14845,7 @@ else ac_cv_sizeof_int_p=4 else cat > conftest.$ac_ext < int main() @@ -14945,7 +14856,7 @@ int main() return(0); } EOF -if { (eval echo configure:14949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_p=`cat conftestval` else @@ -14965,7 +14876,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:14969: checking size of int" >&5 +echo "configure:14880: 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 @@ -14973,7 +14884,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < int main() @@ -14984,7 +14895,7 @@ int main() return(0); } EOF -if { (eval echo configure:14988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14899: \"$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 @@ -15004,7 +14915,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:15008: checking size of long" >&5 +echo "configure:14919: 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 @@ -15012,7 +14923,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < int main() @@ -15023,7 +14934,7 @@ int main() return(0); } EOF -if { (eval echo configure:15027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14938: \"$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 @@ -15043,7 +14954,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:15047: checking size of long long" >&5 +echo "configure:14958: 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 @@ -15051,7 +14962,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < int main() @@ -15062,7 +14973,7 @@ int main() return(0); } EOF -if { (eval echo configure:15066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14977: \"$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 @@ -15083,7 +14994,7 @@ EOF echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6 -echo "configure:15087: checking size of wchar_t" >&5 +echo "configure:14998: 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 @@ -15093,7 +15004,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:15030: \"$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 @@ -15138,14 +15049,14 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:15142: checking whether byte ordering is bigendian" >&5 +echo "configure:15053: 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 @@ -15156,11 +15067,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:15160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15071: \"$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 @@ -15171,7 +15082,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:15175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -15191,7 +15102,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:15119: \"$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 @@ -15232,7 +15143,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:15236: checking how to run the C++ preprocessor" >&5 +echo "configure:15147: 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 @@ -15245,12 +15156,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:15254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15165: \"$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 : @@ -15294,17 +15205,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:15298: checking for $ac_hdr" >&5 +echo "configure:15209: 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:15308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15219: \"$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* @@ -15352,7 +15263,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:15356: checking if C++ compiler supports bool" >&5 +echo "configure:15267: 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 @@ -15367,7 +15278,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_cpp_bool=yes @@ -15417,7 +15328,7 @@ EOF echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6 -echo "configure:15421: checking for wcslen in -lc" >&5 +echo "configure:15332: checking for wcslen in -lc" >&5 ac_lib_var=`echo c'_'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 @@ -15425,7 +15336,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15351: \"$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 @@ -15462,7 +15373,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:15466: checking for wcslen in -lw" >&5 +echo "configure:15377: 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 @@ -15470,7 +15381,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:15396: \"$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 @@ -15507,7 +15418,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6 -echo "configure:15511: checking for wcslen in -lmsvcrt" >&5 +echo "configure:15422: 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 @@ -15515,7 +15426,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:15441: \"$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 @@ -15562,12 +15473,12 @@ fi for ac_func in wcsrtombs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15566: checking for $ac_func" >&5 +echo "configure:15477: 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:15505: \"$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 @@ -15616,12 +15527,12 @@ done echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:15620: checking for vprintf" >&5 +echo "configure:15531: 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:15559: \"$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 @@ -15668,12 +15579,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:15672: checking for _doprnt" >&5 +echo "configure:15583: 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:15611: \"$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 @@ -15726,13 +15637,13 @@ fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:15730: checking for vsnprintf" >&5 +echo "configure:15641: 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 < @@ -15757,7 +15668,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* wx_cv_func_vsnprintf=yes @@ -15768,7 +15679,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -15793,7 +15704,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* wx_cv_func_vsnprintf=yes @@ -15825,13 +15736,13 @@ else fi echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 -echo "configure:15829: checking for vsscanf" >&5 +echo "configure:15740: 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 < @@ -15854,7 +15765,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_vsscanf=yes @@ -15906,7 +15817,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:15910: checking for iconv" >&5 +echo "configure:15821: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15914,7 +15825,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -15924,7 +15835,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:15928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -15936,7 +15847,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -15946,7 +15857,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:15950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15861: \"$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 @@ -15967,12 +15878,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:15971: checking if iconv needs const" >&5 +echo "configure:15882: 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 < @@ -15991,7 +15902,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_iconv_const="no" else @@ -16036,12 +15947,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:16040: checking for $ac_func" >&5 +echo "configure:15951: 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:15979: \"$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 @@ -16105,13 +16016,13 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6 -echo "configure:16109: checking for sa_handler type" >&5 +echo "configure:16020: 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() { @@ -16123,7 +16034,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16038: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_sa_handler=int @@ -16160,12 +16071,12 @@ fi for ac_func in vfork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16164: checking for $ac_func" >&5 +echo "configure:16075: 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:16103: \"$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 @@ -16216,12 +16127,12 @@ done for ac_func in mkstemp mktemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16220: checking for $ac_func" >&5 +echo "configure:16131: 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:16159: \"$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,12 +16181,12 @@ done echo $ac_n "checking for statfs""... $ac_c" 1>&6 -echo "configure:16274: checking for statfs" >&5 +echo "configure:16185: 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:16211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_statfs=yes @@ -16323,12 +16234,12 @@ EOF else echo $ac_n "checking for statvfs""... $ac_c" 1>&6 -echo "configure:16327: checking for statvfs" >&5 +echo "configure:16238: 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 < @@ -16344,7 +16255,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_statvfs=yes @@ -16378,12 +16289,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:16382: checking for $ac_func" >&5 +echo "configure:16293: 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:16321: \"$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 @@ -16440,12 +16351,12 @@ fi for ac_func in timegm do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16444: checking for $ac_func" >&5 +echo "configure:16355: 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:16383: \"$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 @@ -16496,12 +16407,12 @@ done for ac_func in putenv setenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16500: checking for $ac_func" >&5 +echo "configure:16411: 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:16439: \"$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 @@ -16571,12 +16482,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:16575: checking for $ac_func" >&5 +echo "configure:16486: 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:16514: \"$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 @@ -16624,7 +16535,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:16628: checking for nanosleep in -lposix4" >&5 +echo "configure:16539: 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 @@ -16632,7 +16543,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:16558: \"$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 @@ -16671,12 +16582,12 @@ else for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16675: checking for $ac_func" >&5 +echo "configure:16586: 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:16614: \"$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 @@ -16742,12 +16653,12 @@ fi for ac_func in uname gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16746: checking for $ac_func" >&5 +echo "configure:16657: 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:16685: \"$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 @@ -16807,12 +16718,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:16811: checking for $ac_func" >&5 +echo "configure:16722: 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:16753: \"$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 @@ -16875,12 +16786,12 @@ INET_LINK= for ac_func in inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16879: checking for $ac_func" >&5 +echo "configure:16790: 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:16818: \"$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 @@ -16928,7 +16839,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 -echo "configure:16932: checking for inet_addr in -lnsl" >&5 +echo "configure:16843: 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 @@ -16936,7 +16847,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:16862: \"$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 @@ -16966,7 +16877,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:16970: checking for inet_addr in -lresolv" >&5 +echo "configure:16881: 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 @@ -16974,7 +16885,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:16900: \"$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 @@ -17001,11 +16912,52 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 INET_LINK="resolv" - +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for inet_addr in -lsocket""... $ac_c" 1>&6 +echo "configure:16919: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + INET_LINK="socket" + else echo "$ac_t""no" 1>&6 fi + +fi + fi @@ -17018,12 +16970,12 @@ done for ac_func in inet_aton do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17022: checking for $ac_func" >&5 +echo "configure:16974: 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:17002: \"$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 @@ -17071,7 +17023,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:17075: checking for inet_aton in -l$INET_LINK" >&5 +echo "configure:17027: 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 @@ -17079,7 +17031,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:17046: \"$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 @@ -17205,7 +17157,7 @@ if test "$TOOLKIT" != "MSW"; then fi echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6 -echo "configure:17209: checking for pthread_create in -l$THREADS_LIB" >&5 +echo "configure:17161: checking for pthread_create in -l$THREADS_LIB" >&5 ac_lib_var=`echo $THREADS_LIB'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17213,7 +17165,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17180: \"$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 @@ -17247,7 +17199,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:17251: checking for pthread_create in -lc_r" >&5 +echo "configure:17203: checking for pthread_create in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17255,7 +17207,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17222: \"$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 @@ -17290,17 +17242,17 @@ else ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 -echo "configure:17294: checking for sys/prctl.h" >&5 +echo "configure:17246: checking for sys/prctl.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:17304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:17256: \"$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* @@ -17340,12 +17292,12 @@ fi for ac_func in thr_setconcurrency do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17344: checking for $ac_func" >&5 +echo "configure:17296: 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:17324: \"$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 @@ -17398,17 +17350,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:17402: checking for $ac_hdr" >&5 +echo "configure:17354: 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:17412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:17364: \"$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* @@ -17436,7 +17388,7 @@ done echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:17440: checking for sched_yield in -l$THREADS_LINK" >&5 +echo "configure:17392: checking for sched_yield in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'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 @@ -17444,7 +17396,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17411: \"$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 @@ -17477,7 +17429,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6 -echo "configure:17481: checking for sched_yield in -lposix4" >&5 +echo "configure:17433: 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 @@ -17485,7 +17437,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:17452: \"$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 @@ -17527,7 +17479,7 @@ fi HAVE_PRIOR_FUNCS=0 echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:17531: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 +echo "configure:17483: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17535,7 +17487,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17502: \"$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 @@ -17562,7 +17514,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for pthread_attr_setschedparam in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:17566: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5 +echo "configure:17518: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_setschedparam | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17570,7 +17522,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17537: \"$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 @@ -17597,7 +17549,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for sched_get_priority_max in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:17601: checking for sched_get_priority_max in -l$THREADS_LINK" >&5 +echo "configure:17553: checking for sched_get_priority_max in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'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 @@ -17605,7 +17557,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17572: \"$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 @@ -17635,7 +17587,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 sched_get_priority_max in -lposix4""... $ac_c" 1>&6 -echo "configure:17639: checking for sched_get_priority_max in -lposix4" >&5 +echo "configure:17591: 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 @@ -17643,7 +17595,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:17610: \"$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 @@ -17701,7 +17653,7 @@ EOF fi echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:17705: checking for pthread_cancel in -l$THREADS_LINK" >&5 +echo "configure:17657: checking for pthread_cancel in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17709,7 +17661,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17676: \"$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 @@ -17746,13 +17698,13 @@ fi echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 -echo "configure:17750: checking for pthread_cleanup_push/pop" >&5 +echo "configure:17702: 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() { @@ -17762,7 +17714,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_pthread_cleanup_push=yes @@ -17794,13 +17746,13 @@ EOF fi echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6 -echo "configure:17798: checking for pthread_mutexattr_t" >&5 +echo "configure:17750: 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() { @@ -17810,7 +17762,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_pthread_mutexattr_t=yes @@ -17837,13 +17789,13 @@ EOF else echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6 -echo "configure:17841: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 +echo "configure:17793: 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() { @@ -17852,7 +17804,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_pthread_rec_mutex_init=yes @@ -17904,7 +17856,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:17908: checking if -D_REENTRANT is needed" >&5 +echo "configure:17860: 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 @@ -18284,12 +18236,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:18288: checking for $ac_func" >&5 +echo "configure:18240: 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:18268: \"$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 @@ -18338,13 +18290,13 @@ done echo $ac_n "checking for timezone variable in ""... $ac_c" 1>&6 -echo "configure:18342: checking for timezone variable in " >&5 +echo "configure:18294: 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 < @@ -18356,7 +18308,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=timezone @@ -18367,7 +18319,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -18379,7 +18331,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=_timezone @@ -18390,7 +18342,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -18402,7 +18354,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18358: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=__timezone @@ -18443,12 +18395,12 @@ EOF for ac_func in localtime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18447: checking for $ac_func" >&5 +echo "configure:18399: 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:18427: \"$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 @@ -18498,13 +18450,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:18502: checking for tm_gmtoff in struct tm" >&5 +echo "configure:18454: 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 < @@ -18516,7 +18468,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_tm_has_gmtoff=yes @@ -18545,12 +18497,12 @@ EOF for ac_func in gettimeofday ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18549: checking for $ac_func" >&5 +echo "configure:18501: 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:18529: \"$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 @@ -18600,7 +18552,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:18604: checking whether gettimeofday takes two arguments" >&5 +echo "configure:18556: 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 @@ -18615,7 +18567,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -18628,7 +18580,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=yes else @@ -18636,7 +18588,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -18649,7 +18601,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=no else @@ -18694,16 +18646,22 @@ EOF fi -if test "$TOOLKIT" != "MSW"; then +if test "$wxUSE_SOCKETS" = "yes"; then + if test "$TOOLKIT" = "X11"; then + echo "configure: warning: wxSocket not yet supported under X11... disabled" 1>&2 + wxUSE_SOCKETS="no" + fi +fi - if test "$wxUSE_SOCKETS" = "yes"; then +if test "$wxUSE_SOCKETS" = "yes"; then + if test "$TOOLKIT" != "MSW"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:18702: checking for socket" >&5 +echo "configure:18660: 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:18688: \"$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 @@ -18744,7 +18702,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:18748: checking for socket in -lsocket" >&5 +echo "configure:18706: 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 @@ -18752,7 +18710,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:18725: \"$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 @@ -18792,11 +18750,12 @@ fi fi fi +fi - - if test "$wxUSE_SOCKETS" = "yes" ; then +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:18800: checking what is the type of the third argument of getsockname" >&5 +echo "configure:18759: 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 @@ -18811,7 +18770,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -18824,7 +18783,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=socklen_t else @@ -18832,7 +18791,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -18845,7 +18804,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=size_t else @@ -18853,7 +18812,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -18866,7 +18825,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=int else @@ -18938,17 +18897,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:18942: checking for $ac_hdr" >&5 +echo "configure:18901: 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:18952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18911: \"$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* @@ -19002,12 +18961,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:19006: checking for $ac_func" >&5 +echo "configure:18965: 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:18993: \"$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 @@ -19058,7 +19017,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:19062: checking for dlopen in -ldl" >&5 +echo "configure:19021: 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 @@ -19066,7 +19025,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:19040: \"$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 @@ -19106,12 +19065,12 @@ else for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19110: checking for $ac_func" >&5 +echo "configure:19069: 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:19097: \"$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 @@ -19162,7 +19121,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6 -echo "configure:19166: checking for dld in -lshl_load" >&5 +echo "configure:19125: 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 @@ -19170,7 +19129,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:19144: \"$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 @@ -19220,12 +19179,12 @@ done for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19224: checking for $ac_func" >&5 +echo "configure:19183: 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:19211: \"$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 @@ -19273,7 +19232,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6 -echo "configure:19277: checking for dlerror in -ldl" >&5 +echo "configure:19236: 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 @@ -19281,7 +19240,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:19255: \"$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 @@ -19363,7 +19322,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:19367: checking for main in -lunicows" >&5 +echo "configure:19326: 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 @@ -19371,14 +19330,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:19341: \"$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 @@ -19459,7 +19418,7 @@ fi if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then if test "$wxUSE_UNIVERSAL" = "yes"; then - echo "configure: warning: MDI not yet supported for wxUNIVERSAL... disabled" 1>&2 + echo "configure: warning: MDI not yet supported for wxUniversal... disabled" 1>&2 wxUSE_MDI_ARCHITECTURE=no fi @@ -19494,17 +19453,17 @@ EOF if test "$wxUSE_MS_HTML_HELP" = "yes"; then ac_safe=`echo "htmlhelp.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for htmlhelp.h""... $ac_c" 1>&6 -echo "configure:19498: checking for htmlhelp.h" >&5 +echo "configure:19457: checking for htmlhelp.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:19508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:19467: \"$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* @@ -19570,11 +19529,15 @@ EOF fi if test "$wxUSE_RESOURCES" = "yes" ; then - cat >> confdefs.h <<\EOF + if test "$wxUSE_NANOX" = "yes"; then + echo "configure: warning: Cannot use resource database functions in NanoX" 1>&2 + else + cat >> confdefs.h <<\EOF #define wxUSE_RESOURCES 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" + fi fi if test "$wxUSE_X_RESOURCES" = "yes"; then @@ -19592,17 +19555,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:19596: checking for $ac_hdr" >&5 +echo "configure:19559: 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:19606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:19569: \"$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* @@ -19678,15 +19641,22 @@ EOF fi if test "$wxUSE_CLIPBOARD" = "yes"; then - cat >> confdefs.h <<\EOF + if test "$wxUSE_X11" = 1; then + echo "configure: warning: Clipboard not yet supported under X11... disabled" 1>&2 + wxUSE_CLIPBOARD=no + fi + + if test "$wxUSE_CLIPBOARD" = "yes"; then + cat >> confdefs.h <<\EOF #define wxUSE_CLIPBOARD 1 EOF - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_DATAOBJ 1 EOF + fi fi if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then @@ -20012,7 +19982,7 @@ if test "$wxUSE_TOGGLEBTN" = "yes"; then wxUSE_TOGGLEBTN=no fi if test "$wxUSE_UNIVERSAL" = "yes"; then - echo "configure: warning: Toggle button not yet supported under wxUNIVERSAL... disabled" 1>&2 + echo "configure: warning: Toggle button not yet supported under wxUniversal... disabled" 1>&2 wxUSE_TOGGLEBTN=no fi @@ -20064,7 +20034,7 @@ if test "$wxUSE_TOOLTIPS" = "yes"; then echo "configure: warning: wxTooltip not supported under WINE... disabled" 1>&2 else if test "$wxUSE_UNIVERSAL" = "yes"; then - echo "configure: warning: wxTooltip not supported yet in wxUNIVERSAL... disabled" 1>&2 + echo "configure: warning: wxTooltip not supported yet in wxUniversal... disabled" 1>&2 else cat >> confdefs.h <<\EOF #define wxUSE_TOOLTIPS 1 @@ -20095,21 +20065,29 @@ if test "$wxUSE_POPUPWIN" = "yes"; then if test "$wxUSE_MOTIF" = 1; then echo "configure: warning: wxPopupWindow not yet supported under Motif... disabled" 1>&2 else - cat >> confdefs.h <<\EOF + if test "$wxUSE_PM" = 1; then + echo "configure: warning: wxPopupWindow not yet supported under PM... disabled" 1>&2 + else + cat >> confdefs.h <<\EOF #define wxUSE_POPUPWIN 1 EOF - USES_CONTROLS=1 + USES_CONTROLS=1 + fi fi fi fi if test "$wxUSE_TIPWINDOW" = "yes"; then - cat >> confdefs.h <<\EOF + if test "$wxUSE_PM" = 1; then + echo "configure: warning: wxTipWindow not yet supported under PM... disabled" 1>&2 + else + cat >> confdefs.h <<\EOF #define wxUSE_TIPWINDOW 1 EOF + fi fi if test "$USES_CONTROLS" = 1; then @@ -20437,11 +20415,11 @@ if test "$wxUSE_MAC" = 1 ; then fi -LIBS="$ZLIB_LINK$POSIX4_LINK$INET_LINK$WCHAR_LINK$THREADS_LINK$DL_LINK -lm$LIBS" +LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DL_LINK -lm $LIBS" if test "$wxUSE_GUI" = "yes"; then - LIBS=" $GUI_TK_LIBRARY$PNG_LINK$JPEG_LINK$TIFF_LINK$FREETYPE_LINK$LIBS" + LIBS="$GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $LIBS" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \ @@ -20455,8 +20433,7 @@ fi INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \ -$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \ -$FREETYPE_INCLUDE $TOOLKIT_INCLUDE" +$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE" if test "$wxUSE_GTK" = 1; then WXCONFIG_INCLUDE= @@ -20569,7 +20546,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:20573: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:20550: 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