X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41fd4136fc08cd658daf13b92568ccc9926d8f5a..609c60af5edd543544f5ef8062a1589f0d2f847b:/configure diff --git a/configure b/configure index eeddf9f4dd..58cfbdf7cd 100755 --- a/configure +++ b/configure @@ -1685,8 +1685,12 @@ if test "${with_libtiff+set}" = set; then if test "$withval" = yes; then ac_cv_use_libtiff='wxUSE_LIBTIFF=yes' - else + elif test "$withval" = no; then ac_cv_use_libtiff='wxUSE_LIBTIFF=no' + elif test "$withval" = sys; then + ac_cv_use_libtiff='wxUSE_LIBTIFF=sys' + else + { echo "configure: error: Invalid value for --with-libtiff: should be yes, no or sys" 1>&2; exit 1; } fi else @@ -1710,13 +1714,17 @@ fi if test "$wxUSE_LIBTIFF" = yes; then echo "$ac_t""yes" 1>&6 - else + elif test "$wxUSE_LIBTIFF" = no; then echo "$ac_t""no" 1>&6 + elif test "$wxUSE_LIBTIFF" = sys; then + echo "$ac_t""system version" 1>&6 + else + { echo "configure: error: Invalid value for --with-libtiff: should be yes, no or sys" 1>&2; exit 1; } fi echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6 -echo "configure:1720: checking "for --with-opengl"" >&5 +echo "configure:1728: checking "for --with-opengl"" >&5 no_cache=0 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then @@ -1758,7 +1766,7 @@ fi echo $ac_n "checking "for --with-dmalloc"""... $ac_c" 1>&6 -echo "configure:1762: checking "for --with-dmalloc"" >&5 +echo "configure:1770: checking "for --with-dmalloc"" >&5 no_cache=0 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -1797,7 +1805,7 @@ fi echo $ac_n "checking "for --with-zlib"""... $ac_c" 1>&6 -echo "configure:1801: checking "for --with-zlib"" >&5 +echo "configure:1809: checking "for --with-zlib"" >&5 no_cache=0 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -1844,7 +1852,7 @@ fi echo $ac_n "checking "for --with-odbc"""... $ac_c" 1>&6 -echo "configure:1848: checking "for --with-odbc"" >&5 +echo "configure:1856: checking "for --with-odbc"" >&5 no_cache=0 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then @@ -1886,7 +1894,7 @@ fi echo $ac_n "checking "for --enable-shared"""... $ac_c" 1>&6 -echo "configure:1890: checking "for --enable-shared"" >&5 +echo "configure:1898: checking "for --enable-shared"" >&5 no_cache=0 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then @@ -1925,7 +1933,7 @@ fi echo $ac_n "checking "for --enable-burnt_name"""... $ac_c" 1>&6 -echo "configure:1929: checking "for --enable-burnt_name"" >&5 +echo "configure:1937: checking "for --enable-burnt_name"" >&5 no_cache=0 # Check whether --enable-burnt_name or --disable-burnt_name was given. if test "${enable_burnt_name+set}" = set; then @@ -1964,7 +1972,7 @@ fi echo $ac_n "checking "for --enable-optimise"""... $ac_c" 1>&6 -echo "configure:1968: checking "for --enable-optimise"" >&5 +echo "configure:1976: checking "for --enable-optimise"" >&5 no_cache=0 # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then @@ -2003,7 +2011,7 @@ fi echo $ac_n "checking "for --enable-debug"""... $ac_c" 1>&6 -echo "configure:2007: checking "for --enable-debug"" >&5 +echo "configure:2015: checking "for --enable-debug"" >&5 no_cache=0 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -2051,7 +2059,7 @@ fi echo $ac_n "checking "for --enable-debug_flag"""... $ac_c" 1>&6 -echo "configure:2055: checking "for --enable-debug_flag"" >&5 +echo "configure:2063: 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 @@ -2090,7 +2098,7 @@ fi echo $ac_n "checking "for --enable-debug_info"""... $ac_c" 1>&6 -echo "configure:2094: checking "for --enable-debug_info"" >&5 +echo "configure:2102: 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 @@ -2129,7 +2137,7 @@ fi echo $ac_n "checking "for --enable-debug_gdb"""... $ac_c" 1>&6 -echo "configure:2133: checking "for --enable-debug_gdb"" >&5 +echo "configure:2141: 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 @@ -2168,7 +2176,7 @@ fi echo $ac_n "checking "for --enable-debug_cntxt"""... $ac_c" 1>&6 -echo "configure:2172: checking "for --enable-debug_cntxt"" >&5 +echo "configure:2180: 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 @@ -2207,7 +2215,7 @@ fi echo $ac_n "checking "for --enable-mem_tracing"""... $ac_c" 1>&6 -echo "configure:2211: checking "for --enable-mem_tracing"" >&5 +echo "configure:2219: 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 @@ -2246,7 +2254,7 @@ fi echo $ac_n "checking "for --enable-profile"""... $ac_c" 1>&6 -echo "configure:2250: checking "for --enable-profile"" >&5 +echo "configure:2258: checking "for --enable-profile"" >&5 no_cache=0 # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then @@ -2285,7 +2293,7 @@ fi echo $ac_n "checking "for --enable-no_rtti"""... $ac_c" 1>&6 -echo "configure:2289: checking "for --enable-no_rtti"" >&5 +echo "configure:2297: 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 @@ -2324,7 +2332,7 @@ fi echo $ac_n "checking "for --enable-no_exceptions"""... $ac_c" 1>&6 -echo "configure:2328: checking "for --enable-no_exceptions"" >&5 +echo "configure:2336: 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 @@ -2363,7 +2371,7 @@ fi echo $ac_n "checking "for --enable-permissive"""... $ac_c" 1>&6 -echo "configure:2367: checking "for --enable-permissive"" >&5 +echo "configure:2375: checking "for --enable-permissive"" >&5 no_cache=0 # Check whether --enable-permissive or --disable-permissive was given. if test "${enable_permissive+set}" = set; then @@ -2402,7 +2410,7 @@ fi echo $ac_n "checking "for --enable-no_deps"""... $ac_c" 1>&6 -echo "configure:2406: checking "for --enable-no_deps"" >&5 +echo "configure:2414: 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 @@ -2443,7 +2451,7 @@ fi echo $ac_n "checking "for --enable-intl"""... $ac_c" 1>&6 -echo "configure:2447: checking "for --enable-intl"" >&5 +echo "configure:2455: checking "for --enable-intl"" >&5 no_cache=0 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then @@ -2482,7 +2490,7 @@ fi echo $ac_n "checking "for --enable-config"""... $ac_c" 1>&6 -echo "configure:2486: checking "for --enable-config"" >&5 +echo "configure:2494: checking "for --enable-config"" >&5 no_cache=0 # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -2520,10 +2528,9 @@ fi fi -if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking "for --enable-sockets"""... $ac_c" 1>&6 -echo "configure:2527: checking "for --enable-sockets"" >&5 +echo "configure:2534: checking "for --enable-sockets"" >&5 no_cache=0 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then @@ -2560,13 +2567,10 @@ fi echo "$ac_t""no" 1>&6 fi -else -wxUSE_SOCKETS=no -fi echo $ac_n "checking "for --enable-dialupman"""... $ac_c" 1>&6 -echo "configure:2570: checking "for --enable-dialupman"" >&5 +echo "configure:2574: checking "for --enable-dialupman"" >&5 no_cache=0 # Check whether --enable-dialupman or --disable-dialupman was given. if test "${enable_dialupman+set}" = set; then @@ -2605,7 +2609,7 @@ fi echo $ac_n "checking "for --enable-ipc"""... $ac_c" 1>&6 -echo "configure:2609: checking "for --enable-ipc"" >&5 +echo "configure:2613: checking "for --enable-ipc"" >&5 no_cache=0 # Check whether --enable-ipc or --disable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -2644,7 +2648,7 @@ fi echo $ac_n "checking "for --enable-apple_ieee"""... $ac_c" 1>&6 -echo "configure:2648: checking "for --enable-apple_ieee"" >&5 +echo "configure:2652: 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 @@ -2683,7 +2687,7 @@ fi echo $ac_n "checking "for --enable-timedate"""... $ac_c" 1>&6 -echo "configure:2687: checking "for --enable-timedate"" >&5 +echo "configure:2691: checking "for --enable-timedate"" >&5 no_cache=0 # Check whether --enable-timedate or --disable-timedate was given. if test "${enable_timedate+set}" = set; then @@ -2722,7 +2726,7 @@ fi echo $ac_n "checking "for --enable-wave"""... $ac_c" 1>&6 -echo "configure:2726: checking "for --enable-wave"" >&5 +echo "configure:2730: checking "for --enable-wave"" >&5 no_cache=0 # Check whether --enable-wave or --disable-wave was given. if test "${enable_wave+set}" = set; then @@ -2761,7 +2765,7 @@ fi echo $ac_n "checking "for --enable-fraction"""... $ac_c" 1>&6 -echo "configure:2765: checking "for --enable-fraction"" >&5 +echo "configure:2769: checking "for --enable-fraction"" >&5 no_cache=0 # Check whether --enable-fraction or --disable-fraction was given. if test "${enable_fraction+set}" = set; then @@ -2800,7 +2804,7 @@ fi echo $ac_n "checking "for --enable-dynlib"""... $ac_c" 1>&6 -echo "configure:2804: checking "for --enable-dynlib"" >&5 +echo "configure:2808: checking "for --enable-dynlib"" >&5 no_cache=0 # Check whether --enable-dynlib or --disable-dynlib was given. if test "${enable_dynlib+set}" = set; then @@ -2839,7 +2843,7 @@ fi echo $ac_n "checking "for --enable-longlong"""... $ac_c" 1>&6 -echo "configure:2843: checking "for --enable-longlong"" >&5 +echo "configure:2847: checking "for --enable-longlong"" >&5 no_cache=0 # Check whether --enable-longlong or --disable-longlong was given. if test "${enable_longlong+set}" = set; then @@ -2878,7 +2882,7 @@ fi echo $ac_n "checking "for --enable-log"""... $ac_c" 1>&6 -echo "configure:2882: checking "for --enable-log"" >&5 +echo "configure:2886: checking "for --enable-log"" >&5 no_cache=0 # Check whether --enable-log or --disable-log was given. if test "${enable_log+set}" = set; then @@ -2917,7 +2921,7 @@ fi echo $ac_n "checking "for --enable-streams"""... $ac_c" 1>&6 -echo "configure:2921: checking "for --enable-streams"" >&5 +echo "configure:2925: checking "for --enable-streams"" >&5 no_cache=0 # Check whether --enable-streams or --disable-streams was given. if test "${enable_streams+set}" = set; then @@ -2956,7 +2960,7 @@ fi echo $ac_n "checking "for --enable-file"""... $ac_c" 1>&6 -echo "configure:2960: checking "for --enable-file"" >&5 +echo "configure:2964: checking "for --enable-file"" >&5 no_cache=0 # Check whether --enable-file or --disable-file was given. if test "${enable_file+set}" = set; then @@ -2995,7 +2999,7 @@ fi echo $ac_n "checking "for --enable-textfile"""... $ac_c" 1>&6 -echo "configure:2999: checking "for --enable-textfile"" >&5 +echo "configure:3003: checking "for --enable-textfile"" >&5 no_cache=0 # Check whether --enable-textfile or --disable-textfile was given. if test "${enable_textfile+set}" = set; then @@ -3034,7 +3038,7 @@ fi echo $ac_n "checking "for --enable-unicode"""... $ac_c" 1>&6 -echo "configure:3038: checking "for --enable-unicode"" >&5 +echo "configure:3042: checking "for --enable-unicode"" >&5 no_cache=0 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then @@ -3073,7 +3077,7 @@ fi echo $ac_n "checking "for --enable-wcsrtombs"""... $ac_c" 1>&6 -echo "configure:3077: checking "for --enable-wcsrtombs"" >&5 +echo "configure:3081: checking "for --enable-wcsrtombs"" >&5 no_cache=0 # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given. if test "${enable_wcsrtombs+set}" = set; then @@ -3112,7 +3116,7 @@ fi echo $ac_n "checking "for --enable-wxprintfv"""... $ac_c" 1>&6 -echo "configure:3116: checking "for --enable-wxprintfv"" >&5 +echo "configure:3120: checking "for --enable-wxprintfv"" >&5 no_cache=0 # Check whether --enable-wxprintfv or --disable-wxprintfv was given. if test "${enable_wxprintfv+set}" = set; then @@ -3151,7 +3155,7 @@ fi echo $ac_n "checking "for --enable-joystick"""... $ac_c" 1>&6 -echo "configure:3155: checking "for --enable-joystick"" >&5 +echo "configure:3159: checking "for --enable-joystick"" >&5 no_cache=0 # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then @@ -3190,7 +3194,7 @@ fi echo $ac_n "checking "for --enable-std_iostreams"""... $ac_c" 1>&6 -echo "configure:3194: checking "for --enable-std_iostreams"" >&5 +echo "configure:3198: 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 @@ -3229,7 +3233,7 @@ fi echo $ac_n "checking "for --enable-filesystem"""... $ac_c" 1>&6 -echo "configure:3233: checking "for --enable-filesystem"" >&5 +echo "configure:3237: checking "for --enable-filesystem"" >&5 no_cache=0 # Check whether --enable-filesystem or --disable-filesystem was given. if test "${enable_filesystem+set}" = set; then @@ -3268,7 +3272,7 @@ fi echo $ac_n "checking "for --enable-fs_inet"""... $ac_c" 1>&6 -echo "configure:3272: checking "for --enable-fs_inet"" >&5 +echo "configure:3276: 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 @@ -3307,7 +3311,7 @@ fi echo $ac_n "checking "for --enable-fs_zip"""... $ac_c" 1>&6 -echo "configure:3311: checking "for --enable-fs_zip"" >&5 +echo "configure:3315: 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 @@ -3346,7 +3350,7 @@ fi echo $ac_n "checking "for --enable-zipstream"""... $ac_c" 1>&6 -echo "configure:3350: checking "for --enable-zipstream"" >&5 +echo "configure:3354: checking "for --enable-zipstream"" >&5 no_cache=0 # Check whether --enable-zipstream or --disable-zipstream was given. if test "${enable_zipstream+set}" = set; then @@ -3387,7 +3391,7 @@ fi echo $ac_n "checking "for --enable-threads"""... $ac_c" 1>&6 -echo "configure:3391: checking "for --enable-threads"" >&5 +echo "configure:3395: checking "for --enable-threads"" >&5 no_cache=0 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then @@ -3426,7 +3430,7 @@ fi echo $ac_n "checking "for --enable-serial"""... $ac_c" 1>&6 -echo "configure:3430: checking "for --enable-serial"" >&5 +echo "configure:3434: checking "for --enable-serial"" >&5 no_cache=0 # Check whether --enable-serial or --disable-serial was given. if test "${enable_serial+set}" = set; then @@ -3469,7 +3473,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking "for --enable-docview"""... $ac_c" 1>&6 -echo "configure:3473: checking "for --enable-docview"" >&5 +echo "configure:3477: checking "for --enable-docview"" >&5 no_cache=0 # Check whether --enable-docview or --disable-docview was given. if test "${enable_docview+set}" = set; then @@ -3508,7 +3512,7 @@ fi echo $ac_n "checking "for --enable-help"""... $ac_c" 1>&6 -echo "configure:3512: checking "for --enable-help"" >&5 +echo "configure:3516: checking "for --enable-help"" >&5 no_cache=0 # Check whether --enable-help or --disable-help was given. if test "${enable_help+set}" = set; then @@ -3547,7 +3551,7 @@ fi echo $ac_n "checking "for --enable-constraints"""... $ac_c" 1>&6 -echo "configure:3551: checking "for --enable-constraints"" >&5 +echo "configure:3555: checking "for --enable-constraints"" >&5 no_cache=0 # Check whether --enable-constraints or --disable-constraints was given. if test "${enable_constraints+set}" = set; then @@ -3586,7 +3590,7 @@ fi echo $ac_n "checking "for --enable-printarch"""... $ac_c" 1>&6 -echo "configure:3590: checking "for --enable-printarch"" >&5 +echo "configure:3594: checking "for --enable-printarch"" >&5 no_cache=0 # Check whether --enable-printarch or --disable-printarch was given. if test "${enable_printarch+set}" = set; then @@ -3625,7 +3629,7 @@ fi echo $ac_n "checking "for --enable-mdi"""... $ac_c" 1>&6 -echo "configure:3629: checking "for --enable-mdi"" >&5 +echo "configure:3633: checking "for --enable-mdi"" >&5 no_cache=0 # Check whether --enable-mdi or --disable-mdi was given. if test "${enable_mdi+set}" = set; then @@ -3665,7 +3669,7 @@ fi echo $ac_n "checking "for --enable-postscript"""... $ac_c" 1>&6 -echo "configure:3669: checking "for --enable-postscript"" >&5 +echo "configure:3673: checking "for --enable-postscript"" >&5 no_cache=0 # Check whether --enable-postscript or --disable-postscript was given. if test "${enable_postscript+set}" = set; then @@ -3706,7 +3710,7 @@ fi echo $ac_n "checking "for --enable-prologio"""... $ac_c" 1>&6 -echo "configure:3710: checking "for --enable-prologio"" >&5 +echo "configure:3714: checking "for --enable-prologio"" >&5 no_cache=0 # Check whether --enable-prologio or --disable-prologio was given. if test "${enable_prologio+set}" = set; then @@ -3745,7 +3749,7 @@ fi echo $ac_n "checking "for --enable-resources"""... $ac_c" 1>&6 -echo "configure:3749: checking "for --enable-resources"" >&5 +echo "configure:3753: checking "for --enable-resources"" >&5 no_cache=0 # Check whether --enable-resources or --disable-resources was given. if test "${enable_resources+set}" = set; then @@ -3785,7 +3789,7 @@ fi echo $ac_n "checking "for --enable-xresources"""... $ac_c" 1>&6 -echo "configure:3789: checking "for --enable-xresources"" >&5 +echo "configure:3793: checking "for --enable-xresources"" >&5 no_cache=0 # Check whether --enable-xresources or --disable-xresources was given. if test "${enable_xresources+set}" = set; then @@ -3826,7 +3830,7 @@ fi echo $ac_n "checking "for --enable-clipboard"""... $ac_c" 1>&6 -echo "configure:3830: checking "for --enable-clipboard"" >&5 +echo "configure:3834: checking "for --enable-clipboard"" >&5 no_cache=0 # Check whether --enable-clipboard or --disable-clipboard was given. if test "${enable_clipboard+set}" = set; then @@ -3865,7 +3869,7 @@ fi echo $ac_n "checking "for --enable-dnd"""... $ac_c" 1>&6 -echo "configure:3869: checking "for --enable-dnd"" >&5 +echo "configure:3873: checking "for --enable-dnd"" >&5 no_cache=0 # Check whether --enable-dnd or --disable-dnd was given. if test "${enable_dnd+set}" = set; then @@ -3905,7 +3909,7 @@ fi echo $ac_n "checking "for --enable-wxtree"""... $ac_c" 1>&6 -echo "configure:3909: checking "for --enable-wxtree"" >&5 +echo "configure:3913: checking "for --enable-wxtree"" >&5 no_cache=0 # Check whether --enable-wxtree or --disable-wxtree was given. if test "${enable_wxtree+set}" = set; then @@ -3946,7 +3950,7 @@ fi echo $ac_n "checking "for --enable-controls"""... $ac_c" 1>&6 -echo "configure:3950: checking "for --enable-controls"" >&5 +echo "configure:3954: checking "for --enable-controls"" >&5 no_cache=0 # Check whether --enable-controls or --disable-controls was given. if test "${enable_controls+set}" = set; then @@ -4054,7 +4058,7 @@ fi echo $ac_n "checking "for --enable-accel"""... $ac_c" 1>&6 -echo "configure:4058: checking "for --enable-accel"" >&5 +echo "configure:4062: checking "for --enable-accel"" >&5 no_cache=0 # Check whether --enable-accel or --disable-accel was given. if test "${enable_accel+set}" = set; then @@ -4093,7 +4097,7 @@ fi echo $ac_n "checking "for --enable-caret"""... $ac_c" 1>&6 -echo "configure:4097: checking "for --enable-caret"" >&5 +echo "configure:4101: checking "for --enable-caret"" >&5 no_cache=0 # Check whether --enable-caret or --disable-caret was given. if test "${enable_caret+set}" = set; then @@ -4132,7 +4136,7 @@ fi echo $ac_n "checking "for --enable-bmpbutton"""... $ac_c" 1>&6 -echo "configure:4136: checking "for --enable-bmpbutton"" >&5 +echo "configure:4140: checking "for --enable-bmpbutton"" >&5 no_cache=0 # Check whether --enable-bmpbutton or --disable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then @@ -4171,7 +4175,7 @@ fi echo $ac_n "checking "for --enable-checkbox"""... $ac_c" 1>&6 -echo "configure:4175: checking "for --enable-checkbox"" >&5 +echo "configure:4179: checking "for --enable-checkbox"" >&5 no_cache=0 # Check whether --enable-checkbox or --disable-checkbox was given. if test "${enable_checkbox+set}" = set; then @@ -4210,7 +4214,7 @@ fi echo $ac_n "checking "for --enable-checklst"""... $ac_c" 1>&6 -echo "configure:4214: checking "for --enable-checklst"" >&5 +echo "configure:4218: checking "for --enable-checklst"" >&5 no_cache=0 # Check whether --enable-checklst or --disable-checklst was given. if test "${enable_checklst+set}" = set; then @@ -4249,7 +4253,7 @@ fi echo $ac_n "checking "for --enable-choice"""... $ac_c" 1>&6 -echo "configure:4253: checking "for --enable-choice"" >&5 +echo "configure:4257: checking "for --enable-choice"" >&5 no_cache=0 # Check whether --enable-choice or --disable-choice was given. if test "${enable_choice+set}" = set; then @@ -4288,7 +4292,7 @@ fi echo $ac_n "checking "for --enable-combobox"""... $ac_c" 1>&6 -echo "configure:4292: checking "for --enable-combobox"" >&5 +echo "configure:4296: checking "for --enable-combobox"" >&5 no_cache=0 # Check whether --enable-combobox or --disable-combobox was given. if test "${enable_combobox+set}" = set; then @@ -4327,7 +4331,7 @@ fi echo $ac_n "checking "for --enable-gauge"""... $ac_c" 1>&6 -echo "configure:4331: checking "for --enable-gauge"" >&5 +echo "configure:4335: checking "for --enable-gauge"" >&5 no_cache=0 # Check whether --enable-gauge or --disable-gauge was given. if test "${enable_gauge+set}" = set; then @@ -4366,7 +4370,7 @@ fi echo $ac_n "checking "for --enable-grid"""... $ac_c" 1>&6 -echo "configure:4370: checking "for --enable-grid"" >&5 +echo "configure:4374: checking "for --enable-grid"" >&5 no_cache=0 # Check whether --enable-grid or --disable-grid was given. if test "${enable_grid+set}" = set; then @@ -4405,7 +4409,7 @@ fi echo $ac_n "checking "for --enable-newgrid"""... $ac_c" 1>&6 -echo "configure:4409: checking "for --enable-newgrid"" >&5 +echo "configure:4413: checking "for --enable-newgrid"" >&5 no_cache=0 # Check whether --enable-newgrid or --disable-newgrid was given. if test "${enable_newgrid+set}" = set; then @@ -4444,7 +4448,7 @@ fi echo $ac_n "checking "for --enable-imaglist"""... $ac_c" 1>&6 -echo "configure:4448: checking "for --enable-imaglist"" >&5 +echo "configure:4452: checking "for --enable-imaglist"" >&5 no_cache=0 # Check whether --enable-imaglist or --disable-imaglist was given. if test "${enable_imaglist+set}" = set; then @@ -4483,7 +4487,7 @@ fi echo $ac_n "checking "for --enable-listbox"""... $ac_c" 1>&6 -echo "configure:4487: checking "for --enable-listbox"" >&5 +echo "configure:4491: checking "for --enable-listbox"" >&5 no_cache=0 # Check whether --enable-listbox or --disable-listbox was given. if test "${enable_listbox+set}" = set; then @@ -4522,7 +4526,7 @@ fi echo $ac_n "checking "for --enable-listctrl"""... $ac_c" 1>&6 -echo "configure:4526: checking "for --enable-listctrl"" >&5 +echo "configure:4530: checking "for --enable-listctrl"" >&5 no_cache=0 # Check whether --enable-listctrl or --disable-listctrl was given. if test "${enable_listctrl+set}" = set; then @@ -4561,7 +4565,7 @@ fi echo $ac_n "checking "for --enable-notebook"""... $ac_c" 1>&6 -echo "configure:4565: checking "for --enable-notebook"" >&5 +echo "configure:4569: checking "for --enable-notebook"" >&5 no_cache=0 # Check whether --enable-notebook or --disable-notebook was given. if test "${enable_notebook+set}" = set; then @@ -4600,7 +4604,7 @@ fi echo $ac_n "checking "for --enable-radiobox"""... $ac_c" 1>&6 -echo "configure:4604: checking "for --enable-radiobox"" >&5 +echo "configure:4608: checking "for --enable-radiobox"" >&5 no_cache=0 # Check whether --enable-radiobox or --disable-radiobox was given. if test "${enable_radiobox+set}" = set; then @@ -4639,7 +4643,7 @@ fi echo $ac_n "checking "for --enable-radiobtn"""... $ac_c" 1>&6 -echo "configure:4643: checking "for --enable-radiobtn"" >&5 +echo "configure:4647: checking "for --enable-radiobtn"" >&5 no_cache=0 # Check whether --enable-radiobtn or --disable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then @@ -4678,7 +4682,7 @@ fi echo $ac_n "checking "for --enable-sash"""... $ac_c" 1>&6 -echo "configure:4682: checking "for --enable-sash"" >&5 +echo "configure:4686: checking "for --enable-sash"" >&5 no_cache=0 # Check whether --enable-sash or --disable-sash was given. if test "${enable_sash+set}" = set; then @@ -4717,7 +4721,7 @@ fi echo $ac_n "checking "for --enable-scrollbar"""... $ac_c" 1>&6 -echo "configure:4721: checking "for --enable-scrollbar"" >&5 +echo "configure:4725: checking "for --enable-scrollbar"" >&5 no_cache=0 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -4756,7 +4760,7 @@ fi echo $ac_n "checking "for --enable-slider"""... $ac_c" 1>&6 -echo "configure:4760: checking "for --enable-slider"" >&5 +echo "configure:4764: checking "for --enable-slider"" >&5 no_cache=0 # Check whether --enable-slider or --disable-slider was given. if test "${enable_slider+set}" = set; then @@ -4795,7 +4799,7 @@ fi echo $ac_n "checking "for --enable-spinbtn"""... $ac_c" 1>&6 -echo "configure:4799: checking "for --enable-spinbtn"" >&5 +echo "configure:4803: checking "for --enable-spinbtn"" >&5 no_cache=0 # Check whether --enable-spinbtn or --disable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then @@ -4834,7 +4838,7 @@ fi echo $ac_n "checking "for --enable-spinctrl"""... $ac_c" 1>&6 -echo "configure:4838: checking "for --enable-spinctrl"" >&5 +echo "configure:4842: checking "for --enable-spinctrl"" >&5 no_cache=0 # Check whether --enable-spinctrl or --disable-spinctrl was given. if test "${enable_spinctrl+set}" = set; then @@ -4873,7 +4877,7 @@ fi echo $ac_n "checking "for --enable-splitter"""... $ac_c" 1>&6 -echo "configure:4877: checking "for --enable-splitter"" >&5 +echo "configure:4881: checking "for --enable-splitter"" >&5 no_cache=0 # Check whether --enable-splitter or --disable-splitter was given. if test "${enable_splitter+set}" = set; then @@ -4912,7 +4916,7 @@ fi echo $ac_n "checking "for --enable-statbmp"""... $ac_c" 1>&6 -echo "configure:4916: checking "for --enable-statbmp"" >&5 +echo "configure:4920: checking "for --enable-statbmp"" >&5 no_cache=0 # Check whether --enable-statbmp or --disable-statbmp was given. if test "${enable_statbmp+set}" = set; then @@ -4951,7 +4955,7 @@ fi echo $ac_n "checking "for --enable-statbox"""... $ac_c" 1>&6 -echo "configure:4955: checking "for --enable-statbox"" >&5 +echo "configure:4959: checking "for --enable-statbox"" >&5 no_cache=0 # Check whether --enable-statbox or --disable-statbox was given. if test "${enable_statbox+set}" = set; then @@ -4990,7 +4994,7 @@ fi echo $ac_n "checking "for --enable-statline"""... $ac_c" 1>&6 -echo "configure:4994: checking "for --enable-statline"" >&5 +echo "configure:4998: checking "for --enable-statline"" >&5 no_cache=0 # Check whether --enable-statline or --disable-statline was given. if test "${enable_statline+set}" = set; then @@ -5029,7 +5033,7 @@ fi echo $ac_n "checking "for --enable-statusbar"""... $ac_c" 1>&6 -echo "configure:5033: checking "for --enable-statusbar"" >&5 +echo "configure:5037: checking "for --enable-statusbar"" >&5 no_cache=0 # Check whether --enable-statusbar or --disable-statusbar was given. if test "${enable_statusbar+set}" = set; then @@ -5068,7 +5072,7 @@ fi echo $ac_n "checking "for --enable-tabdialog"""... $ac_c" 1>&6 -echo "configure:5072: checking "for --enable-tabdialog"" >&5 +echo "configure:5076: checking "for --enable-tabdialog"" >&5 no_cache=0 # Check whether --enable-tabdialog or --disable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then @@ -5107,7 +5111,7 @@ fi echo $ac_n "checking "for --enable-toolbar"""... $ac_c" 1>&6 -echo "configure:5111: checking "for --enable-toolbar"" >&5 +echo "configure:5115: checking "for --enable-toolbar"" >&5 no_cache=0 # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then @@ -5146,7 +5150,7 @@ fi echo $ac_n "checking "for --enable-tbarnative"""... $ac_c" 1>&6 -echo "configure:5150: checking "for --enable-tbarnative"" >&5 +echo "configure:5154: checking "for --enable-tbarnative"" >&5 no_cache=0 # Check whether --enable-tbarnative or --disable-tbarnative was given. if test "${enable_tbarnative+set}" = set; then @@ -5185,7 +5189,7 @@ fi echo $ac_n "checking "for --enable-tbarsmpl"""... $ac_c" 1>&6 -echo "configure:5189: checking "for --enable-tbarsmpl"" >&5 +echo "configure:5193: checking "for --enable-tbarsmpl"" >&5 no_cache=0 # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given. if test "${enable_tbarsmpl+set}" = set; then @@ -5224,7 +5228,7 @@ fi echo $ac_n "checking "for --enable-treectrl"""... $ac_c" 1>&6 -echo "configure:5228: checking "for --enable-treectrl"" >&5 +echo "configure:5232: checking "for --enable-treectrl"" >&5 no_cache=0 # Check whether --enable-treectrl or --disable-treectrl was given. if test "${enable_treectrl+set}" = set; then @@ -5265,7 +5269,7 @@ fi echo $ac_n "checking "for --enable-commondlg"""... $ac_c" 1>&6 -echo "configure:5269: checking "for --enable-commondlg"" >&5 +echo "configure:5273: checking "for --enable-commondlg"" >&5 no_cache=0 # Check whether --enable-commondlg or --disable-commondlg was given. if test "${enable_commondlg+set}" = set; then @@ -5304,7 +5308,7 @@ fi echo $ac_n "checking "for --enable-dirdlg"""... $ac_c" 1>&6 -echo "configure:5308: checking "for --enable-dirdlg"" >&5 +echo "configure:5312: checking "for --enable-dirdlg"" >&5 no_cache=0 # Check whether --enable-dirdlg or --disable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then @@ -5343,7 +5347,7 @@ fi echo $ac_n "checking "for --enable-textdlg"""... $ac_c" 1>&6 -echo "configure:5347: checking "for --enable-textdlg"" >&5 +echo "configure:5351: checking "for --enable-textdlg"" >&5 no_cache=0 # Check whether --enable-textdlg or --disable-textdlg was given. if test "${enable_textdlg+set}" = set; then @@ -5382,7 +5386,7 @@ fi echo $ac_n "checking "for --enable-tipdlg"""... $ac_c" 1>&6 -echo "configure:5386: checking "for --enable-tipdlg"" >&5 +echo "configure:5390: checking "for --enable-tipdlg"" >&5 no_cache=0 # Check whether --enable-tipdlg or --disable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then @@ -5421,7 +5425,7 @@ fi echo $ac_n "checking "for --enable-progressdlg"""... $ac_c" 1>&6 -echo "configure:5425: checking "for --enable-progressdlg"" >&5 +echo "configure:5429: checking "for --enable-progressdlg"" >&5 no_cache=0 # Check whether --enable-progressdlg or --disable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then @@ -5460,7 +5464,7 @@ fi echo $ac_n "checking "for --enable-miniframe"""... $ac_c" 1>&6 -echo "configure:5464: checking "for --enable-miniframe"" >&5 +echo "configure:5468: checking "for --enable-miniframe"" >&5 no_cache=0 # Check whether --enable-miniframe or --disable-miniframe was given. if test "${enable_miniframe+set}" = set; then @@ -5499,7 +5503,7 @@ fi echo $ac_n "checking "for --enable-html"""... $ac_c" 1>&6 -echo "configure:5503: checking "for --enable-html"" >&5 +echo "configure:5507: checking "for --enable-html"" >&5 no_cache=0 # Check whether --enable-html or --disable-html was given. if test "${enable_html+set}" = set; then @@ -5538,7 +5542,7 @@ fi echo $ac_n "checking "for --enable-tooltips"""... $ac_c" 1>&6 -echo "configure:5542: checking "for --enable-tooltips"" >&5 +echo "configure:5546: checking "for --enable-tooltips"" >&5 no_cache=0 # Check whether --enable-tooltips or --disable-tooltips was given. if test "${enable_tooltips+set}" = set; then @@ -5577,7 +5581,7 @@ fi echo $ac_n "checking "for --enable-splines"""... $ac_c" 1>&6 -echo "configure:5581: checking "for --enable-splines"" >&5 +echo "configure:5585: checking "for --enable-splines"" >&5 no_cache=0 # Check whether --enable-splines or --disable-splines was given. if test "${enable_splines+set}" = set; then @@ -5616,7 +5620,7 @@ fi echo $ac_n "checking "for --enable-validators"""... $ac_c" 1>&6 -echo "configure:5620: checking "for --enable-validators"" >&5 +echo "configure:5624: checking "for --enable-validators"" >&5 no_cache=0 # Check whether --enable-validators or --disable-validators was given. if test "${enable_validators+set}" = set; then @@ -5655,7 +5659,7 @@ fi echo $ac_n "checking "for --enable-busyinfo"""... $ac_c" 1>&6 -echo "configure:5659: checking "for --enable-busyinfo"" >&5 +echo "configure:5663: checking "for --enable-busyinfo"" >&5 no_cache=0 # Check whether --enable-busyinfo or --disable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then @@ -5694,7 +5698,7 @@ fi echo $ac_n "checking "for --enable-plot"""... $ac_c" 1>&6 -echo "configure:5698: checking "for --enable-plot"" >&5 +echo "configure:5702: checking "for --enable-plot"" >&5 no_cache=0 # Check whether --enable-plot or --disable-plot was given. if test "${enable_plot+set}" = set; then @@ -5735,7 +5739,7 @@ fi echo $ac_n "checking "for --enable-gif"""... $ac_c" 1>&6 -echo "configure:5739: checking "for --enable-gif"" >&5 +echo "configure:5743: checking "for --enable-gif"" >&5 no_cache=0 # Check whether --enable-gif or --disable-gif was given. if test "${enable_gif+set}" = set; then @@ -5774,7 +5778,7 @@ fi echo $ac_n "checking "for --enable-pcx"""... $ac_c" 1>&6 -echo "configure:5778: checking "for --enable-pcx"" >&5 +echo "configure:5782: checking "for --enable-pcx"" >&5 no_cache=0 # Check whether --enable-pcx or --disable-pcx was given. if test "${enable_pcx+set}" = set; then @@ -5813,7 +5817,7 @@ fi echo $ac_n "checking "for --enable-pnm"""... $ac_c" 1>&6 -echo "configure:5817: checking "for --enable-pnm"" >&5 +echo "configure:5821: checking "for --enable-pnm"" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -5860,7 +5864,7 @@ fi echo $ac_n "checking for toolkit""... $ac_c" 1>&6 -echo "configure:5864: checking for toolkit" >&5 +echo "configure:5868: checking for toolkit" >&5 if test "$wxUSE_GUI" = "yes"; then @@ -5978,23 +5982,22 @@ fi rm -f confcache -if eval "test $host != $build"; then - if eval "test $host_alias != NONE"; then +if test "$build" != "$host" ; then CC=$host_alias-gcc CXX=$host_alias-c++ AR=$host_alias-ar RANLIB=$host_alias-ranlib DLLTOOL=$host_alias-dlltool + RESCOMP=$host_alias-windres LD=$host_alias-ld NM=$host_alias-nm STRIP=$host_alias-strip - fi 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:5998: checking for $ac_word" >&5 +echo "configure:6001: 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 @@ -6024,7 +6027,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:6028: checking for $ac_word" >&5 +echo "configure:6031: 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 @@ -6075,7 +6078,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:6079: checking for $ac_word" >&5 +echo "configure:6082: 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 @@ -6107,7 +6110,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:6111: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:6114: 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. @@ -6118,12 +6121,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 6122 "configure" +#line 6125 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:6127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6130: \"$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 @@ -6149,12 +6152,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:6153: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:6156: 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:6158: checking whether we are using GNU C" >&5 +echo "configure:6161: 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 @@ -6163,7 +6166,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:6167: \"$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:6170: \"$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 @@ -6182,7 +6185,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:6186: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:6189: 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 @@ -6217,7 +6220,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:6221: checking how to run the C preprocessor" >&5 +echo "configure:6224: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -6232,13 +6235,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:6242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6245: \"$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 : @@ -6249,13 +6252,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:6259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6262: \"$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 : @@ -6266,13 +6269,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:6276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6279: \"$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 : @@ -6299,13 +6302,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:6303: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:6306: 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 @@ -6323,7 +6326,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -6359,7 +6362,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:6363: checking for $ac_word" >&5 +echo "configure:6366: 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 @@ -6391,7 +6394,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:6395: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:6398: 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. @@ -6402,12 +6405,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 6406 "configure" +#line 6409 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:6411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6414: \"$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 @@ -6433,12 +6436,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:6437: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:6440: 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:6442: checking whether we are using GNU C++" >&5 +echo "configure:6445: 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 @@ -6447,7 +6450,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:6451: \"$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:6454: \"$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 @@ -6466,7 +6469,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:6470: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:6473: 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 @@ -6499,7 +6502,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:6503: checking how to run the C++ preprocessor" >&5 +echo "configure:6506: 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 @@ -6512,12 +6515,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:6521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6524: \"$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 : @@ -6555,7 +6558,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:6559: checking for $ac_word" >&5 +echo "configure:6562: 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 @@ -6586,7 +6589,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:6590: checking for $ac_word" >&5 +echo "configure:6593: 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 @@ -6626,7 +6629,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:6630: checking for a BSD compatible install" >&5 +echo "configure:6633: 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 @@ -6682,7 +6685,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # 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:6686: checking for $ac_word" >&5 +echo "configure:6689: 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 @@ -6711,7 +6714,7 @@ fi echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6 -echo "configure:6715: checking "make for VPATH support"" >&5 +echo "configure:6718: checking "make for VPATH support"" >&5 cat - << EOF > confMake check : file cp \$? \$@ @@ -6740,7 +6743,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:6744: checking for $ac_word" >&5 +echo "configure:6747: 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 @@ -6774,7 +6777,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:6778: checking for $ac_word" >&5 +echo "configure:6781: 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 @@ -6808,7 +6811,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:6812: checking for yywrap in -l$ac_lib" >&5 +echo "configure:6815: 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 @@ -6816,7 +6819,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:6834: \"$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 @@ -6851,7 +6854,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:6855: checking whether ln -s works" >&5 +echo "configure:6858: 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 @@ -7015,10 +7018,10 @@ WXWINE= if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then if test "$cross_compiling" = "yes" ; then - echo "configure: warning: Cross compiling --- skipping windows.h check" 1>&2 + echo "configure: warning: skipping windows.h check for cross-compilation" 1>&2 else echo $ac_n "checking for Windows headers""... $ac_c" 1>&6 -echo "configure:7022: checking for Windows headers" >&5 +echo "configure:7025: checking for Windows headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -7041,6 +7044,10 @@ for ac_dir in $SEARCH_INCLUDE; INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32" + if test "$wxUSE_ODBC" = "yes" ; then + LIBS="$LIBS -lodbc32 -lole32 -loleaut32" + fi + if test "$wxUSE_MINGW" = 1; then LDFLAGS="$LDFLAGS -mwindows" fi @@ -7053,6 +7060,16 @@ for ac_dir in $SEARCH_INCLUDE; GENERICOBJS="\$(MSW_GENERICOBJS)" UNIXOBJS= GUIDIST=MSW_DIST + + RCINCSWITCH="--include-dir" + RCDEFSWITCH="--define" + RCPREPROCESSOR="--preprocessor \"\$(CC) -c -E -xc-header -DRC_INVOKED\"" + RCINPUTSWITCH="-i" + RCOUTPUTSWITCH="-o" + RESFLAGS="$RCPREPROCESSOR $RCINCSWITCH \$(top_srcdir)/include $RCINCSWITCH \$(top_srcdir)/\$(program_dir) $RCDEFSWITCH __WIN32__ $RCDEFSWITCH __WIN95__ $RCDEFSWITCH __GNUWIN32__" + + RESPROGRAM="\$(RES_PROGRAM)" + fi if test "$wxUSE_GTK" = 1; then @@ -7073,7 +7090,7 @@ if test "$wxUSE_GTK" = 1; then # 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:7077: checking for $ac_word" >&5 +echo "configure:7094: 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 @@ -7108,7 +7125,7 @@ fi min_gtk_version=1.2.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:7112: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:7129: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -7121,12 +7138,13 @@ echo "configure:7112: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < #include #include +#include int main () @@ -7153,7 +7171,7 @@ main () } EOF -if { (eval echo configure:7157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -7214,7 +7232,7 @@ fi GUIDIST=GTK_DIST echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 -echo "configure:7218: checking for gdk_im_open in -lgdk" >&5 +echo "configure:7236: 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 @@ -7222,7 +7240,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:7255: \"$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 @@ -7260,7 +7278,7 @@ fi if test "$wxUSE_WINE" = 1; then echo $ac_n "checking for WINE includes""... $ac_c" 1>&6 -echo "configure:7264: checking for WINE includes" >&5 +echo "configure:7282: checking for WINE includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -7281,7 +7299,7 @@ for ac_dir in $SEARCH_INCLUDE; XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:7285: checking for Xpm library" >&5 +echo "configure:7303: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -7309,7 +7327,7 @@ EOF MESA_LINK="" echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 -echo "configure:7313: checking for Mesa library" >&5 +echo "configure:7331: checking for Mesa library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -7353,7 +7371,7 @@ if test "$wxUSE_MOTIF" = 1; then # 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:7357: checking for X" >&5 +echo "configure:7375: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -7415,12 +7433,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:7424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7442: \"$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* @@ -7489,14 +7507,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:7518: \"$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. @@ -7602,17 +7620,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:7606: checking whether -R must be followed by a space" >&5 +echo "configure:7624: 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:7634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -7628,14 +7646,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:7657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -7667,7 +7685,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:7671: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:7689: 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 @@ -7675,7 +7693,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:7708: \"$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 @@ -7708,7 +7726,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:7712: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:7730: 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 @@ -7716,7 +7734,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:7749: \"$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 @@ -7756,12 +7774,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:7760: checking for gethostbyname" >&5 +echo "configure:7778: 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:7806: \"$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 @@ -7805,7 +7823,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:7809: checking for gethostbyname in -lnsl" >&5 +echo "configure:7827: 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 @@ -7813,7 +7831,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:7846: \"$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 @@ -7854,12 +7872,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:7858: checking for connect" >&5 +echo "configure:7876: 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:7904: \"$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 @@ -7903,7 +7921,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:7907: checking for connect in -lsocket" >&5 +echo "configure:7925: 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 @@ -7911,7 +7929,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:7944: \"$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 @@ -7946,12 +7964,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:7950: checking for remove" >&5 +echo "configure:7968: 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:7996: \"$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 @@ -7995,7 +8013,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:7999: checking for remove in -lposix" >&5 +echo "configure:8017: 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 @@ -8003,7 +8021,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:8036: \"$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 @@ -8038,12 +8056,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:8042: checking for shmat" >&5 +echo "configure:8060: 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:8088: \"$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 @@ -8087,7 +8105,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:8091: checking for shmat in -lipc" >&5 +echo "configure:8109: 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 @@ -8095,7 +8113,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:8128: \"$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 @@ -8139,7 +8157,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:8143: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:8161: 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 @@ -8147,7 +8165,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:8180: \"$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 @@ -8196,7 +8214,7 @@ fi COMPILED_X_PROGRAM=0 echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 -echo "configure:8200: checking for Motif/Lesstif headers" >&5 +echo "configure:8218: checking for Motif/Lesstif headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -8211,7 +8229,7 @@ for ac_dir in $SEARCH_INCLUDE; echo "$ac_t""found $ac_find_includes" 1>&6 else cat > conftest.$ac_ext < @@ -8224,7 +8242,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -8245,7 +8263,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:8249: checking for Motif/Lesstif library" >&5 +echo "configure:8267: checking for Motif/Lesstif library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -8284,7 +8302,7 @@ for ac_dir in $SEARCH_LIB; echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -8297,7 +8315,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -8320,7 +8338,7 @@ rm -f conftest* XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:8324: checking for Xpm library" >&5 +echo "configure:8342: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -8352,7 +8370,7 @@ EOF echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -8365,7 +8383,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* XPM_LINK="-lXpm " @@ -8512,7 +8530,11 @@ if test "$wxUSE_SHARED" = "yes"; then fi WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl" WX_LIBRARY_NAME_SHARED_GL="libwx_${TOOLKIT_DIR}_gl.sl" - WX_ALL=${WX_LIBRARY_NAME_SHARED} + if test "$wxUSE_OPENGL" = "yes"; then + WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}" + else + WX_ALL="${WX_LIBRARY_NAME_SHARED}" + fi ;; *-*-linux* ) @@ -8522,10 +8544,12 @@ if test "$wxUSE_SHARED" = "yes"; then BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}" BURNT_LIBRARY_NAME_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}" fi - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" - if test "$USE_GUI" = 1; then - WX_ALL="$WX_ALL CREATE_LINKS_GL" + if test "$wxUSE_OPENGL" = "yes"; then + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" + WX_ALL="CREATE_LINKS CREATE_LINKS_GL" + else + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" + WX_ALL="CREATE_LINKS" fi ;; *-*-irix5* | *-*-irix6* ) @@ -8535,10 +8559,12 @@ if test "$wxUSE_SHARED" = "yes"; then else SHARED_LD="${CXX} -shared -o" fi - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" - if test "$USE_GUI" = 1; then - WX_ALL="$WX_ALL CREATE_LINKS_GL" + if test "$wxUSE_OPENGL" = "yes"; then + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" + WX_ALL="CREATE_LINKS CREATE_LINKS_GL" + else + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" + WX_ALL="CREATE_LINKS" fi ;; *-*-solaris2* ) @@ -8549,8 +8575,13 @@ if test "$wxUSE_SHARED" = "yes"; then SHARED_LD="${CXX} -G -o" PIC_FLAG="-KPIC" fi - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS CREATE_LINKS_GL" + if test "$wxUSE_OPENGL" = "yes"; then + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" + WX_ALL="CREATE_LINKS CREATE_LINKS_GL" + else + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" + WX_ALL="CREATE_LINKS" + fi ;; *-*-sunos4* ) SHARED_LD="${CC} -shared -o" @@ -8625,17 +8656,17 @@ for ac_hdr in strings.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8629: checking for $ac_hdr" >&5 +echo "configure:8660: 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:8639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8670: \"$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* @@ -8665,17 +8696,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:8669: checking for $ac_hdr" >&5 +echo "configure:8700: 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:8679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8710: \"$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* @@ -8705,17 +8736,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:8709: checking for $ac_hdr" >&5 +echo "configure:8740: 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:8719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8750: \"$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* @@ -8745,17 +8776,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:8749: checking for $ac_hdr" >&5 +echo "configure:8780: 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:8759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8790: \"$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* @@ -8785,17 +8816,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:8789: checking for $ac_hdr" >&5 +echo "configure:8820: 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:8799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8830: \"$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* @@ -8823,21 +8854,22 @@ done if test "$wxUSE_GUI" = "yes"; then - for ac_hdr in X11/XKBlib.h + if test "$wxUSE_UNIX" = "yes"; then + for ac_hdr in X11/XKBlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8831: checking for $ac_hdr" >&5 +echo "configure:8863: 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:8841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8873: \"$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* @@ -8863,16 +8895,17 @@ else fi done + fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:8871: checking for ANSI C header files" >&5 +echo "configure:8904: 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 @@ -8880,7 +8913,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8917: \"$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* @@ -8897,7 +8930,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 @@ -8915,7 +8948,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 @@ -8936,7 +8969,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -8947,7 +8980,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:8951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -8971,12 +9004,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:8975: checking for mode_t" >&5 +echo "configure:9008: 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 @@ -9004,12 +9037,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:9008: checking for off_t" >&5 +echo "configure:9041: 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 @@ -9037,12 +9070,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:9041: checking for pid_t" >&5 +echo "configure:9074: 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 @@ -9070,12 +9103,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:9074: checking for size_t" >&5 +echo "configure:9107: 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 @@ -9103,12 +9136,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:9107: checking for uid_t in sys/types.h" >&5 +echo "configure:9140: 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 @@ -9139,13 +9172,13 @@ fi echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6 -echo "configure:9143: checking for pw_gecos in struct passwd" >&5 +echo "configure:9176: 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() { @@ -9156,7 +9189,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_pw_gecos=yes @@ -9183,12 +9216,12 @@ echo "$ac_t""$wx_cv_struct_pw_gecos" 1>&6 echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:9187: checking for working const" >&5 +echo "configure:9220: 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:9274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -9258,21 +9291,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:9262: checking for inline" >&5 +echo "configure:9295: 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:9309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -9299,7 +9332,7 @@ esac echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:9303: checking size of char" >&5 +echo "configure:9336: 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 @@ -9307,7 +9340,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < main() @@ -9318,7 +9351,7 @@ main() exit(0); } EOF -if { (eval echo configure:9322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9355: \"$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 @@ -9338,7 +9371,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:9342: checking size of short" >&5 +echo "configure:9375: 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 @@ -9346,7 +9379,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < main() @@ -9357,7 +9390,7 @@ main() exit(0); } EOF -if { (eval echo configure:9361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9394: \"$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 @@ -9377,7 +9410,7 @@ EOF echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:9381: checking size of int *" >&5 +echo "configure:9414: 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 @@ -9385,7 +9418,7 @@ else ac_cv_sizeof_int_p=4 else cat > conftest.$ac_ext < main() @@ -9396,7 +9429,7 @@ main() exit(0); } EOF -if { (eval echo configure:9400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9433: \"$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 @@ -9416,7 +9449,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:9420: checking size of int" >&5 +echo "configure:9453: 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 @@ -9424,7 +9457,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -9435,7 +9468,7 @@ main() exit(0); } EOF -if { (eval echo configure:9439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9472: \"$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 @@ -9455,7 +9488,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:9459: checking size of long" >&5 +echo "configure:9492: 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 @@ -9463,7 +9496,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -9474,7 +9507,7 @@ main() exit(0); } EOF -if { (eval echo configure:9478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9511: \"$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 @@ -9494,7 +9527,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:9498: checking size of long long" >&5 +echo "configure:9531: 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 @@ -9502,7 +9535,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -9513,7 +9546,7 @@ main() exit(0); } EOF -if { (eval echo configure:9517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9550: \"$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 @@ -9534,14 +9567,14 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:9538: checking whether byte ordering is bigendian" >&5 +echo "configure:9571: 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 @@ -9552,11 +9585,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:9556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9589: \"$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 @@ -9567,7 +9600,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:9571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -9587,7 +9620,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:9637: \"$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 @@ -9647,17 +9680,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:9651: checking for $ac_hdr" >&5 +echo "configure:9684: 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:9661: \"$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* @@ -9705,7 +9738,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:9709: checking if C++ compiler supports bool" >&5 +echo "configure:9742: 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 @@ -9720,7 +9753,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -9774,13 +9807,13 @@ EOF echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6 -echo "configure:9778: checking if you need GNU extensions" >&5 +echo "configure:9811: checking if you need GNU extensions" >&5 if eval "test \"`echo '$''{'wx_cv_gnu_extensions'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -9793,7 +9826,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_gnu_extensions=yes else @@ -9818,7 +9851,7 @@ fi echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6 -echo "configure:9822: checking for wcslen in -lc" >&5 +echo "configure:9855: 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 @@ -9826,7 +9859,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:9874: \"$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 @@ -9863,7 +9896,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:9867: checking for wcslen in -lw" >&5 +echo "configure:9900: 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 @@ -9871,7 +9904,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:9919: \"$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 @@ -9913,12 +9946,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:9917: checking for vprintf" >&5 +echo "configure:9950: 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:9978: \"$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 @@ -9965,12 +9998,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:9969: checking for _doprnt" >&5 +echo "configure:10002: 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:10030: \"$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 @@ -10021,12 +10054,12 @@ fi for ac_func in vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10025: checking for $ac_func" >&5 +echo "configure:10058: 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:10086: \"$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 @@ -10089,7 +10122,7 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 -echo "configure:10093: checking for vsscanf" >&5 +echo "configure:10126: checking for vsscanf" >&5 if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10099,7 +10132,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:10163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF @@ -10162,12 +10195,12 @@ if test "$TOOLKIT" != "MSW"; then for ac_func in vfork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10166: checking for $ac_func" >&5 +echo "configure:10199: 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:10227: \"$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 @@ -10218,12 +10251,12 @@ done for ac_func in timegm do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10222: checking for $ac_func" >&5 +echo "configure:10255: 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:10283: \"$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 @@ -10285,12 +10318,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:10289: checking for $ac_func" >&5 +echo "configure:10322: 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:10350: \"$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 @@ -10338,7 +10371,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:10342: checking for nanosleep in -lposix4" >&5 +echo "configure:10375: 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 @@ -10346,7 +10379,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:10394: \"$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 @@ -10385,12 +10418,12 @@ else for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10389: checking for $ac_func" >&5 +echo "configure:10422: 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:10450: \"$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 @@ -10452,12 +10485,12 @@ fi for ac_func in uname gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10456: checking for $ac_func" >&5 +echo "configure:10489: 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:10517: \"$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 @@ -10505,20 +10538,32 @@ fi done + +ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +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:10512: checking for $ac_func" >&5 +echo "configure:10554: 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 < /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); @@ -10536,7 +10581,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:10540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10585: \"$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 @@ -10561,16 +10606,24 @@ fi done +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + + INET_LINK= for ac_func in inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10569: checking for $ac_func" >&5 +echo "configure:10622: 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:10650: \"$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 @@ -10618,7 +10671,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 -echo "configure:10622: checking for inet_addr in -lnsl" >&5 +echo "configure:10675: 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 @@ -10626,7 +10679,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:10694: \"$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 @@ -10656,7 +10709,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:10660: checking for inet_addr in -lresolv" >&5 +echo "configure:10713: 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 @@ -10664,7 +10717,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:10732: \"$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 @@ -10708,12 +10761,12 @@ done for ac_func in inet_aton do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10712: checking for $ac_func" >&5 +echo "configure:10765: 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:10793: \"$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 @@ -10761,7 +10814,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:10765: checking for inet_aton in -l$INET_LINK" >&5 +echo "configure:10818: 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 @@ -10769,7 +10822,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:10837: \"$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 @@ -10887,7 +10940,7 @@ fi if test "$wxUSE_THREADS" = "yes" ; then echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:10891: checking for pthread_create in -lpthread" >&5 +echo "configure:10944: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'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 @@ -10895,7 +10948,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10963: \"$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 @@ -10929,7 +10982,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:10933: checking for pthread_create in -lc_r" >&5 +echo "configure:10986: 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 @@ -10937,7 +10990,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:11005: \"$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 @@ -10972,17 +11025,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:10976: checking for sys/prctl.h" >&5 +echo "configure:11029: 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:10986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11039: \"$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* @@ -11022,12 +11075,12 @@ if test "$wxUSE_THREADS" = "yes" ; then for ac_func in thr_setconcurrency do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11026: checking for $ac_func" >&5 +echo "configure:11079: 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:11107: \"$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 @@ -11080,17 +11133,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11084: checking for $ac_hdr" >&5 +echo "configure:11137: 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:11094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11147: \"$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* @@ -11118,7 +11171,7 @@ done echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:11122: checking for sched_yield in -l$THREADS_LINK" >&5 +echo "configure:11175: 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 @@ -11126,7 +11179,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:11194: \"$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 @@ -11159,7 +11212,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6 -echo "configure:11163: checking for sched_yield in -l"posix4"" >&5 +echo "configure:11216: checking for sched_yield in -l"posix4"" >&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 @@ -11167,7 +11220,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l"posix4" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11235: \"$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 @@ -11208,7 +11261,7 @@ fi echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:11212: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 +echo "configure:11265: 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 @@ -11216,7 +11269,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:11284: \"$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 @@ -11249,7 +11302,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6 -echo "configure:11253: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5 +echo "configure:11306: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5 ac_lib_var=`echo "posix4"'_'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 @@ -11257,7 +11310,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l"posix4" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11325: \"$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 @@ -11298,7 +11351,7 @@ fi echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:11302: checking for pthread_cancel in -l$THREADS_LINK" >&5 +echo "configure:11355: 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 @@ -11306,7 +11359,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:11374: \"$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 @@ -11343,13 +11396,13 @@ fi echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 -echo "configure:11347: checking for pthread_cleanup_push/pop" >&5 +echo "configure:11400: 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() { @@ -11359,7 +11412,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_pthread_cleanup_push=yes @@ -11400,7 +11453,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:11404: checking if -D_REENTRANT is needed" >&5 +echo "configure:11457: checking if -D_REENTRANT is needed" >&5 if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then CFLAGS="${CFLAGS} -D_REENTRANT" CXXFLAGS="${CXXFLAGS} -D_REENTRANT" @@ -11531,17 +11584,17 @@ EOF ZLIB_LINK= ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 -echo "configure:11535: checking for zlib.h" >&5 +echo "configure:11588: 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:11545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11598: \"$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* @@ -11558,7 +11611,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:11562: checking for deflate in -lz" >&5 +echo "configure:11615: 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 @@ -11566,7 +11619,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:11634: \"$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 @@ -11624,17 +11677,17 @@ EOF PNG_LINK= ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:11628: checking for png.h" >&5 +echo "configure:11681: 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:11638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11691: \"$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* @@ -11651,7 +11704,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:11655: checking for png_check_sig in -lpng" >&5 +echo "configure:11708: 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 @@ -11659,7 +11712,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:11727: \"$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 @@ -11696,7 +11749,7 @@ else fi if test "x$PNG_LINK" = "x" ; then - { echo "configure: error: system png library not found! Use --with-png=yes to use built-in libpng" 1>&2; exit 1; } + { echo "configure: error: system png library not found! Use --with-libpng=yes to use the built-in libpng" 1>&2; exit 1; } fi fi @@ -11715,17 +11768,17 @@ EOF JPEG_LINK= ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:11719: checking for jpeglib.h" >&5 +echo "configure:11772: checking for jpeglib.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:11729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11782: \"$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* @@ -11742,7 +11795,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:11746: checking for jpeg_read_header in -ljpeg" >&5 +echo "configure:11799: 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 @@ -11750,7 +11803,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:11818: \"$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 @@ -11786,34 +11839,113 @@ else fi if test "x$JPEG_LINK" = "x" ; then - { echo "configure: error: system jpeg library not found! Use --with-jpeg=yes to use built-in one" 1>&2; exit 1; } + { echo "configure: error: system jpeg library not found! Use --with-libjpeg=yes to use the built-in one" 1>&2; exit 1; } fi fi fi TIFF_INCLUDE= -if test "$wxUSE_LIBTIFF" = "yes" ; then +if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then cat >> confdefs.h <<\EOF #define wxUSE_LIBTIFF 1 EOF - TIFF_INCLUDE="-I\${top_srcdir}/src/tiff" + if test "$wxUSE_LIBTIFF" = "yes" ; then + TIFF_INCLUDE="-I\${top_srcdir}/src/tiff" + else + TIFF_LINK= + ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 +echo "configure:11860: 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:11870: \"$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 TIFFError in -ltiff""... $ac_c" 1>&6 +echo "configure:11887: 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 +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 + 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 + TIFF_LINK="-ltiff" +else + echo "$ac_t""no" 1>&6 +fi + +else + echo "$ac_t""no" 1>&6 +fi + + if test "x$TIFF_LINK" = "x" ; then + { echo "configure: error: system tiff library not found! Use --with-libtiff=yes to use the built-in one" 1>&2; exit 1; } + fi + fi fi 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:11807: checking for GL/gl.h" >&5 +echo "configure:11939: 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:11817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11949: \"$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* @@ -11839,7 +11971,7 @@ EOF EOF echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6 -echo "configure:11843: checking for glFlush in -lGL" >&5 +echo "configure:11975: checking for glFlush in -lGL" >&5 ac_lib_var=`echo GL'_'glFlush | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11847,7 +11979,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lGL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11994: \"$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 @@ -11880,7 +12012,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6 -echo "configure:11884: checking for glFlush in -lMesaGL" >&5 +echo "configure:12016: checking for glFlush in -lMesaGL" >&5 ac_lib_var=`echo MesaGL'_'glFlush | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11888,7 +12020,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lMesaGL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12035: \"$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 @@ -12094,12 +12226,12 @@ if test "$wxUSE_TIMEDATE" = "yes"; then for ac_func in strptime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12098: checking for $ac_func" >&5 +echo "configure:12230: 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:12258: \"$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 @@ -12148,13 +12280,13 @@ done echo $ac_n "checking for timezone variable in ""... $ac_c" 1>&6 -echo "configure:12152: checking for timezone variable in " >&5 +echo "configure:12284: 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 < @@ -12166,7 +12298,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=__timezone @@ -12177,7 +12309,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -12189,7 +12321,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=_timezone @@ -12200,7 +12332,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -12212,7 +12344,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=timezone @@ -12247,12 +12379,12 @@ EOF for ac_func in localtime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12251: checking for $ac_func" >&5 +echo "configure:12383: 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:12411: \"$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 @@ -12302,13 +12434,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:12306: checking for tm_gmtoff in struct tm" >&5 +echo "configure:12438: 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 < @@ -12320,7 +12452,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_tm_has_gmtoff=yes @@ -12346,12 +12478,12 @@ echo "$ac_t""$wx_cv_struct_tm_has_gmtoff" 1>&6 for ac_func in gettimeofday ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12350: checking for $ac_func" >&5 +echo "configure:12482: 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:12510: \"$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 @@ -12401,7 +12533,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:12405: checking whether gettimeofday takes two arguments" >&5 +echo "configure:12537: 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 @@ -12416,7 +12548,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -12430,7 +12562,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=yes else @@ -12438,7 +12570,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -12451,7 +12583,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=no else @@ -12497,12 +12629,12 @@ if test "$TOOLKIT" != "MSW"; then if test "$wxUSE_SOCKETS" = "yes"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:12501: checking for socket" >&5 +echo "configure:12633: 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:12661: \"$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 @@ -12543,7 +12675,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:12547: checking for socket in -lsocket" >&5 +echo "configure:12679: 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 @@ -12551,7 +12683,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:12698: \"$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 @@ -12596,7 +12728,7 @@ fi if test "$wxUSE_SOCKETS" = "yes" ; then echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6 -echo "configure:12600: checking what is the type of the third argument of getsockname" >&5 +echo "configure:12732: 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 @@ -12611,7 +12743,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -12624,7 +12756,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=socklen_t else @@ -12632,7 +12764,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -12645,7 +12777,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=size_t else @@ -12653,7 +12785,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -12666,7 +12798,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=int else @@ -12724,17 +12856,17 @@ if test "$wxUSE_JOYSTICK" = 1; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12728: checking for $ac_hdr" >&5 +echo "configure:12860: 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:12738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12870: \"$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* @@ -12785,12 +12917,12 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12789: checking for $ac_func" >&5 +echo "configure:12921: 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:12949: \"$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 @@ -12841,7 +12973,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:12845: checking for dlopen in -ldl" >&5 +echo "configure:12977: 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 @@ -12849,7 +12981,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:12996: \"$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 @@ -12889,12 +13021,12 @@ else for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12893: checking for $ac_func" >&5 +echo "configure:13025: 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:13053: \"$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 @@ -13148,17 +13280,17 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13152: checking for $ac_hdr" >&5 +echo "configure:13284: 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:13162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13294: \"$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* @@ -13573,8 +13705,13 @@ EOF fi -OSINFO=`uname -s -r -m` -OSINFO="\"$OSINFO\"" +if test "$cross_compiling" = "yes"; then + OSINFO="\"$host\"" +else + OSINFO=`uname -s -r -m` + OSINFO="\"$OSINFO\"" +fi + cat >> confdefs.h <&6 -echo "configure:13695: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:13845: 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 @@ -13732,7 +13882,10 @@ fi if test "$wxUSE_GUI" = "yes"; then wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS - subdirs="demos samples utils" + wx_cv_path_ifs=$PATH_IFS + wx_cv_program_ext=$PROGRAM_EXT + wx_cv_target_library=$WX_TARGET_LIBRARY + subdirs="demos samples utils contrib" fi @@ -13974,6 +14127,16 @@ s%@USER_SUBDIRS@%$USER_SUBDIRS%g s%@EXTRA_LIBS@%$EXTRA_LIBS%g s%@EXTRADEFS@%$EXTRADEFS%g s%@LD_LIBS@%$LD_LIBS%g +s%@RCINPUTSWITCH@%$RCINPUTSWITCH%g +s%@RCOUTPUTSWITCH@%$RCOUTPUTSWITCH%g +s%@RESPROGRAM@%$RESPROGRAM%g +s%@RESCOMP@%$RESCOMP%g +s%@RESFLAGS@%$RESFLAGS%g +s%@DLLTOOL@%$DLLTOOL%g +s%@AS@%$AS%g +s%@NM@%$NM%g +s%@LD@%$LD%g +s%@MAKEINFO@%$MAKEINFO%g s%@SET_MAKE@%$SET_MAKE%g s%@subdirs@%$subdirs%g @@ -14268,7 +14431,7 @@ if test "$no_recursion" != yes; then esac done - for ac_config_dir in demos samples utils; do + for ac_config_dir in demos samples utils contrib; do # Do not complain, so a configure script can configure whichever # parts of a large source tree are present.