X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05159a2750ed2cc5945a85bc5fc6849ad1a30e75..6394c5966cf356f338dbd65fb762c9214dd0f738:/configure diff --git a/configure b/configure index 9f7a4dc6ee..6d71d11d2f 100755 --- a/configure +++ b/configure @@ -96,7 +96,7 @@ ac_help="$ac_help ac_help="$ac_help --with-mac use Mac OS X" ac_help="$ac_help - --with-wine use WINE" + --with-wine use Wine" ac_help="$ac_help --with-msw use MS-Windows" ac_help="$ac_help @@ -160,7 +160,9 @@ ac_help="$ac_help ac_help="$ac_help --enable-compat20 enable wxWindows 2.0 compatibility" ac_help="$ac_help - --disable-compat22 disable wxWindows 2.2 compatibility" + --enable-compat22 enable wxWindows 2.2 compatibility" +ac_help="$ac_help + --disable-compat24 disable wxWindows 2.4 compatibility" ac_help="$ac_help --enable-rpath=DIR output the rpath flag from wx-config" ac_help="$ac_help @@ -1017,7 +1019,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1021: checking host system type" >&5 +echo "configure:1023: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1038,7 +1040,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:1042: checking target system type" >&5 +echo "configure:1044: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -1056,7 +1058,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1060: checking build system type" >&5 +echo "configure:1062: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1123,7 +1125,7 @@ USE_DATA_GENERAL= NEEDS_D_REENTRANT_FOR_R_FUNCS=0 -ALL_TOOLKITS="GTK MAC MGL MICROWIN MOTIF MSW PM WINE X11" +ALL_TOOLKITS="GTK MAC MGL MICROWIN MOTIF MSW PM X11" DEFAULT_wxUSE_GTK=0 DEFAULT_wxUSE_MAC=0 @@ -1132,7 +1134,6 @@ DEFAULT_wxUSE_MICROWIN=0 DEFAULT_wxUSE_MOTIF=0 DEFAULT_wxUSE_MSW=0 DEFAULT_wxUSE_PM=0 -DEFAULT_wxUSE_WINE=0 DEFAULT_wxUSE_X11=0 DEFAULT_DEFAULT_wxUSE_GTK=0 @@ -1142,7 +1143,6 @@ DEFAULT_DEFAULT_wxUSE_MICROWIN=0 DEFAULT_DEFAULT_wxUSE_MOTIF=0 DEFAULT_DEFAULT_wxUSE_MSW=0 DEFAULT_DEFAULT_wxUSE_PM=0 -DEFAULT_DEFAULT_wxUSE_WINE=0 DEFAULT_DEFAULT_wxUSE_X11=0 PROGRAM_EXT= @@ -1863,7 +1863,7 @@ fi # Check whether --with-wine or --without-wine was given. if test "${with_wine+set}" = set; then withval="$with_wine" - wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1 + wxUSE_WINE="$withval" CACHE_WINE=1 fi # Check whether --with-msw or --without-msw was given. @@ -3007,7 +3007,7 @@ fi fi - enablestring=disable + enablestring= echo $ac_n "checking for --${enablestring:-enable}-compat22""... $ac_c" 1>&6 echo "configure:3013: checking for --${enablestring:-enable}-compat22" >&5 no_cache=0 @@ -3047,6 +3047,46 @@ fi fi + enablestring=disable + echo $ac_n "checking for --${enablestring:-enable}-compat24""... $ac_c" 1>&6 +echo "configure:3053: checking for --${enablestring:-enable}-compat24" >&5 + no_cache=0 + # Check whether --enable-compat24 or --disable-compat24 was given. +if test "${enable_compat24+set}" = set; then + enableval="$enable_compat24" + + if test "$enableval" = yes; then + ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4=yes' + else + ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4=no' + fi + +else + + LINE=`grep "WXWIN_COMPATIBILITY_2_4" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4='$DEFAULT_WXWIN_COMPATIBILITY_2_4 + +fi + + + eval "$ac_cv_use_compat24" + if test "$no_cache" != 1; then + echo $ac_cv_use_compat24 >> ${wx_arg_cache_file}.tmp + fi + + if test "$WXWIN_COMPATIBILITY_2_4" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + # Check whether --enable-rpath or --disable-rpath was given. if test "${enable_rpath+set}" = set; then enableval="$enable_rpath" @@ -3063,7 +3103,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-intl""... $ac_c" 1>&6 -echo "configure:3067: checking for --${enablestring:-enable}-intl" >&5 +echo "configure:3107: checking for --${enablestring:-enable}-intl" >&5 no_cache=0 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then @@ -3103,7 +3143,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-config""... $ac_c" 1>&6 -echo "configure:3107: checking for --${enablestring:-enable}-config" >&5 +echo "configure:3147: checking for --${enablestring:-enable}-config" >&5 no_cache=0 # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -3144,7 +3184,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-protocols""... $ac_c" 1>&6 -echo "configure:3148: checking for --${enablestring:-enable}-protocols" >&5 +echo "configure:3188: checking for --${enablestring:-enable}-protocols" >&5 no_cache=0 # Check whether --enable-protocols or --disable-protocols was given. if test "${enable_protocols+set}" = set; then @@ -3184,7 +3224,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-ftp""... $ac_c" 1>&6 -echo "configure:3188: checking for --${enablestring:-enable}-ftp" >&5 +echo "configure:3228: checking for --${enablestring:-enable}-ftp" >&5 no_cache=0 # Check whether --enable-ftp or --disable-ftp was given. if test "${enable_ftp+set}" = set; then @@ -3224,7 +3264,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-http""... $ac_c" 1>&6 -echo "configure:3228: checking for --${enablestring:-enable}-http" >&5 +echo "configure:3268: checking for --${enablestring:-enable}-http" >&5 no_cache=0 # Check whether --enable-http or --disable-http was given. if test "${enable_http+set}" = set; then @@ -3264,7 +3304,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-fileproto""... $ac_c" 1>&6 -echo "configure:3268: checking for --${enablestring:-enable}-fileproto" >&5 +echo "configure:3308: checking for --${enablestring:-enable}-fileproto" >&5 no_cache=0 # Check whether --enable-fileproto or --disable-fileproto was given. if test "${enable_fileproto+set}" = set; then @@ -3304,7 +3344,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-sockets""... $ac_c" 1>&6 -echo "configure:3308: checking for --${enablestring:-enable}-sockets" >&5 +echo "configure:3348: checking for --${enablestring:-enable}-sockets" >&5 no_cache=0 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then @@ -3344,7 +3384,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-ole""... $ac_c" 1>&6 -echo "configure:3348: checking for --${enablestring:-enable}-ole" >&5 +echo "configure:3388: checking for --${enablestring:-enable}-ole" >&5 no_cache=0 # Check whether --enable-ole or --disable-ole was given. if test "${enable_ole+set}" = set; then @@ -3384,7 +3424,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-dataobj""... $ac_c" 1>&6 -echo "configure:3388: checking for --${enablestring:-enable}-dataobj" >&5 +echo "configure:3428: checking for --${enablestring:-enable}-dataobj" >&5 no_cache=0 # Check whether --enable-dataobj or --disable-dataobj was given. if test "${enable_dataobj+set}" = set; then @@ -3425,7 +3465,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-ipc""... $ac_c" 1>&6 -echo "configure:3429: checking for --${enablestring:-enable}-ipc" >&5 +echo "configure:3469: checking for --${enablestring:-enable}-ipc" >&5 no_cache=0 # Check whether --enable-ipc or --disable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -3466,7 +3506,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-cmdline""... $ac_c" 1>&6 -echo "configure:3470: checking for --${enablestring:-enable}-cmdline" >&5 +echo "configure:3510: checking for --${enablestring:-enable}-cmdline" >&5 no_cache=0 # Check whether --enable-cmdline or --disable-cmdline was given. if test "${enable_cmdline+set}" = set; then @@ -3506,7 +3546,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-datetime""... $ac_c" 1>&6 -echo "configure:3510: checking for --${enablestring:-enable}-datetime" >&5 +echo "configure:3550: checking for --${enablestring:-enable}-datetime" >&5 no_cache=0 # Check whether --enable-datetime or --disable-datetime was given. if test "${enable_datetime+set}" = set; then @@ -3546,7 +3586,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-timedate""... $ac_c" 1>&6 -echo "configure:3550: checking for --${enablestring:-enable}-timedate" >&5 +echo "configure:3590: checking for --${enablestring:-enable}-timedate" >&5 no_cache=0 # Check whether --enable-timedate or --disable-timedate was given. if test "${enable_timedate+set}" = set; then @@ -3586,7 +3626,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-stopwatch""... $ac_c" 1>&6 -echo "configure:3590: checking for --${enablestring:-enable}-stopwatch" >&5 +echo "configure:3630: checking for --${enablestring:-enable}-stopwatch" >&5 no_cache=0 # Check whether --enable-stopwatch or --disable-stopwatch was given. if test "${enable_stopwatch+set}" = set; then @@ -3626,7 +3666,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-dialupman""... $ac_c" 1>&6 -echo "configure:3630: checking for --${enablestring:-enable}-dialupman" >&5 +echo "configure:3670: checking for --${enablestring:-enable}-dialupman" >&5 no_cache=0 # Check whether --enable-dialupman or --disable-dialupman was given. if test "${enable_dialupman+set}" = set; then @@ -3666,7 +3706,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-apple_ieee""... $ac_c" 1>&6 -echo "configure:3670: checking for --${enablestring:-enable}-apple_ieee" >&5 +echo "configure:3710: checking for --${enablestring:-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 @@ -3706,7 +3746,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-timer""... $ac_c" 1>&6 -echo "configure:3710: checking for --${enablestring:-enable}-timer" >&5 +echo "configure:3750: checking for --${enablestring:-enable}-timer" >&5 no_cache=0 # Check whether --enable-timer or --disable-timer was given. if test "${enable_timer+set}" = set; then @@ -3746,7 +3786,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-wave""... $ac_c" 1>&6 -echo "configure:3750: checking for --${enablestring:-enable}-wave" >&5 +echo "configure:3790: checking for --${enablestring:-enable}-wave" >&5 no_cache=0 # Check whether --enable-wave or --disable-wave was given. if test "${enable_wave+set}" = set; then @@ -3786,7 +3826,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-fraction""... $ac_c" 1>&6 -echo "configure:3790: checking for --${enablestring:-enable}-fraction" >&5 +echo "configure:3830: checking for --${enablestring:-enable}-fraction" >&5 no_cache=0 # Check whether --enable-fraction or --disable-fraction was given. if test "${enable_fraction+set}" = set; then @@ -3826,7 +3866,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-dynlib""... $ac_c" 1>&6 -echo "configure:3830: checking for --${enablestring:-enable}-dynlib" >&5 +echo "configure:3870: checking for --${enablestring:-enable}-dynlib" >&5 no_cache=0 # Check whether --enable-dynlib or --disable-dynlib was given. if test "${enable_dynlib+set}" = set; then @@ -3866,7 +3906,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-dynamicloader""... $ac_c" 1>&6 -echo "configure:3870: checking for --${enablestring:-enable}-dynamicloader" >&5 +echo "configure:3910: checking for --${enablestring:-enable}-dynamicloader" >&5 no_cache=0 # Check whether --enable-dynamicloader or --disable-dynamicloader was given. if test "${enable_dynamicloader+set}" = set; then @@ -3906,7 +3946,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-longlong""... $ac_c" 1>&6 -echo "configure:3910: checking for --${enablestring:-enable}-longlong" >&5 +echo "configure:3950: checking for --${enablestring:-enable}-longlong" >&5 no_cache=0 # Check whether --enable-longlong or --disable-longlong was given. if test "${enable_longlong+set}" = set; then @@ -3946,7 +3986,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-geometry""... $ac_c" 1>&6 -echo "configure:3950: checking for --${enablestring:-enable}-geometry" >&5 +echo "configure:3990: checking for --${enablestring:-enable}-geometry" >&5 no_cache=0 # Check whether --enable-geometry or --disable-geometry was given. if test "${enable_geometry+set}" = set; then @@ -3986,7 +4026,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-log""... $ac_c" 1>&6 -echo "configure:3990: checking for --${enablestring:-enable}-log" >&5 +echo "configure:4030: checking for --${enablestring:-enable}-log" >&5 no_cache=0 # Check whether --enable-log or --disable-log was given. if test "${enable_log+set}" = set; then @@ -4026,7 +4066,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-streams""... $ac_c" 1>&6 -echo "configure:4030: checking for --${enablestring:-enable}-streams" >&5 +echo "configure:4070: checking for --${enablestring:-enable}-streams" >&5 no_cache=0 # Check whether --enable-streams or --disable-streams was given. if test "${enable_streams+set}" = set; then @@ -4066,7 +4106,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-file""... $ac_c" 1>&6 -echo "configure:4070: checking for --${enablestring:-enable}-file" >&5 +echo "configure:4110: checking for --${enablestring:-enable}-file" >&5 no_cache=0 # Check whether --enable-file or --disable-file was given. if test "${enable_file+set}" = set; then @@ -4106,7 +4146,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-ffile""... $ac_c" 1>&6 -echo "configure:4110: checking for --${enablestring:-enable}-ffile" >&5 +echo "configure:4150: checking for --${enablestring:-enable}-ffile" >&5 no_cache=0 # Check whether --enable-ffile or --disable-ffile was given. if test "${enable_ffile+set}" = set; then @@ -4146,7 +4186,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-textbuf""... $ac_c" 1>&6 -echo "configure:4150: checking for --${enablestring:-enable}-textbuf" >&5 +echo "configure:4190: checking for --${enablestring:-enable}-textbuf" >&5 no_cache=0 # Check whether --enable-textbuf or --disable-textbuf was given. if test "${enable_textbuf+set}" = set; then @@ -4186,7 +4226,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-textfile""... $ac_c" 1>&6 -echo "configure:4190: checking for --${enablestring:-enable}-textfile" >&5 +echo "configure:4230: checking for --${enablestring:-enable}-textfile" >&5 no_cache=0 # Check whether --enable-textfile or --disable-textfile was given. if test "${enable_textfile+set}" = set; then @@ -4226,7 +4266,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-fontmap""... $ac_c" 1>&6 -echo "configure:4230: checking for --${enablestring:-enable}-fontmap" >&5 +echo "configure:4270: checking for --${enablestring:-enable}-fontmap" >&5 no_cache=0 # Check whether --enable-fontmap or --disable-fontmap was given. if test "${enable_fontmap+set}" = set; then @@ -4266,7 +4306,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-unicode""... $ac_c" 1>&6 -echo "configure:4270: checking for --${enablestring:-enable}-unicode" >&5 +echo "configure:4310: checking for --${enablestring:-enable}-unicode" >&5 no_cache=0 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then @@ -4306,7 +4346,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-mslu""... $ac_c" 1>&6 -echo "configure:4310: checking for --${enablestring:-enable}-mslu" >&5 +echo "configure:4350: checking for --${enablestring:-enable}-mslu" >&5 no_cache=0 # Check whether --enable-mslu or --disable-mslu was given. if test "${enable_mslu+set}" = set; then @@ -4346,7 +4386,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-wxprintfv""... $ac_c" 1>&6 -echo "configure:4350: checking for --${enablestring:-enable}-wxprintfv" >&5 +echo "configure:4390: checking for --${enablestring:-enable}-wxprintfv" >&5 no_cache=0 # Check whether --enable-wxprintfv or --disable-wxprintfv was given. if test "${enable_wxprintfv+set}" = set; then @@ -4386,7 +4426,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-std_iostreams""... $ac_c" 1>&6 -echo "configure:4390: checking for --${enablestring:-enable}-std_iostreams" >&5 +echo "configure:4430: checking for --${enablestring:-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 @@ -4426,7 +4466,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-filesystem""... $ac_c" 1>&6 -echo "configure:4430: checking for --${enablestring:-enable}-filesystem" >&5 +echo "configure:4470: checking for --${enablestring:-enable}-filesystem" >&5 no_cache=0 # Check whether --enable-filesystem or --disable-filesystem was given. if test "${enable_filesystem+set}" = set; then @@ -4466,7 +4506,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-fs_inet""... $ac_c" 1>&6 -echo "configure:4470: checking for --${enablestring:-enable}-fs_inet" >&5 +echo "configure:4510: checking for --${enablestring:-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 @@ -4506,7 +4546,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-fs_zip""... $ac_c" 1>&6 -echo "configure:4510: checking for --${enablestring:-enable}-fs_zip" >&5 +echo "configure:4550: checking for --${enablestring:-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 @@ -4546,7 +4586,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-zipstream""... $ac_c" 1>&6 -echo "configure:4550: checking for --${enablestring:-enable}-zipstream" >&5 +echo "configure:4590: checking for --${enablestring:-enable}-zipstream" >&5 no_cache=0 # Check whether --enable-zipstream or --disable-zipstream was given. if test "${enable_zipstream+set}" = set; then @@ -4587,7 +4627,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-catch_segvs""... $ac_c" 1>&6 -echo "configure:4591: checking for --${enablestring:-enable}-catch_segvs" >&5 +echo "configure:4631: checking for --${enablestring:-enable}-catch_segvs" >&5 no_cache=0 # Check whether --enable-catch_segvs or --disable-catch_segvs was given. if test "${enable_catch_segvs+set}" = set; then @@ -4627,7 +4667,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-snglinst""... $ac_c" 1>&6 -echo "configure:4631: checking for --${enablestring:-enable}-snglinst" >&5 +echo "configure:4671: checking for --${enablestring:-enable}-snglinst" >&5 no_cache=0 # Check whether --enable-snglinst or --disable-snglinst was given. if test "${enable_snglinst+set}" = set; then @@ -4668,7 +4708,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-mimetype""... $ac_c" 1>&6 -echo "configure:4672: checking for --${enablestring:-enable}-mimetype" >&5 +echo "configure:4712: checking for --${enablestring:-enable}-mimetype" >&5 no_cache=0 # Check whether --enable-mimetype or --disable-mimetype was given. if test "${enable_mimetype+set}" = set; then @@ -4708,7 +4748,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-system_options""... $ac_c" 1>&6 -echo "configure:4712: checking for --${enablestring:-enable}-system_options" >&5 +echo "configure:4752: checking for --${enablestring:-enable}-system_options" >&5 no_cache=0 # Check whether --enable-system_options or --disable-system_options was given. if test "${enable_system_options+set}" = set; then @@ -4749,7 +4789,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-url""... $ac_c" 1>&6 -echo "configure:4753: checking for --${enablestring:-enable}-url" >&5 +echo "configure:4793: checking for --${enablestring:-enable}-url" >&5 no_cache=0 # Check whether --enable-url or --disable-url was given. if test "${enable_url+set}" = set; then @@ -4789,7 +4829,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-protocol""... $ac_c" 1>&6 -echo "configure:4793: checking for --${enablestring:-enable}-protocol" >&5 +echo "configure:4833: checking for --${enablestring:-enable}-protocol" >&5 no_cache=0 # Check whether --enable-protocol or --disable-protocol was given. if test "${enable_protocol+set}" = set; then @@ -4829,7 +4869,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-protocol_http""... $ac_c" 1>&6 -echo "configure:4833: checking for --${enablestring:-enable}-protocol_http" >&5 +echo "configure:4873: checking for --${enablestring:-enable}-protocol_http" >&5 no_cache=0 # Check whether --enable-protocol_http or --disable-protocol_http was given. if test "${enable_protocol_http+set}" = set; then @@ -4869,7 +4909,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-protocol_ftp""... $ac_c" 1>&6 -echo "configure:4873: checking for --${enablestring:-enable}-protocol_ftp" >&5 +echo "configure:4913: checking for --${enablestring:-enable}-protocol_ftp" >&5 no_cache=0 # Check whether --enable-protocol_ftp or --disable-protocol_ftp was given. if test "${enable_protocol_ftp+set}" = set; then @@ -4909,7 +4949,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-protocol_file""... $ac_c" 1>&6 -echo "configure:4913: checking for --${enablestring:-enable}-protocol_file" >&5 +echo "configure:4953: checking for --${enablestring:-enable}-protocol_file" >&5 no_cache=0 # Check whether --enable-protocol_file or --disable-protocol_file was given. if test "${enable_protocol_file+set}" = set; then @@ -4952,7 +4992,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-threads""... $ac_c" 1>&6 -echo "configure:4956: checking for --${enablestring:-enable}-threads" >&5 +echo "configure:4996: checking for --${enablestring:-enable}-threads" >&5 no_cache=0 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then @@ -4996,7 +5036,7 @@ if test "$wxUSE_GUI" = "yes"; then enablestring= echo $ac_n "checking for --${enablestring:-enable}-docview""... $ac_c" 1>&6 -echo "configure:5000: checking for --${enablestring:-enable}-docview" >&5 +echo "configure:5040: checking for --${enablestring:-enable}-docview" >&5 no_cache=0 # Check whether --enable-docview or --disable-docview was given. if test "${enable_docview+set}" = set; then @@ -5036,7 +5076,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-help""... $ac_c" 1>&6 -echo "configure:5040: checking for --${enablestring:-enable}-help" >&5 +echo "configure:5080: checking for --${enablestring:-enable}-help" >&5 no_cache=0 # Check whether --enable-help or --disable-help was given. if test "${enable_help+set}" = set; then @@ -5076,7 +5116,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-mshtmlhelp""... $ac_c" 1>&6 -echo "configure:5080: checking for --${enablestring:-enable}-mshtmlhelp" >&5 +echo "configure:5120: checking for --${enablestring:-enable}-mshtmlhelp" >&5 no_cache=0 # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given. if test "${enable_mshtmlhelp+set}" = set; then @@ -5116,7 +5156,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-html""... $ac_c" 1>&6 -echo "configure:5120: checking for --${enablestring:-enable}-html" >&5 +echo "configure:5160: checking for --${enablestring:-enable}-html" >&5 no_cache=0 # Check whether --enable-html or --disable-html was given. if test "${enable_html+set}" = set; then @@ -5156,7 +5196,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-htmlhelp""... $ac_c" 1>&6 -echo "configure:5160: checking for --${enablestring:-enable}-htmlhelp" >&5 +echo "configure:5200: checking for --${enablestring:-enable}-htmlhelp" >&5 no_cache=0 # Check whether --enable-htmlhelp or --disable-htmlhelp was given. if test "${enable_htmlhelp+set}" = set; then @@ -5196,7 +5236,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-constraints""... $ac_c" 1>&6 -echo "configure:5200: checking for --${enablestring:-enable}-constraints" >&5 +echo "configure:5240: checking for --${enablestring:-enable}-constraints" >&5 no_cache=0 # Check whether --enable-constraints or --disable-constraints was given. if test "${enable_constraints+set}" = set; then @@ -5236,7 +5276,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-printarch""... $ac_c" 1>&6 -echo "configure:5240: checking for --${enablestring:-enable}-printarch" >&5 +echo "configure:5280: checking for --${enablestring:-enable}-printarch" >&5 no_cache=0 # Check whether --enable-printarch or --disable-printarch was given. if test "${enable_printarch+set}" = set; then @@ -5276,7 +5316,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-mdi""... $ac_c" 1>&6 -echo "configure:5280: checking for --${enablestring:-enable}-mdi" >&5 +echo "configure:5320: checking for --${enablestring:-enable}-mdi" >&5 no_cache=0 # Check whether --enable-mdi or --disable-mdi was given. if test "${enable_mdi+set}" = set; then @@ -5316,7 +5356,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-loggui""... $ac_c" 1>&6 -echo "configure:5320: checking for --${enablestring:-enable}-loggui" >&5 +echo "configure:5360: checking for --${enablestring:-enable}-loggui" >&5 no_cache=0 # Check whether --enable-loggui or --disable-loggui was given. if test "${enable_loggui+set}" = set; then @@ -5356,7 +5396,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-logwin""... $ac_c" 1>&6 -echo "configure:5360: checking for --${enablestring:-enable}-logwin" >&5 +echo "configure:5400: checking for --${enablestring:-enable}-logwin" >&5 no_cache=0 # Check whether --enable-logwin or --disable-logwin was given. if test "${enable_logwin+set}" = set; then @@ -5396,7 +5436,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-logdialog""... $ac_c" 1>&6 -echo "configure:5400: checking for --${enablestring:-enable}-logdialog" >&5 +echo "configure:5440: checking for --${enablestring:-enable}-logdialog" >&5 no_cache=0 # Check whether --enable-logdialog or --disable-logdialog was given. if test "${enable_logdialog+set}" = set; then @@ -5437,7 +5477,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-postscript""... $ac_c" 1>&6 -echo "configure:5441: checking for --${enablestring:-enable}-postscript" >&5 +echo "configure:5481: checking for --${enablestring:-enable}-postscript" >&5 no_cache=0 # Check whether --enable-postscript or --disable-postscript was given. if test "${enable_postscript+set}" = set; then @@ -5480,7 +5520,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-prologio""... $ac_c" 1>&6 -echo "configure:5484: checking for --${enablestring:-enable}-prologio" >&5 +echo "configure:5524: checking for --${enablestring:-enable}-prologio" >&5 no_cache=0 # Check whether --enable-prologio or --disable-prologio was given. if test "${enable_prologio+set}" = set; then @@ -5520,7 +5560,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-resources""... $ac_c" 1>&6 -echo "configure:5524: checking for --${enablestring:-enable}-resources" >&5 +echo "configure:5564: checking for --${enablestring:-enable}-resources" >&5 no_cache=0 # Check whether --enable-resources or --disable-resources was given. if test "${enable_resources+set}" = set; then @@ -5561,7 +5601,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-xresources""... $ac_c" 1>&6 -echo "configure:5565: checking for --${enablestring:-enable}-xresources" >&5 +echo "configure:5605: checking for --${enablestring:-enable}-xresources" >&5 no_cache=0 # Check whether --enable-xresources or --disable-xresources was given. if test "${enable_xresources+set}" = set; then @@ -5603,7 +5643,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-clipboard""... $ac_c" 1>&6 -echo "configure:5607: checking for --${enablestring:-enable}-clipboard" >&5 +echo "configure:5647: checking for --${enablestring:-enable}-clipboard" >&5 no_cache=0 # Check whether --enable-clipboard or --disable-clipboard was given. if test "${enable_clipboard+set}" = set; then @@ -5643,7 +5683,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-dnd""... $ac_c" 1>&6 -echo "configure:5647: checking for --${enablestring:-enable}-dnd" >&5 +echo "configure:5687: checking for --${enablestring:-enable}-dnd" >&5 no_cache=0 # Check whether --enable-dnd or --disable-dnd was given. if test "${enable_dnd+set}" = set; then @@ -5683,7 +5723,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-metafile""... $ac_c" 1>&6 -echo "configure:5687: checking for --${enablestring:-enable}-metafile" >&5 +echo "configure:5727: checking for --${enablestring:-enable}-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -5724,7 +5764,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-treelayout""... $ac_c" 1>&6 -echo "configure:5728: checking for --${enablestring:-enable}-treelayout" >&5 +echo "configure:5768: checking for --${enablestring:-enable}-treelayout" >&5 no_cache=0 # Check whether --enable-treelayout or --disable-treelayout was given. if test "${enable_treelayout+set}" = set; then @@ -5766,7 +5806,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-controls""... $ac_c" 1>&6 -echo "configure:5770: checking for --${enablestring:-enable}-controls" >&5 +echo "configure:5810: checking for --${enablestring:-enable}-controls" >&5 no_cache=0 # Check whether --enable-controls or --disable-controls was given. if test "${enable_controls+set}" = set; then @@ -5887,7 +5927,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-accel""... $ac_c" 1>&6 -echo "configure:5891: checking for --${enablestring:-enable}-accel" >&5 +echo "configure:5931: checking for --${enablestring:-enable}-accel" >&5 no_cache=0 # Check whether --enable-accel or --disable-accel was given. if test "${enable_accel+set}" = set; then @@ -5927,7 +5967,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-button""... $ac_c" 1>&6 -echo "configure:5931: checking for --${enablestring:-enable}-button" >&5 +echo "configure:5971: checking for --${enablestring:-enable}-button" >&5 no_cache=0 # Check whether --enable-button or --disable-button was given. if test "${enable_button+set}" = set; then @@ -5967,7 +6007,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-bmpbutton""... $ac_c" 1>&6 -echo "configure:5971: checking for --${enablestring:-enable}-bmpbutton" >&5 +echo "configure:6011: checking for --${enablestring:-enable}-bmpbutton" >&5 no_cache=0 # Check whether --enable-bmpbutton or --disable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then @@ -6007,7 +6047,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-calendar""... $ac_c" 1>&6 -echo "configure:6011: checking for --${enablestring:-enable}-calendar" >&5 +echo "configure:6051: checking for --${enablestring:-enable}-calendar" >&5 no_cache=0 # Check whether --enable-calendar or --disable-calendar was given. if test "${enable_calendar+set}" = set; then @@ -6047,7 +6087,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-caret""... $ac_c" 1>&6 -echo "configure:6051: checking for --${enablestring:-enable}-caret" >&5 +echo "configure:6091: checking for --${enablestring:-enable}-caret" >&5 no_cache=0 # Check whether --enable-caret or --disable-caret was given. if test "${enable_caret+set}" = set; then @@ -6087,7 +6127,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-checkbox""... $ac_c" 1>&6 -echo "configure:6091: checking for --${enablestring:-enable}-checkbox" >&5 +echo "configure:6131: checking for --${enablestring:-enable}-checkbox" >&5 no_cache=0 # Check whether --enable-checkbox or --disable-checkbox was given. if test "${enable_checkbox+set}" = set; then @@ -6127,7 +6167,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-checklst""... $ac_c" 1>&6 -echo "configure:6131: checking for --${enablestring:-enable}-checklst" >&5 +echo "configure:6171: checking for --${enablestring:-enable}-checklst" >&5 no_cache=0 # Check whether --enable-checklst or --disable-checklst was given. if test "${enable_checklst+set}" = set; then @@ -6167,7 +6207,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-choice""... $ac_c" 1>&6 -echo "configure:6171: checking for --${enablestring:-enable}-choice" >&5 +echo "configure:6211: checking for --${enablestring:-enable}-choice" >&5 no_cache=0 # Check whether --enable-choice or --disable-choice was given. if test "${enable_choice+set}" = set; then @@ -6207,7 +6247,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-combobox""... $ac_c" 1>&6 -echo "configure:6211: checking for --${enablestring:-enable}-combobox" >&5 +echo "configure:6251: checking for --${enablestring:-enable}-combobox" >&5 no_cache=0 # Check whether --enable-combobox or --disable-combobox was given. if test "${enable_combobox+set}" = set; then @@ -6247,7 +6287,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-gauge""... $ac_c" 1>&6 -echo "configure:6251: checking for --${enablestring:-enable}-gauge" >&5 +echo "configure:6291: checking for --${enablestring:-enable}-gauge" >&5 no_cache=0 # Check whether --enable-gauge or --disable-gauge was given. if test "${enable_gauge+set}" = set; then @@ -6287,7 +6327,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-grid""... $ac_c" 1>&6 -echo "configure:6291: checking for --${enablestring:-enable}-grid" >&5 +echo "configure:6331: checking for --${enablestring:-enable}-grid" >&5 no_cache=0 # Check whether --enable-grid or --disable-grid was given. if test "${enable_grid+set}" = set; then @@ -6327,7 +6367,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-newgrid""... $ac_c" 1>&6 -echo "configure:6331: checking for --${enablestring:-enable}-newgrid" >&5 +echo "configure:6371: checking for --${enablestring:-enable}-newgrid" >&5 no_cache=0 # Check whether --enable-newgrid or --disable-newgrid was given. if test "${enable_newgrid+set}" = set; then @@ -6367,7 +6407,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-imaglist""... $ac_c" 1>&6 -echo "configure:6371: checking for --${enablestring:-enable}-imaglist" >&5 +echo "configure:6411: checking for --${enablestring:-enable}-imaglist" >&5 no_cache=0 # Check whether --enable-imaglist or --disable-imaglist was given. if test "${enable_imaglist+set}" = set; then @@ -6407,7 +6447,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-listbox""... $ac_c" 1>&6 -echo "configure:6411: checking for --${enablestring:-enable}-listbox" >&5 +echo "configure:6451: checking for --${enablestring:-enable}-listbox" >&5 no_cache=0 # Check whether --enable-listbox or --disable-listbox was given. if test "${enable_listbox+set}" = set; then @@ -6447,7 +6487,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-listctrl""... $ac_c" 1>&6 -echo "configure:6451: checking for --${enablestring:-enable}-listctrl" >&5 +echo "configure:6491: checking for --${enablestring:-enable}-listctrl" >&5 no_cache=0 # Check whether --enable-listctrl or --disable-listctrl was given. if test "${enable_listctrl+set}" = set; then @@ -6487,7 +6527,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-notebook""... $ac_c" 1>&6 -echo "configure:6491: checking for --${enablestring:-enable}-notebook" >&5 +echo "configure:6531: checking for --${enablestring:-enable}-notebook" >&5 no_cache=0 # Check whether --enable-notebook or --disable-notebook was given. if test "${enable_notebook+set}" = set; then @@ -6527,7 +6567,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-propsheet""... $ac_c" 1>&6 -echo "configure:6531: checking for --${enablestring:-enable}-propsheet" >&5 +echo "configure:6571: checking for --${enablestring:-enable}-propsheet" >&5 no_cache=0 # Check whether --enable-propsheet or --disable-propsheet was given. if test "${enable_propsheet+set}" = set; then @@ -6567,7 +6607,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-radiobox""... $ac_c" 1>&6 -echo "configure:6571: checking for --${enablestring:-enable}-radiobox" >&5 +echo "configure:6611: checking for --${enablestring:-enable}-radiobox" >&5 no_cache=0 # Check whether --enable-radiobox or --disable-radiobox was given. if test "${enable_radiobox+set}" = set; then @@ -6607,7 +6647,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-radiobtn""... $ac_c" 1>&6 -echo "configure:6611: checking for --${enablestring:-enable}-radiobtn" >&5 +echo "configure:6651: checking for --${enablestring:-enable}-radiobtn" >&5 no_cache=0 # Check whether --enable-radiobtn or --disable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then @@ -6647,7 +6687,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-sash""... $ac_c" 1>&6 -echo "configure:6651: checking for --${enablestring:-enable}-sash" >&5 +echo "configure:6691: checking for --${enablestring:-enable}-sash" >&5 no_cache=0 # Check whether --enable-sash or --disable-sash was given. if test "${enable_sash+set}" = set; then @@ -6687,7 +6727,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-scrollbar""... $ac_c" 1>&6 -echo "configure:6691: checking for --${enablestring:-enable}-scrollbar" >&5 +echo "configure:6731: checking for --${enablestring:-enable}-scrollbar" >&5 no_cache=0 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -6727,7 +6767,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-slider""... $ac_c" 1>&6 -echo "configure:6731: checking for --${enablestring:-enable}-slider" >&5 +echo "configure:6771: checking for --${enablestring:-enable}-slider" >&5 no_cache=0 # Check whether --enable-slider or --disable-slider was given. if test "${enable_slider+set}" = set; then @@ -6767,7 +6807,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-spinbtn""... $ac_c" 1>&6 -echo "configure:6771: checking for --${enablestring:-enable}-spinbtn" >&5 +echo "configure:6811: checking for --${enablestring:-enable}-spinbtn" >&5 no_cache=0 # Check whether --enable-spinbtn or --disable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then @@ -6807,7 +6847,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-spinctrl""... $ac_c" 1>&6 -echo "configure:6811: checking for --${enablestring:-enable}-spinctrl" >&5 +echo "configure:6851: checking for --${enablestring:-enable}-spinctrl" >&5 no_cache=0 # Check whether --enable-spinctrl or --disable-spinctrl was given. if test "${enable_spinctrl+set}" = set; then @@ -6847,7 +6887,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-splitter""... $ac_c" 1>&6 -echo "configure:6851: checking for --${enablestring:-enable}-splitter" >&5 +echo "configure:6891: checking for --${enablestring:-enable}-splitter" >&5 no_cache=0 # Check whether --enable-splitter or --disable-splitter was given. if test "${enable_splitter+set}" = set; then @@ -6887,7 +6927,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-statbmp""... $ac_c" 1>&6 -echo "configure:6891: checking for --${enablestring:-enable}-statbmp" >&5 +echo "configure:6931: checking for --${enablestring:-enable}-statbmp" >&5 no_cache=0 # Check whether --enable-statbmp or --disable-statbmp was given. if test "${enable_statbmp+set}" = set; then @@ -6927,7 +6967,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-statbox""... $ac_c" 1>&6 -echo "configure:6931: checking for --${enablestring:-enable}-statbox" >&5 +echo "configure:6971: checking for --${enablestring:-enable}-statbox" >&5 no_cache=0 # Check whether --enable-statbox or --disable-statbox was given. if test "${enable_statbox+set}" = set; then @@ -6967,7 +7007,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-statline""... $ac_c" 1>&6 -echo "configure:6971: checking for --${enablestring:-enable}-statline" >&5 +echo "configure:7011: checking for --${enablestring:-enable}-statline" >&5 no_cache=0 # Check whether --enable-statline or --disable-statline was given. if test "${enable_statline+set}" = set; then @@ -7007,7 +7047,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-stattext""... $ac_c" 1>&6 -echo "configure:7011: checking for --${enablestring:-enable}-stattext" >&5 +echo "configure:7051: checking for --${enablestring:-enable}-stattext" >&5 no_cache=0 # Check whether --enable-stattext or --disable-stattext was given. if test "${enable_stattext+set}" = set; then @@ -7047,7 +7087,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-statusbar""... $ac_c" 1>&6 -echo "configure:7051: checking for --${enablestring:-enable}-statusbar" >&5 +echo "configure:7091: checking for --${enablestring:-enable}-statusbar" >&5 no_cache=0 # Check whether --enable-statusbar or --disable-statusbar was given. if test "${enable_statusbar+set}" = set; then @@ -7087,7 +7127,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-tabdialog""... $ac_c" 1>&6 -echo "configure:7091: checking for --${enablestring:-enable}-tabdialog" >&5 +echo "configure:7131: checking for --${enablestring:-enable}-tabdialog" >&5 no_cache=0 # Check whether --enable-tabdialog or --disable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then @@ -7127,7 +7167,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-textctrl""... $ac_c" 1>&6 -echo "configure:7131: checking for --${enablestring:-enable}-textctrl" >&5 +echo "configure:7171: checking for --${enablestring:-enable}-textctrl" >&5 no_cache=0 # Check whether --enable-textctrl or --disable-textctrl was given. if test "${enable_textctrl+set}" = set; then @@ -7167,7 +7207,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-togglebtn""... $ac_c" 1>&6 -echo "configure:7171: checking for --${enablestring:-enable}-togglebtn" >&5 +echo "configure:7211: checking for --${enablestring:-enable}-togglebtn" >&5 no_cache=0 # Check whether --enable-togglebtn or --disable-togglebtn was given. if test "${enable_togglebtn+set}" = set; then @@ -7207,7 +7247,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-toolbar""... $ac_c" 1>&6 -echo "configure:7211: checking for --${enablestring:-enable}-toolbar" >&5 +echo "configure:7251: checking for --${enablestring:-enable}-toolbar" >&5 no_cache=0 # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then @@ -7247,7 +7287,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-tbarnative""... $ac_c" 1>&6 -echo "configure:7251: checking for --${enablestring:-enable}-tbarnative" >&5 +echo "configure:7291: checking for --${enablestring:-enable}-tbarnative" >&5 no_cache=0 # Check whether --enable-tbarnative or --disable-tbarnative was given. if test "${enable_tbarnative+set}" = set; then @@ -7287,7 +7327,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-tbarsmpl""... $ac_c" 1>&6 -echo "configure:7291: checking for --${enablestring:-enable}-tbarsmpl" >&5 +echo "configure:7331: checking for --${enablestring:-enable}-tbarsmpl" >&5 no_cache=0 # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given. if test "${enable_tbarsmpl+set}" = set; then @@ -7327,7 +7367,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-treectrl""... $ac_c" 1>&6 -echo "configure:7331: checking for --${enablestring:-enable}-treectrl" >&5 +echo "configure:7371: checking for --${enablestring:-enable}-treectrl" >&5 no_cache=0 # Check whether --enable-treectrl or --disable-treectrl was given. if test "${enable_treectrl+set}" = set; then @@ -7367,7 +7407,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-tipwindow""... $ac_c" 1>&6 -echo "configure:7371: checking for --${enablestring:-enable}-tipwindow" >&5 +echo "configure:7411: checking for --${enablestring:-enable}-tipwindow" >&5 no_cache=0 # Check whether --enable-tipwindow or --disable-tipwindow was given. if test "${enable_tipwindow+set}" = set; then @@ -7407,7 +7447,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-popupwin""... $ac_c" 1>&6 -echo "configure:7411: checking for --${enablestring:-enable}-popupwin" >&5 +echo "configure:7451: checking for --${enablestring:-enable}-popupwin" >&5 no_cache=0 # Check whether --enable-popupwin or --disable-popupwin was given. if test "${enable_popupwin+set}" = set; then @@ -7449,7 +7489,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-commondlg""... $ac_c" 1>&6 -echo "configure:7453: checking for --${enablestring:-enable}-commondlg" >&5 +echo "configure:7493: checking for --${enablestring:-enable}-commondlg" >&5 no_cache=0 # Check whether --enable-commondlg or --disable-commondlg was given. if test "${enable_commondlg+set}" = set; then @@ -7489,7 +7529,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-choicedlg""... $ac_c" 1>&6 -echo "configure:7493: checking for --${enablestring:-enable}-choicedlg" >&5 +echo "configure:7533: checking for --${enablestring:-enable}-choicedlg" >&5 no_cache=0 # Check whether --enable-choicedlg or --disable-choicedlg was given. if test "${enable_choicedlg+set}" = set; then @@ -7529,7 +7569,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-coldlg""... $ac_c" 1>&6 -echo "configure:7533: checking for --${enablestring:-enable}-coldlg" >&5 +echo "configure:7573: checking for --${enablestring:-enable}-coldlg" >&5 no_cache=0 # Check whether --enable-coldlg or --disable-coldlg was given. if test "${enable_coldlg+set}" = set; then @@ -7569,7 +7609,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-filedlg""... $ac_c" 1>&6 -echo "configure:7573: checking for --${enablestring:-enable}-filedlg" >&5 +echo "configure:7613: checking for --${enablestring:-enable}-filedlg" >&5 no_cache=0 # Check whether --enable-filedlg or --disable-filedlg was given. if test "${enable_filedlg+set}" = set; then @@ -7609,7 +7649,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-finddlg""... $ac_c" 1>&6 -echo "configure:7613: checking for --${enablestring:-enable}-finddlg" >&5 +echo "configure:7653: checking for --${enablestring:-enable}-finddlg" >&5 no_cache=0 # Check whether --enable-finddlg or --disable-finddlg was given. if test "${enable_finddlg+set}" = set; then @@ -7649,7 +7689,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-fontdlg""... $ac_c" 1>&6 -echo "configure:7653: checking for --${enablestring:-enable}-fontdlg" >&5 +echo "configure:7693: checking for --${enablestring:-enable}-fontdlg" >&5 no_cache=0 # Check whether --enable-fontdlg or --disable-fontdlg was given. if test "${enable_fontdlg+set}" = set; then @@ -7689,7 +7729,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-dirdlg""... $ac_c" 1>&6 -echo "configure:7693: checking for --${enablestring:-enable}-dirdlg" >&5 +echo "configure:7733: checking for --${enablestring:-enable}-dirdlg" >&5 no_cache=0 # Check whether --enable-dirdlg or --disable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then @@ -7729,7 +7769,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-msgdlg""... $ac_c" 1>&6 -echo "configure:7733: checking for --${enablestring:-enable}-msgdlg" >&5 +echo "configure:7773: checking for --${enablestring:-enable}-msgdlg" >&5 no_cache=0 # Check whether --enable-msgdlg or --disable-msgdlg was given. if test "${enable_msgdlg+set}" = set; then @@ -7769,7 +7809,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-numberdlg""... $ac_c" 1>&6 -echo "configure:7773: checking for --${enablestring:-enable}-numberdlg" >&5 +echo "configure:7813: checking for --${enablestring:-enable}-numberdlg" >&5 no_cache=0 # Check whether --enable-numberdlg or --disable-numberdlg was given. if test "${enable_numberdlg+set}" = set; then @@ -7809,7 +7849,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-splash""... $ac_c" 1>&6 -echo "configure:7813: checking for --${enablestring:-enable}-splash" >&5 +echo "configure:7853: checking for --${enablestring:-enable}-splash" >&5 no_cache=0 # Check whether --enable-splash or --disable-splash was given. if test "${enable_splash+set}" = set; then @@ -7849,7 +7889,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-textdlg""... $ac_c" 1>&6 -echo "configure:7853: checking for --${enablestring:-enable}-textdlg" >&5 +echo "configure:7893: checking for --${enablestring:-enable}-textdlg" >&5 no_cache=0 # Check whether --enable-textdlg or --disable-textdlg was given. if test "${enable_textdlg+set}" = set; then @@ -7889,7 +7929,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-tipdlg""... $ac_c" 1>&6 -echo "configure:7893: checking for --${enablestring:-enable}-tipdlg" >&5 +echo "configure:7933: checking for --${enablestring:-enable}-tipdlg" >&5 no_cache=0 # Check whether --enable-tipdlg or --disable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then @@ -7929,7 +7969,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-progressdlg""... $ac_c" 1>&6 -echo "configure:7933: checking for --${enablestring:-enable}-progressdlg" >&5 +echo "configure:7973: checking for --${enablestring:-enable}-progressdlg" >&5 no_cache=0 # Check whether --enable-progressdlg or --disable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then @@ -7969,7 +8009,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-wizarddlg""... $ac_c" 1>&6 -echo "configure:7973: checking for --${enablestring:-enable}-wizarddlg" >&5 +echo "configure:8013: checking for --${enablestring:-enable}-wizarddlg" >&5 no_cache=0 # Check whether --enable-wizarddlg or --disable-wizarddlg was given. if test "${enable_wizarddlg+set}" = set; then @@ -8011,7 +8051,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-menus""... $ac_c" 1>&6 -echo "configure:8015: checking for --${enablestring:-enable}-menus" >&5 +echo "configure:8055: checking for --${enablestring:-enable}-menus" >&5 no_cache=0 # Check whether --enable-menus or --disable-menus was given. if test "${enable_menus+set}" = set; then @@ -8051,7 +8091,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-miniframe""... $ac_c" 1>&6 -echo "configure:8055: checking for --${enablestring:-enable}-miniframe" >&5 +echo "configure:8095: checking for --${enablestring:-enable}-miniframe" >&5 no_cache=0 # Check whether --enable-miniframe or --disable-miniframe was given. if test "${enable_miniframe+set}" = set; then @@ -8091,7 +8131,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-tooltips""... $ac_c" 1>&6 -echo "configure:8095: checking for --${enablestring:-enable}-tooltips" >&5 +echo "configure:8135: checking for --${enablestring:-enable}-tooltips" >&5 no_cache=0 # Check whether --enable-tooltips or --disable-tooltips was given. if test "${enable_tooltips+set}" = set; then @@ -8131,7 +8171,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-splines""... $ac_c" 1>&6 -echo "configure:8135: checking for --${enablestring:-enable}-splines" >&5 +echo "configure:8175: checking for --${enablestring:-enable}-splines" >&5 no_cache=0 # Check whether --enable-splines or --disable-splines was given. if test "${enable_splines+set}" = set; then @@ -8171,7 +8211,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-validators""... $ac_c" 1>&6 -echo "configure:8175: checking for --${enablestring:-enable}-validators" >&5 +echo "configure:8215: checking for --${enablestring:-enable}-validators" >&5 no_cache=0 # Check whether --enable-validators or --disable-validators was given. if test "${enable_validators+set}" = set; then @@ -8211,7 +8251,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-busyinfo""... $ac_c" 1>&6 -echo "configure:8215: checking for --${enablestring:-enable}-busyinfo" >&5 +echo "configure:8255: checking for --${enablestring:-enable}-busyinfo" >&5 no_cache=0 # Check whether --enable-busyinfo or --disable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then @@ -8251,7 +8291,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-joystick""... $ac_c" 1>&6 -echo "configure:8255: checking for --${enablestring:-enable}-joystick" >&5 +echo "configure:8295: checking for --${enablestring:-enable}-joystick" >&5 no_cache=0 # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then @@ -8291,7 +8331,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-metafile""... $ac_c" 1>&6 -echo "configure:8295: checking for --${enablestring:-enable}-metafile" >&5 +echo "configure:8335: checking for --${enablestring:-enable}-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -8331,7 +8371,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-dragimage""... $ac_c" 1>&6 -echo "configure:8335: checking for --${enablestring:-enable}-dragimage" >&5 +echo "configure:8375: checking for --${enablestring:-enable}-dragimage" >&5 no_cache=0 # Check whether --enable-dragimage or --disable-dragimage was given. if test "${enable_dragimage+set}" = set; then @@ -8373,7 +8413,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-palette""... $ac_c" 1>&6 -echo "configure:8377: checking for --${enablestring:-enable}-palette" >&5 +echo "configure:8417: checking for --${enablestring:-enable}-palette" >&5 no_cache=0 # Check whether --enable-palette or --disable-palette was given. if test "${enable_palette+set}" = set; then @@ -8413,7 +8453,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-image""... $ac_c" 1>&6 -echo "configure:8417: checking for --${enablestring:-enable}-image" >&5 +echo "configure:8457: checking for --${enablestring:-enable}-image" >&5 no_cache=0 # Check whether --enable-image or --disable-image was given. if test "${enable_image+set}" = set; then @@ -8453,7 +8493,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-gif""... $ac_c" 1>&6 -echo "configure:8457: checking for --${enablestring:-enable}-gif" >&5 +echo "configure:8497: checking for --${enablestring:-enable}-gif" >&5 no_cache=0 # Check whether --enable-gif or --disable-gif was given. if test "${enable_gif+set}" = set; then @@ -8493,7 +8533,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-pcx""... $ac_c" 1>&6 -echo "configure:8497: checking for --${enablestring:-enable}-pcx" >&5 +echo "configure:8537: checking for --${enablestring:-enable}-pcx" >&5 no_cache=0 # Check whether --enable-pcx or --disable-pcx was given. if test "${enable_pcx+set}" = set; then @@ -8533,7 +8573,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-iff""... $ac_c" 1>&6 -echo "configure:8537: checking for --${enablestring:-enable}-iff" >&5 +echo "configure:8577: checking for --${enablestring:-enable}-iff" >&5 no_cache=0 # Check whether --enable-iff or --disable-iff was given. if test "${enable_iff+set}" = set; then @@ -8573,7 +8613,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-pnm""... $ac_c" 1>&6 -echo "configure:8577: checking for --${enablestring:-enable}-pnm" >&5 +echo "configure:8617: checking for --${enablestring:-enable}-pnm" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -8613,7 +8653,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-xpm""... $ac_c" 1>&6 -echo "configure:8617: checking for --${enablestring:-enable}-xpm" >&5 +echo "configure:8657: checking for --${enablestring:-enable}-xpm" >&5 no_cache=0 # Check whether --enable-xpm or --disable-xpm was given. if test "${enable_xpm+set}" = set; then @@ -8653,7 +8693,7 @@ fi enablestring= echo $ac_n "checking for --${enablestring:-enable}-ico_cur""... $ac_c" 1>&6 -echo "configure:8657: checking for --${enablestring:-enable}-ico_cur" >&5 +echo "configure:8697: checking for --${enablestring:-enable}-ico_cur" >&5 no_cache=0 # Check whether --enable-ico_cur or --disable-ico_cur was given. if test "${enable_ico_cur+set}" = set; then @@ -8712,7 +8752,14 @@ esac echo $ac_n "checking for toolkit""... $ac_c" 1>&6 -echo "configure:8716: checking for toolkit" >&5 +echo "configure:8756: checking for toolkit" >&5 + +# In Wine, we need to default to MSW, not GTK or MOTIF +if test "$wxUSE_WINE" = "yes"; then + DEFAULT_DEFAULT_wxUSE_GTK=0 + DEFAULT_DEFAULT_wxUSE_MOTIF=0 + DEFAULT_DEFAULT_wxUSE_MSW=1 +fi if test "$wxUSE_GUI" = "yes"; then @@ -8738,7 +8785,7 @@ if test "$wxUSE_GUI" = "yes"; then fi NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} \ - + ${wxUSE_WINE:-0} + ${wxUSE_MSW:-0} + ${wxUSE_MGL:-0} + ${wxUSE_MICROWIN:-0} + ${wxUSE_X11:-0}` + + ${wxUSE_MSW:-0} + ${wxUSE_MGL:-0} + ${wxUSE_MICROWIN:-0} + ${wxUSE_X11:-0}` case "${host}" in *-pc-os2_emx | *-pc-os2-emx ) @@ -8789,6 +8836,13 @@ case "${host}" in ;; esac +if test "$wxUSE_WINE" = "yes"; then + wants_win32=1 + CC=winegcc + CXX=wineg++ + RESCOMP=wrc +fi + if test "$wants_win32" = 1 ; then USE_UNIX=0 USE_WIN32=1 @@ -8899,7 +8953,7 @@ CFLAGS=${CFLAGS:=} # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8903: checking for $ac_word" >&5 +echo "configure:8957: 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 @@ -8929,7 +8983,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:8933: checking for $ac_word" >&5 +echo "configure:8987: 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 @@ -8980,7 +9034,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:8984: checking for $ac_word" >&5 +echo "configure:9038: 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 @@ -9012,7 +9066,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:9016: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:9070: 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. @@ -9023,12 +9077,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 9027 "configure" +#line 9081 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:9032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9086: \"$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 @@ -9054,12 +9108,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:9058: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:9112: 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:9063: checking whether we are using GNU C" >&5 +echo "configure:9117: 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 @@ -9068,7 +9122,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:9072: \"$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:9126: \"$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 @@ -9087,7 +9141,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:9091: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:9145: 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 @@ -9120,7 +9174,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:9124: checking how to run the C preprocessor" >&5 +echo "configure:9178: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -9135,13 +9189,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:9145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9199: \"$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 : @@ -9152,13 +9206,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:9162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9216: \"$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 : @@ -9169,13 +9223,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:9179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9233: \"$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 : @@ -9201,13 +9255,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:9205: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:9259: 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 @@ -9225,7 +9279,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -9262,7 +9316,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:9266: checking for $ac_word" >&5 +echo "configure:9320: 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 @@ -9294,7 +9348,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:9298: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:9352: 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. @@ -9305,12 +9359,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 9309 "configure" +#line 9363 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:9314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9368: \"$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 @@ -9336,12 +9390,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:9340: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:9394: 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:9345: checking whether we are using GNU C++" >&5 +echo "configure:9399: 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 @@ -9350,7 +9404,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:9354: \"$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:9408: \"$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 @@ -9369,7 +9423,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:9373: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:9427: 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 @@ -9412,7 +9466,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:9416: checking for $ac_word" >&5 +echo "configure:9470: 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 @@ -9443,7 +9497,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:9447: checking for $ac_word" >&5 +echo "configure:9501: 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 @@ -9483,7 +9537,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:9487: checking for a BSD compatible install" >&5 +echo "configure:9541: 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 @@ -9557,7 +9611,7 @@ esac # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9561: checking for $ac_word" >&5 +echo "configure:9615: 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 @@ -9586,7 +9640,7 @@ fi echo $ac_n "checking if make is GNU make""... $ac_c" 1>&6 -echo "configure:9590: checking if make is GNU make" >&5 +echo "configure:9644: checking if make is GNU make" >&5 if eval "test \"`echo '$''{'wx_cv_prog_makeisgnu'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9612,7 +9666,7 @@ fi if test "x$wx_cv_prog_makeisgnu" != "xyes"; then echo $ac_n "checking if make supports VPATH""... $ac_c" 1>&6 -echo "configure:9616: checking if make supports VPATH" >&5 +echo "configure:9670: checking if make supports VPATH" >&5 if eval "test \"`echo '$''{'wx_cv_prog_makevpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9659,7 +9713,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:9663: checking for $ac_word" >&5 +echo "configure:9717: 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 @@ -9693,7 +9747,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:9697: checking for $ac_word" >&5 +echo "configure:9751: 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 @@ -9727,7 +9781,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:9731: checking for yywrap in -l$ac_lib" >&5 +echo "configure:9785: 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 @@ -9735,7 +9789,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:9804: \"$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 @@ -9770,7 +9824,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:9774: checking whether ln -s works" >&5 +echo "configure:9828: 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 @@ -9796,7 +9850,7 @@ case "${host}" in LIBS="$LIBS -lstdcpp" if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then echo $ac_n "checking for drand48 in -lcExt""... $ac_c" 1>&6 -echo "configure:9800: checking for drand48 in -lcExt" >&5 +echo "configure:9854: checking for drand48 in -lcExt" >&5 ac_lib_var=`echo cExt'_'drand48 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9804,7 +9858,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcExt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9873: \"$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 @@ -9847,17 +9901,17 @@ if test "$wxUSE_MAC" != 1; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9851: checking for $ac_hdr" >&5 +echo "configure:9905: 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:9861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9915: \"$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* @@ -9889,17 +9943,17 @@ for ac_hdr in stdlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9893: checking for $ac_hdr" >&5 +echo "configure:9947: 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:9903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9957: \"$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* @@ -9929,17 +9983,17 @@ for ac_hdr in malloc.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9933: checking for $ac_hdr" >&5 +echo "configure:9987: 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:9943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9997: \"$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* @@ -9969,17 +10023,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:9973: checking for $ac_hdr" >&5 +echo "configure:10027: 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:9983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10037: \"$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* @@ -10009,17 +10063,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:10013: checking for $ac_hdr" >&5 +echo "configure:10067: 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:10023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10077: \"$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* @@ -10051,17 +10105,17 @@ if test "$ac_cv_header_wchar_h" != "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10055: checking for $ac_hdr" >&5 +echo "configure:10109: 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:10065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10119: \"$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* @@ -10093,17 +10147,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:10097: checking for $ac_hdr" >&5 +echo "configure:10151: 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:10107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10161: \"$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* @@ -10134,12 +10188,12 @@ if test "x$ac_cv_header_fnmatch_h" = "xyes"; then for ac_func in fnmatch do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10138: checking for $ac_func" >&5 +echo "configure:10192: 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:10220: \"$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 @@ -10192,17 +10246,17 @@ for ac_hdr in langinfo.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10196: checking for $ac_hdr" >&5 +echo "configure:10250: 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:10206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10260: \"$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* @@ -10235,17 +10289,17 @@ if test "$wxUSE_GUI" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10239: checking for $ac_hdr" >&5 +echo "configure:10293: 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:10249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10303: \"$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* @@ -10276,12 +10330,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:10280: checking for working const" >&5 +echo "configure:10334: 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:10388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -10351,21 +10405,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:10355: checking for inline" >&5 +echo "configure:10409: 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:10423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -10392,7 +10446,7 @@ esac echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:10396: checking size of char" >&5 +echo "configure:10450: 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 @@ -10400,7 +10454,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < main() @@ -10411,7 +10465,7 @@ main() exit(0); } EOF -if { (eval echo configure:10415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10469: \"$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 @@ -10431,7 +10485,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:10435: checking size of short" >&5 +echo "configure:10489: 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 @@ -10439,7 +10493,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < main() @@ -10450,7 +10504,7 @@ main() exit(0); } EOF -if { (eval echo configure:10454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10508: \"$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 @@ -10470,7 +10524,7 @@ EOF echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:10474: checking size of void *" >&5 +echo "configure:10528: checking size of void *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10478,7 +10532,7 @@ else ac_cv_sizeof_void_p=4 else cat > conftest.$ac_ext < main() @@ -10489,7 +10543,7 @@ main() exit(0); } EOF -if { (eval echo configure:10493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_void_p=`cat conftestval` else @@ -10509,7 +10563,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:10513: checking size of int" >&5 +echo "configure:10567: 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 @@ -10517,7 +10571,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -10528,7 +10582,7 @@ main() exit(0); } EOF -if { (eval echo configure:10532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10586: \"$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 @@ -10548,7 +10602,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:10552: checking size of long" >&5 +echo "configure:10606: 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 @@ -10556,7 +10610,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -10567,7 +10621,7 @@ main() exit(0); } EOF -if { (eval echo configure:10571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10625: \"$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 @@ -10590,7 +10644,7 @@ EOF case "${host}" in arm-*-linux* ) echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:10594: checking size of long long" >&5 +echo "configure:10648: 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 @@ -10598,7 +10652,7 @@ else ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < main() @@ -10609,7 +10663,7 @@ main() exit(0); } EOF -if { (eval echo configure:10613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10667: \"$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 @@ -10631,7 +10685,7 @@ EOF ;; *-hp-hpux* ) echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:10635: checking size of long long" >&5 +echo "configure:10689: 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 @@ -10639,7 +10693,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -10650,7 +10704,7 @@ main() exit(0); } EOF -if { (eval echo configure:10654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10708: \"$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 @@ -10675,7 +10729,7 @@ EOF ;; * ) echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:10679: checking size of long long" >&5 +echo "configure:10733: 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 @@ -10683,7 +10737,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -10694,7 +10748,7 @@ main() exit(0); } EOF -if { (eval echo configure:10698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10752: \"$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 @@ -10716,7 +10770,7 @@ EOF esac echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6 -echo "configure:10720: checking size of wchar_t" >&5 +echo "configure:10774: checking size of wchar_t" >&5 if eval "test \"`echo '$''{'wx_cv_sizeof_wchar_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10735,7 +10789,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:10819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wx_cv_sizeof_wchar_t=`cat conftestval` else @@ -10793,13 +10847,13 @@ if test "$enable_largefile" != no; then wx_largefile=no echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6 -echo "configure:10797: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +echo "configure:10851: checking for _FILE_OFFSET_BITS value needed for large files" >&5 if eval "test \"`echo '$''{'ac_cv_sys_file_offset_bits'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -10810,7 +10864,7 @@ typedef struct { ; return 0; } EOF -if { (eval echo configure:10814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sys_file_offset_bits=64 else @@ -10837,13 +10891,13 @@ EOF if test "x$wx_largefile" != "xyes"; then echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6 -echo "configure:10841: checking for _LARGE_FILES value needed for large files" >&5 +echo "configure:10895: checking for _LARGE_FILES value needed for large files" >&5 if eval "test \"`echo '$''{'ac_cv_sys_large_files'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -10854,7 +10908,7 @@ typedef struct { ; return 0; } EOF -if { (eval echo configure:10858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sys_large_files=1 else @@ -10881,7 +10935,7 @@ EOF fi echo $ac_n "checking if large file support is available""... $ac_c" 1>&6 -echo "configure:10885: checking if large file support is available" >&5 +echo "configure:10939: checking if large file support is available" >&5 if test "x$wx_largefile" = "xyes"; then cat >> confdefs.h <<\EOF #define HAVE_LARGEFILE_SUPPORT 1 @@ -10902,14 +10956,14 @@ if test "x$wx_largefile" = "xyes"; then fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:10906: checking whether byte ordering is bigendian" >&5 +echo "configure:10960: 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 @@ -10920,11 +10974,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:10924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10978: \"$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 @@ -10935,7 +10989,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:10939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -10955,7 +11009,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:11026: \"$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 @@ -10996,7 +11050,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:11000: checking how to run the C++ preprocessor" >&5 +echo "configure:11054: 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 @@ -11009,12 +11063,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:11018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11072: \"$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 : @@ -11058,17 +11112,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:11062: checking for $ac_hdr" >&5 +echo "configure:11116: 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:11072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11126: \"$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* @@ -11116,7 +11170,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:11120: checking if C++ compiler supports bool" >&5 +echo "configure:11174: 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 @@ -11131,7 +11185,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_cpp_bool=yes @@ -11181,7 +11235,7 @@ EOF echo $ac_n "checking if C++ compiler supports the explicit keyword""... $ac_c" 1>&6 -echo "configure:11185: checking if C++ compiler supports the explicit keyword" >&5 +echo "configure:11239: checking if C++ compiler supports the explicit keyword" >&5 if eval "test \"`echo '$''{'wx_cv_explicit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11196,7 +11250,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_explicit=no else @@ -11384,13 +11438,13 @@ rm -f confcache if test "$USE_LINUX" = 1; then echo $ac_n "checking for glibc 2.1 or later""... $ac_c" 1>&6 -echo "configure:11388: checking for glibc 2.1 or later" >&5 +echo "configure:11442: checking for glibc 2.1 or later" >&5 if eval "test \"`echo '$''{'wx_cv_lib_glibc21'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -11401,7 +11455,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_lib_glibc21=yes @@ -11449,17 +11503,17 @@ EOF if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for regex.h""... $ac_c" 1>&6 -echo "configure:11453: checking for regex.h" >&5 +echo "configure:11507: checking for regex.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11517: \"$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* @@ -11478,12 +11532,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then for ac_func in regcomp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11482: checking for $ac_func" >&5 +echo "configure:11536: 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:11564: \"$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 @@ -11566,48 +11620,16 @@ EOF system_zlib_h_ok="yes" else echo $ac_n "checking for zlib.h >= 1.1.4""... $ac_c" 1>&6 -echo "configure:11570: checking for zlib.h >= 1.1.4" >&5 +echo "configure:11624: checking for zlib.h >= 1.1.4" >&5 if eval "test \"`echo '$''{'ac_cv_header_zlib_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then - ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 -echo "configure:11577: 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:11587: \"$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 - : -else - echo "$ac_t""no" 1>&6 -fi - + unset ac_cv_header_zlib_h else cat > conftest.$ac_ext < @@ -11628,7 +11650,7 @@ else EOF -if { (eval echo configure:11632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_header_zlib_h=`cat conftestval` else @@ -11644,13 +11666,46 @@ fi fi echo "$ac_t""$ac_cv_header_zlib_h" 1>&6 + ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 +echo "configure:11672: 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:11682: \"$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 + : +else + echo "$ac_t""no" 1>&6 +fi + system_zlib_h_ok=$ac_cv_header_zlib_h fi if test "$system_zlib_h_ok" = "yes"; then echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:11654: checking for deflate in -lz" >&5 +echo "configure:11709: 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 @@ -11658,7 +11713,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:11728: \"$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 @@ -11730,48 +11785,16 @@ EOF if test "$wxUSE_MGL" != 1 ; then if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then echo $ac_n "checking for png.h > 0.90""... $ac_c" 1>&6 -echo "configure:11734: checking for png.h > 0.90" >&5 +echo "configure:11789: checking for png.h > 0.90" >&5 if eval "test \"`echo '$''{'ac_cv_header_png_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then - ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:11741: 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:11751: \"$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 - : -else - echo "$ac_t""no" 1>&6 -fi - + unset ac_cv_header_png_h else cat > conftest.$ac_ext < @@ -11787,7 +11810,7 @@ else } EOF -if { (eval echo configure:11791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_header_png_h=`cat conftestval` else @@ -11803,10 +11826,43 @@ fi fi echo "$ac_t""$ac_cv_header_png_h" 1>&6 + ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for png.h""... $ac_c" 1>&6 +echo "configure:11832: 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:11842: \"$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 + : +else + echo "$ac_t""no" 1>&6 +fi + if test "$ac_cv_header_png_h" = "yes"; then echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6 -echo "configure:11810: checking for png_check_sig in -lpng" >&5 +echo "configure:11866: 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 @@ -11814,7 +11870,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:11885: \"$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 @@ -11849,9 +11905,9 @@ fi if test "x$PNG_LINK" = "x" ; then if test "$wxUSE_LIBPNG" = "sys" ; then - { echo "configure: error: system png library not found! Use --with-libpng=builtin to use built-in version" 1>&2; exit 1; } + { echo "configure: error: system png library not found or too old! Use --with-libpng=builtin to use built-in version" 1>&2; exit 1; } else - echo "configure: warning: png library not found or too old, will use built-in instead" 1>&2 + echo "configure: warning: system png library not found or too old, will use built-in instead" 1>&2 wxUSE_LIBPNG=builtin fi else @@ -11884,12 +11940,12 @@ EOF if test "$wxUSE_MGL" != 1 ; then if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:11888: checking for jpeglib.h" >&5 +echo "configure:11944: checking for jpeglib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_jpeglib_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_jpeglib_h=yes else @@ -11919,7 +11975,7 @@ fi if test "$ac_cv_header_jpeglib_h" = "yes"; then echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:11923: checking for jpeg_read_header in -ljpeg" >&5 +echo "configure:11979: 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 @@ -11927,7 +11983,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:11998: \"$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 @@ -11997,17 +12053,17 @@ EOF fi ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:12001: checking for tiffio.h" >&5 +echo "configure:12057: 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:12011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12067: \"$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* @@ -12024,7 +12080,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6 -echo "configure:12028: checking for TIFFError in -ltiff" >&5 +echo "configure:12084: 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 @@ -12032,7 +12088,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12103: \"$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 @@ -12099,17 +12155,17 @@ if test "$USE_WIN32" = 1 ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12103: checking for $ac_hdr" >&5 +echo "configure:12159: 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:12113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12169: \"$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* @@ -12137,17 +12193,17 @@ done ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for windows.h""... $ac_c" 1>&6 -echo "configure:12141: checking for windows.h" >&5 +echo "configure:12197: checking for windows.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12207: \"$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* @@ -12173,13 +12229,13 @@ fi echo $ac_n "checking if w32api has good enough MSIE support""... $ac_c" 1>&6 -echo "configure:12177: checking if w32api has good enough MSIE support" >&5 +echo "configure:12233: checking if w32api has good enough MSIE support" >&5 if eval "test \"`echo '$''{'wx_cv_w32api_win32_ie'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -12195,7 +12251,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_w32api_win32_ie=yes @@ -12256,15 +12312,12 @@ if test "$wxUSE_GUI" = "yes"; then TOOLKIT=MSW GUIDIST=MSW_DIST - case "${host}" in - *-*-mingw32* ) - LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows" - esac + LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows" fi if test "$wxUSE_GTK" = 1; then echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6 -echo "configure:12268: checking for GTK+ version" >&5 +echo "configure:12321: checking for GTK+ version" >&5 gtk_version_cached=1 if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then @@ -12305,7 +12358,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12309: checking for $ac_word" >&5 +echo "configure:12362: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12353,7 +12406,7 @@ fi min_gtk_version=2.0.0 echo $ac_n "checking for GTK+ - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:12357: checking for GTK+ - version >= $min_gtk_version" >&5 +echo "configure:12410: checking for GTK+ - version >= $min_gtk_version" >&5 if test x$PKG_CONFIG != xno ; then ## don't try to run the test against uninstalled libtool libs @@ -12388,7 +12441,7 @@ echo "configure:12357: checking for GTK+ - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -12463,7 +12516,7 @@ main () } EOF -if { (eval echo configure:12467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -12497,7 +12550,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -12507,7 +12560,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:12511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK+ or finding the wrong" @@ -12589,7 +12642,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12593: checking for $ac_word" >&5 +echo "configure:12646: 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 @@ -12624,7 +12677,7 @@ fi min_gtk_version=1.2.7 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:12628: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:12681: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -12647,7 +12700,7 @@ echo "configure:12628: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -12725,7 +12778,7 @@ main () } EOF -if { (eval echo configure:12729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -12759,7 +12812,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -12769,7 +12822,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:12773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -12859,7 +12912,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12863: checking for $ac_word" >&5 +echo "configure:12916: 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 @@ -12894,7 +12947,7 @@ fi min_gtk_version=1.2.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:12898: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:12951: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -12917,7 +12970,7 @@ echo "configure:12898: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -12995,7 +13048,7 @@ main () } EOF -if { (eval echo configure:12999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -13029,7 +13082,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -13039,7 +13092,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:13043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -13122,7 +13175,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13126: checking for $ac_word" >&5 +echo "configure:13179: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13166,19 +13219,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for pangoft2""... $ac_c" 1>&6 -echo "configure:13170: checking for pangoft2" >&5 +echo "configure:13223: checking for pangoft2" >&5 if $PKG_CONFIG --exists "pangoft2" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking PANGOFT2_CFLAGS""... $ac_c" 1>&6 -echo "configure:13177: checking PANGOFT2_CFLAGS" >&5 +echo "configure:13230: checking PANGOFT2_CFLAGS" >&5 PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"` echo "$ac_t""$PANGOFT2_CFLAGS" 1>&6 echo $ac_n "checking PANGOFT2_LIBS""... $ac_c" 1>&6 -echo "configure:13182: checking PANGOFT2_LIBS" >&5 +echo "configure:13235: checking PANGOFT2_LIBS" >&5 PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"` echo "$ac_t""$PANGOFT2_LIBS" 1>&6 else @@ -13223,12 +13276,12 @@ echo "configure:13182: checking PANGOFT2_LIBS" >&5 for ac_func in poll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13227: checking for $ac_func" >&5 +echo "configure:13280: 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:13308: \"$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 @@ -13285,7 +13338,7 @@ done GUIDIST=GTK_DIST echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 -echo "configure:13289: checking for gdk_im_open in -lgdk" >&5 +echo "configure:13342: 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 @@ -13293,7 +13346,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:13361: \"$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 @@ -13330,8 +13383,8 @@ fi fi if test "$wxUSE_MGL" = 1; then - echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6 -echo "configure:13335: checking for SciTech MGL library" >&5 + echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6 +echo "configure:13388: checking for SciTech MGL library" >&5 if test "x$MGL_ROOT" = x ; then echo "$ac_t""not found" 1>&6 { echo "configure: error: Cannot find MGL library. Make sure MGL_ROOT is set." 1>&2; exit 1; } @@ -13339,34 +13392,51 @@ echo "configure:13335: checking for SciTech MGL library" >&5 echo "$ac_t""$MGL_ROOT" 1>&6 fi + echo $ac_n "checking for libmgl location""... $ac_c" 1>&6 +echo "configure:13397: checking for libmgl location" >&5 case "${host}" in *-*-linux* ) - mgl_os="linux/gcc/glibc*" + if test "x$wxUSE_SHARED" = xyes ; then + mgl_os_candidates="linux/gcc/glibc.so linux/gcc/glibc" + else + mgl_os_candidates="linux/gcc/glibc linux/gcc/glibc.so" + fi ;; *-pc-msdosdjgpp ) - mgl_os=dos32/dj2 + mgl_os_candidates="dos32/dj2" ;; *) { echo "configure: error: This system type ${host} is not yet supported by wxMGL." 1>&2; exit 1; } esac mgl_lib_type="" - - if test "$wxUSE_DEBUG_FLAG" = yes ; then - if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a -o \ - -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.so; then - mgl_lib_type=debug - fi - fi - if test "x$mgl_lib_type" = x ; then - if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a -o \ - -f $MGL_ROOT/lib/release/$mgl_os/libmgl.so; then - mgl_lib_type=release - else - { echo "configure: error: Cannot find MGL libraries, make sure they are compiled." 1>&2; exit 1; } + mgl_os="" + + for mgl_os_i in $mgl_os_candidates ; do + if test "x$mgl_os" = x ; then + if test "$wxUSE_DEBUG_FLAG" = yes ; then + if test -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.a -o \ + -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.so; then + mgl_lib_type=debug + mgl_os=$mgl_os_i + fi + fi + if test "x$mgl_lib_type" = x ; then + if test -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.a -o \ + -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.so; then + mgl_lib_type=release + mgl_os=$mgl_os_i + fi + fi fi - fi + done + if test "x$mgl_os" = x ; then + echo "$ac_t""not found" 1>&6 + { echo "configure: error: Cannot find MGL libraries, make sure they are compiled." 1>&2; exit 1; } + fi + echo "$ac_t"""$MGL_ROOT/lib/$mgl_lib_type/$mgl_os"" 1>&6 + wxUSE_UNIVERSAL="yes" TOOLKIT_INCLUDE="-I$MGL_ROOT/include" @@ -13379,7 +13449,7 @@ echo "configure:13335: checking for SciTech MGL library" >&5 if test "$wxUSE_MICROWIN" = 1; then echo $ac_n "checking for MicroWindows""... $ac_c" 1>&6 -echo "configure:13383: checking for MicroWindows" >&5 +echo "configure:13453: checking for MicroWindows" >&5 if test "x$MICROWINDOWS" = x ; then echo "$ac_t""not found" 1>&6 { echo "configure: error: Cannot find MicroWindows library. Make sure MICROWINDOWS is set." 1>&2; exit 1; } @@ -13411,7 +13481,7 @@ echo "configure:13383: checking for MicroWindows" >&5 # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:13415: checking for X" >&5 +echo "configure:13485: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -13473,12 +13543,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:13482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13552: \"$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* @@ -13547,14 +13617,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:13628: \"$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. @@ -13660,17 +13730,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:13664: checking whether -R must be followed by a space" >&5 +echo "configure:13734: 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:13744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -13686,14 +13756,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:13767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -13725,7 +13795,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:13729: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:13799: 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 @@ -13733,7 +13803,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:13818: \"$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 @@ -13766,7 +13836,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:13770: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:13840: 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 @@ -13774,7 +13844,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:13859: \"$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 @@ -13814,12 +13884,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:13818: checking for gethostbyname" >&5 +echo "configure:13888: 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:13916: \"$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 @@ -13863,7 +13933,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:13867: checking for gethostbyname in -lnsl" >&5 +echo "configure:13937: 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 @@ -13871,7 +13941,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:13956: \"$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 @@ -13912,12 +13982,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:13916: checking for connect" >&5 +echo "configure:13986: 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:14014: \"$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 @@ -13961,7 +14031,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:13965: checking for connect in -lsocket" >&5 +echo "configure:14035: 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 @@ -13969,7 +14039,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:14054: \"$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 @@ -14004,12 +14074,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:14008: checking for remove" >&5 +echo "configure:14078: 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:14106: \"$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 @@ -14053,7 +14123,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:14057: checking for remove in -lposix" >&5 +echo "configure:14127: 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 @@ -14061,7 +14131,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:14146: \"$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 @@ -14096,12 +14166,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:14100: checking for shmat" >&5 +echo "configure:14170: 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:14198: \"$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 @@ -14145,7 +14215,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:14149: checking for shmat in -lipc" >&5 +echo "configure:14219: 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 @@ -14153,7 +14223,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:14238: \"$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 @@ -14197,7 +14267,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:14201: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:14271: 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 @@ -14205,7 +14275,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:14290: \"$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 @@ -14252,7 +14322,7 @@ fi if test "$wxUSE_NANOX" = "yes"; then echo $ac_n "checking for MicroWindows/NanoX distribution""... $ac_c" 1>&6 -echo "configure:14256: checking for MicroWindows/NanoX distribution" >&5 +echo "configure:14326: checking for MicroWindows/NanoX distribution" >&5 if test "x$MICROWIN" = x ; then echo "$ac_t""not found" 1>&6 { echo "configure: error: Cannot find MicroWindows library. Make sure MICROWIN is set." 1>&2; exit 1; } @@ -14267,7 +14337,7 @@ EOF xpm_link= echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:14271: checking for Xpm library" >&5 +echo "configure:14341: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB /usr/lib; @@ -14299,7 +14369,7 @@ EOF echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -14311,7 +14381,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* xpm_link=" -lXpm" @@ -14343,7 +14413,7 @@ rm -f conftest* # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14347: checking for $ac_word" >&5 +echo "configure:14417: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14387,19 +14457,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for pangox""... $ac_c" 1>&6 -echo "configure:14391: checking for pangox" >&5 +echo "configure:14461: checking for pangox" >&5 if $PKG_CONFIG --exists "pangox" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking PANGOX_CFLAGS""... $ac_c" 1>&6 -echo "configure:14398: checking PANGOX_CFLAGS" >&5 +echo "configure:14468: checking PANGOX_CFLAGS" >&5 PANGOX_CFLAGS=`$PKG_CONFIG --cflags "pangox"` echo "$ac_t""$PANGOX_CFLAGS" 1>&6 echo $ac_n "checking PANGOX_LIBS""... $ac_c" 1>&6 -echo "configure:14403: checking PANGOX_LIBS" >&5 +echo "configure:14473: checking PANGOX_LIBS" >&5 PANGOX_LIBS=`$PKG_CONFIG --libs "pangox"` echo "$ac_t""$PANGOX_LIBS" 1>&6 else @@ -14438,7 +14508,7 @@ echo "configure:14403: checking PANGOX_LIBS" >&5 # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14442: checking for $ac_word" >&5 +echo "configure:14512: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14482,19 +14552,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for pangoft2""... $ac_c" 1>&6 -echo "configure:14486: checking for pangoft2" >&5 +echo "configure:14556: checking for pangoft2" >&5 if $PKG_CONFIG --exists "pangoft2" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking PANGOFT2_CFLAGS""... $ac_c" 1>&6 -echo "configure:14493: checking PANGOFT2_CFLAGS" >&5 +echo "configure:14563: checking PANGOFT2_CFLAGS" >&5 PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"` echo "$ac_t""$PANGOFT2_CFLAGS" 1>&6 echo $ac_n "checking PANGOFT2_LIBS""... $ac_c" 1>&6 -echo "configure:14498: checking PANGOFT2_LIBS" >&5 +echo "configure:14568: checking PANGOFT2_LIBS" >&5 PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"` echo "$ac_t""$PANGOFT2_LIBS" 1>&6 else @@ -14534,7 +14604,7 @@ echo "configure:14498: checking PANGOFT2_LIBS" >&5 # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14538: checking for $ac_word" >&5 +echo "configure:14608: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14578,19 +14648,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for pangoxft""... $ac_c" 1>&6 -echo "configure:14582: checking for pangoxft" >&5 +echo "configure:14652: checking for pangoxft" >&5 if $PKG_CONFIG --exists "pangoxft" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking PANGOXFT_CFLAGS""... $ac_c" 1>&6 -echo "configure:14589: checking PANGOXFT_CFLAGS" >&5 +echo "configure:14659: checking PANGOXFT_CFLAGS" >&5 PANGOXFT_CFLAGS=`$PKG_CONFIG --cflags "pangoxft"` echo "$ac_t""$PANGOXFT_CFLAGS" 1>&6 echo $ac_n "checking PANGOXFT_LIBS""... $ac_c" 1>&6 -echo "configure:14594: checking PANGOXFT_LIBS" >&5 +echo "configure:14664: checking PANGOXFT_LIBS" >&5 PANGOXFT_LIBS=`$PKG_CONFIG --libs "pangoxft"` echo "$ac_t""$PANGOXFT_LIBS" 1>&6 else @@ -14639,103 +14709,6 @@ echo "configure:14594: checking PANGOXFT_LIBS" >&5 GUIDIST=X11_DIST fi - if test "$wxUSE_WINE" = 1; then - ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for windows.h""... $ac_c" 1>&6 -echo "configure:14646: checking for windows.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14656: \"$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 - : -else - echo "$ac_t""no" 1>&6 - - { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; } - -fi - - - xpm_link= - echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:14683: checking for Xpm library" >&5 - -ac_find_libraries= -for ac_dir in $SEARCH_LIB /usr/lib; - do - for ac_extension in a so sl dylib; do - if test -f "$ac_dir/libXpm.$ac_extension"; then - ac_find_libraries=$ac_dir - break 2 - fi - done - done - - if test "$ac_find_libraries" != "" ; then - GUI_TK_LIBRARY="-L$ac_find_libraries" - xpm_link=" -lXpm" - cat >> confdefs.h <<\EOF -#define wxHAVE_LIB_XPM 1 -EOF - - echo "$ac_t""found at $ac_find_libraries" 1>&6 - else - echo "$ac_t""no" 1>&6 - echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2 - fi - - mesa_link= - echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 -echo "configure:14711: checking for Mesa library" >&5 - -ac_find_libraries= -for ac_dir in $SEARCH_LIB /usr/lib; - do - for ac_extension in a so sl dylib; do - if test -f "$ac_dir/libMesaGL.$ac_extension"; then - ac_find_libraries=$ac_dir - break 2 - fi - done - done - - if test "$ac_find_libraries" != "" ; then - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries" - mesa_link=" -lMesaGL" - echo "$ac_t""found at $ac_find_libraries" 1>&6 - else - mesa_link="" - echo "$ac_t""no" 1>&6 - echo "configure: warning: library will be compiled without Mesa support" 1>&2 - fi - - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine$mesa_link$xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses" - TOOLKIT=MSW - GUIDIST=MSW_DIST - TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXWINE__" - fi - if test "$wxUSE_MOTIF" = 1; then if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. @@ -14757,17 +14730,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:14761: checking whether -R must be followed by a space" >&5 +echo "configure:14734: 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:14744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -14783,14 +14756,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:14767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -14822,7 +14795,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:14826: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:14799: 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 @@ -14830,7 +14803,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:14818: \"$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 @@ -14863,7 +14836,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:14867: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:14840: 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 @@ -14871,7 +14844,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:14859: \"$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 @@ -14911,12 +14884,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:14915: checking for gethostbyname" >&5 +echo "configure:14888: 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:14916: \"$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 @@ -14960,7 +14933,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:14964: checking for gethostbyname in -lnsl" >&5 +echo "configure:14937: 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 @@ -14968,7 +14941,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:14956: \"$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 @@ -15009,12 +14982,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:15013: checking for connect" >&5 +echo "configure:14986: 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:15014: \"$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 @@ -15058,7 +15031,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:15062: checking for connect in -lsocket" >&5 +echo "configure:15035: 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 @@ -15066,7 +15039,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:15054: \"$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 @@ -15101,12 +15074,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:15105: checking for remove" >&5 +echo "configure:15078: 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:15106: \"$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 @@ -15150,7 +15123,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:15154: checking for remove in -lposix" >&5 +echo "configure:15127: 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 @@ -15158,7 +15131,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:15146: \"$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 @@ -15193,12 +15166,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:15197: checking for shmat" >&5 +echo "configure:15170: 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:15198: \"$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 @@ -15242,7 +15215,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:15246: checking for shmat in -lipc" >&5 +echo "configure:15219: 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 @@ -15250,7 +15223,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:15238: \"$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 @@ -15294,7 +15267,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:15298: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:15271: 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 @@ -15302,7 +15275,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:15290: \"$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 @@ -15348,7 +15321,7 @@ fi COMPILED_X_PROGRAM=0 echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 -echo "configure:15352: checking for Motif/Lesstif headers" >&5 +echo "configure:15325: checking for Motif/Lesstif headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE /usr/include; @@ -15377,7 +15350,7 @@ for ac_dir in $SEARCH_INCLUDE /usr/include; TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include" else cat > conftest.$ac_ext < @@ -15389,7 +15362,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -15410,7 +15383,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:15414: checking for Motif/Lesstif library" >&5 +echo "configure:15387: checking for Motif/Lesstif library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB /usr/lib; @@ -15441,7 +15414,7 @@ for ac_dir in $SEARCH_LIB /usr/lib; CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" cat > conftest.$ac_ext < @@ -15453,7 +15426,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -15477,7 +15450,7 @@ rm -f conftest* xpm_link= echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:15481: checking for Xpm library" >&5 +echo "configure:15454: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB /usr/lib; @@ -15513,7 +15486,7 @@ EOF CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" cat > conftest.$ac_ext < @@ -15525,7 +15498,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* xpm_link=" -lXpm" @@ -15552,7 +15525,7 @@ rm -f conftest* fi echo $ac_n "checking if we need -lXp and/or -lSM -lICE""... $ac_c" 1>&6 -echo "configure:15556: checking if we need -lXp and/or -lSM -lICE" >&5 +echo "configure:15529: checking if we need -lXp and/or -lSM -lICE" >&5 libp_link="" libsm_ice_link="" libs_found=0 @@ -15566,7 +15539,7 @@ echo "configure:15556: checking if we need -lXp and/or -lSM -lICE" >&5 CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" cat > conftest.$ac_ext < @@ -15581,7 +15554,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* libp_link="$libp" @@ -15617,9 +15590,9 @@ rm -f conftest* fi if test "$wxUSE_MAC" = 1; then - CPPFLAGS="$CPPFLAGS -fpascal-strings -I\${top_srcdir}/src/mac/morefile -I/Developer/Headers/FlatCarbon" + CPPFLAGS="$CPPFLAGS -fpascal-strings -I\${top_srcdir}/src/mac/morefilex -I/Developer/Headers/FlatCarbon" - TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile" + TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex" TOOLKIT=MAC GUIDIST=MACX_DIST fi @@ -15729,17 +15702,17 @@ if test "$wxUSE_OPENGL" = "yes"; then else ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6 -echo "configure:15733: checking for GL/gl.h" >&5 +echo "configure:15706: 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:15743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15716: \"$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* @@ -15757,7 +15730,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for -lGL""... $ac_c" 1>&6 -echo "configure:15761: checking for -lGL" >&5 +echo "configure:15734: checking for -lGL" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB /usr/lib; @@ -15790,7 +15763,7 @@ for ac_dir in $SEARCH_LIB /usr/lib; else echo "$ac_t""no" 1>&6 echo $ac_n "checking for -lMesaGL""... $ac_c" 1>&6 -echo "configure:15794: checking for -lMesaGL" >&5 +echo "configure:15767: checking for -lMesaGL" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB /usr/lib; @@ -15901,7 +15874,7 @@ case "${host}" in ;; *-*-darwin* ) - + WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}" WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}" @@ -15911,8 +15884,8 @@ case "${host}" in WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" if test "$wxUSE_MAC" = 1; then - WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.r" - WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.rsrc" + WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.${WX_CURRENT}.r" + WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.${WX_CURRENT}.rsrc" fi ;; esac @@ -15961,7 +15934,7 @@ if test "$wxUSE_SHARED" = "yes"; then if test $found_versioning = no ; then echo $ac_n "checking if the linker accepts --version-script""... $ac_c" 1>&6 -echo "configure:15965: checking if the linker accepts --version-script" >&5 +echo "configure:15938: checking if the linker accepts --version-script" >&5 if eval "test \"`echo '$''{'wx_cv_version_script'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15971,7 +15944,7 @@ else if { ac_try=' $CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp - -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr'; { (eval echo configure:15975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then + -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr'; { (eval echo configure:15948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then if test -s conftest.stderr ; then wx_cv_version_script=no else @@ -16015,13 +15988,13 @@ echo "$ac_t""$wx_cv_version_script" 1>&6 *-*-linux* ) if test "$GCC" != "yes"; then echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6 -echo "configure:16019: checking for Intel compiler" >&5 +echo "configure:15992: checking for Intel compiler" >&5 if eval "test \"`echo '$''{'wx_cv_prog_icc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_prog_icc=yes else @@ -16076,7 +16049,7 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6 CXXFLAGS="$CXXFLAGS -fno-common" SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o" PIC_FLAG="-dynamic -fPIC" - SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}" + SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}" SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}" ;; @@ -16085,7 +16058,7 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6 # Extract the first word of "makeC++SharedLib", so it can be a program name with args. set dummy makeC++SharedLib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16089: checking for $ac_word" >&5 +echo "configure:16062: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AIX_CXX_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16198,7 +16171,7 @@ if test "$wxUSE_MAC" = 1; then # Extract the first word of "Rez", so it can be a program name with args. set dummy Rez; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16202: checking for $ac_word" >&5 +echo "configure:16175: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RESCOMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16228,7 +16201,7 @@ fi # Extract the first word of "DeRez", so it can be a program name with args. set dummy DeRez; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16232: checking for $ac_word" >&5 +echo "configure:16205: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16266,12 +16239,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:16270: checking for ANSI C header files" >&5 +echo "configure:16243: 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 @@ -16279,7 +16252,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16256: \"$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* @@ -16296,7 +16269,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 @@ -16314,7 +16287,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 @@ -16335,7 +16308,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -16346,7 +16319,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:16350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -16370,12 +16343,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:16374: checking for mode_t" >&5 +echo "configure:16347: 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 @@ -16403,12 +16376,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:16407: checking for off_t" >&5 +echo "configure:16380: 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 @@ -16436,12 +16409,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:16440: checking for pid_t" >&5 +echo "configure:16413: 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 @@ -16469,12 +16442,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:16473: checking for size_t" >&5 +echo "configure:16446: 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 @@ -16502,12 +16475,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:16506: checking for uid_t in sys/types.h" >&5 +echo "configure:16479: 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 @@ -16545,12 +16518,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6 -echo "configure:16549: checking if size_t is unsigned int" >&5 +echo "configure:16522: checking if size_t is unsigned int" >&5 if eval "test \"`echo '$''{'wx_cv_size_t_is_uint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -16563,7 +16536,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_uint=no else @@ -16586,12 +16559,12 @@ EOF else echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6 -echo "configure:16590: checking if size_t is unsigned long" >&5 +echo "configure:16563: checking if size_t is unsigned long" >&5 if eval "test \"`echo '$''{'wx_cv_size_t_is_ulong'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -16604,7 +16577,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16608: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_ulong=no else @@ -16638,13 +16611,13 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6 -echo "configure:16642: checking for pw_gecos in struct passwd" >&5 +echo "configure:16615: 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() { @@ -16655,7 +16628,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_pw_gecos=yes @@ -16695,12 +16668,12 @@ EOF for ac_func in wcslen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16699: checking for $ac_func" >&5 +echo "configure:16672: 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:16700: \"$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 @@ -16751,7 +16724,7 @@ done if test "$WCSLEN_FOUND" = 0; then if test "$TOOLKIT" = "MSW"; then echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6 -echo "configure:16755: checking for wcslen in -lmsvcrt" >&5 +echo "configure:16728: checking for wcslen in -lmsvcrt" >&5 ac_lib_var=`echo msvcrt'_'wcslen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16759,7 +16732,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmsvcrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16747: \"$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 @@ -16792,7 +16765,7 @@ fi else echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:16796: checking for wcslen in -lw" >&5 +echo "configure:16769: 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 @@ -16800,7 +16773,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:16788: \"$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 @@ -16847,12 +16820,12 @@ EOF for ac_func in wcsrtombs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16851: checking for $ac_func" >&5 +echo "configure:16824: 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:16852: \"$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 @@ -16915,12 +16888,12 @@ cross_compiling=$ac_cv_prog_cxx_cross for ac_func in vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16919: checking for $ac_func" >&5 +echo "configure:16892: 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:16923: \"$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 @@ -16971,16 +16944,63 @@ fi done +if test "$ac_cv_func_vsnprintf" = "yes"; then + echo $ac_n "checking for vsnprintf declaration""... $ac_c" 1>&6 +echo "configure:16950: checking for vsnprintf declaration" >&5 +if eval "test \"`echo '$''{'wx_cv_func_vsnprintf_decl'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < + #include + +int main() { + + char *buf; + va_list ap; + vsnprintf(buf, 10u, "%s", ap); + +; return 0; } +EOF +if { (eval echo configure:16970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_func_vsnprintf_decl=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_func_vsnprintf_decl=no + +fi +rm -f conftest* + + +fi + +echo "$ac_t""$wx_cv_func_vsnprintf_decl" 1>&6 + + if test "$wx_cv_func_vsnprintf_decl" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_VSNPRINTF_DECL 1 +EOF + + fi +fi + if test "$wxUSE_UNICODE" = yes; then for ac_func in fputwc wprintf vswprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16979: checking for $ac_func" >&5 +echo "configure:16999: 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:17030: \"$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 @@ -17030,17 +17050,18 @@ else fi done + echo $ac_n "checking for _vsnwprintf""... $ac_c" 1>&6 -echo "configure:17035: checking for _vsnwprintf" >&5 +echo "configure:17056: checking for _vsnwprintf" >&5 cat > conftest.$ac_ext < int main() { &_vsnwprintf; ; return 0; } EOF -if { (eval echo configure:17044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -17092,7 +17113,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:17096: checking for iconv" >&5 +echo "configure:17117: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17100,7 +17121,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -17110,7 +17131,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:17114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -17122,7 +17143,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -17132,7 +17153,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:17136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -17153,12 +17174,12 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking if iconv needs const""... $ac_c" 1>&6 -echo "configure:17157: checking if iconv needs const" >&5 +echo "configure:17178: checking if iconv needs const" >&5 if eval "test \"`echo '$''{'wx_cv_func_iconv_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -17177,7 +17198,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_iconv_const="no" else @@ -17222,12 +17243,12 @@ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then for ac_func in sigaction do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17226: checking for $ac_func" >&5 +echo "configure:17247: 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:17275: \"$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 @@ -17291,13 +17312,13 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6 -echo "configure:17295: checking for sa_handler type" >&5 +echo "configure:17316: checking for sa_handler type" >&5 if eval "test \"`echo '$''{'wx_cv_type_sa_handler'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -17309,7 +17330,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_sa_handler=int @@ -17346,12 +17367,12 @@ fi for ac_func in mkstemp mktemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17350: checking for $ac_func" >&5 +echo "configure:17371: 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:17399: \"$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 @@ -17400,12 +17421,12 @@ done echo $ac_n "checking for statfs""... $ac_c" 1>&6 -echo "configure:17404: checking for statfs" >&5 +echo "configure:17425: checking for statfs" >&5 if eval "test \"`echo '$''{'wx_cv_func_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_statfs=yes @@ -17447,45 +17468,38 @@ fi echo "$ac_t""$wx_cv_func_statfs" 1>&6 if test "$wx_cv_func_statfs" = "yes"; then + wx_cv_type_statvfs_t="struct statfs" cat >> confdefs.h <<\EOF #define HAVE_STATFS 1 EOF else echo $ac_n "checking for statvfs""... $ac_c" 1>&6 -echo "configure:17457: checking for statvfs" >&5 +echo "configure:17479: checking for statvfs" >&5 if eval "test \"`echo '$''{'wx_cv_func_statvfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < + #include + #include int main() { - long l; - struct statvfs fs; - statvfs("/", &fs); - l = fs.f_bsize; - l += fs.f_blocks; - l += fs.f_bavail; + statvfs("/", NULL); ; return 0; } EOF -if { (eval echo configure:17478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - - wx_cv_func_statvfs=yes - + wx_cv_func_statvfs=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - - wx_cv_func_statvfs=no - + wx_cv_func_statvfs=no fi rm -f conftest* @@ -17495,25 +17509,120 @@ fi echo "$ac_t""$wx_cv_func_statvfs" 1>&6 if test "$wx_cv_func_statvfs" = "yes"; then - cat >> confdefs.h <<\EOF + + 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 + + + echo $ac_n "checking for statvfs argument type""... $ac_c" 1>&6 +echo "configure:17523: checking for statvfs argument type" >&5 +if eval "test \"`echo '$''{'wx_cv_type_statvfs_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < + +int main() { + + long l; + statvfs_t fs; + statvfs("/", &fs); + l = fs.f_bsize; + l += fs.f_blocks; + l += fs.f_bavail; + +; return 0; } +EOF +if { (eval echo configure:17544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_type_statvfs_t=statvfs_t +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + cat > conftest.$ac_ext < + +int main() { + + long l; + struct statvfs fs; + statvfs("/", &fs); + l = fs.f_bsize; + l += fs.f_blocks; + l += fs.f_bavail; + +; return 0; } +EOF +if { (eval echo configure:17569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_type_statvfs_t="struct statvfs" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_type_statvfs_t="unknown" + +fi +rm -f conftest* + + +fi +rm -f conftest* + +fi + +echo "$ac_t""$wx_cv_type_statvfs_t" 1>&6 + + 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 + + + if test "$wx_cv_type_statvfs_t" != "unknown"; then + cat >> confdefs.h <<\EOF #define HAVE_STATVFS 1 EOF + fi else - echo "configure: warning: wxGetDiskSpace() function won't work without statfs()" 1>&2 + wx_cv_type_statvfs_t="unknown" fi fi +if test "$wx_cv_type_statvfs_t" != "unknown"; then + cat >> confdefs.h <&2 +fi + if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then for ac_func in fcntl flock do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17512: checking for $ac_func" >&5 +echo "configure:17621: 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:17649: \"$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 @@ -17570,12 +17679,12 @@ fi for ac_func in timegm do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17574: checking for $ac_func" >&5 +echo "configure:17683: 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:17711: \"$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 @@ -17626,12 +17735,12 @@ done for ac_func in putenv setenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17630: checking for $ac_func" >&5 +echo "configure:17739: 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:17767: \"$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 @@ -17701,12 +17810,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:17705: checking for $ac_func" >&5 +echo "configure:17814: 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:17842: \"$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 @@ -17754,7 +17863,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:17758: checking for nanosleep in -lposix4" >&5 +echo "configure:17867: 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 @@ -17762,7 +17871,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:17886: \"$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 @@ -17801,12 +17910,12 @@ else for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17805: checking for $ac_func" >&5 +echo "configure:17914: 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:17942: \"$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 @@ -17872,12 +17981,12 @@ fi for ac_func in uname gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17876: checking for $ac_func" >&5 +echo "configure:17985: 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:18013: \"$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 @@ -17937,12 +18046,12 @@ cross_compiling=$ac_cv_prog_cxx_cross for ac_func in strtok_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17941: checking for $ac_func" >&5 +echo "configure:18050: 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:18081: \"$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 @@ -18005,12 +18114,12 @@ INET_LINK= for ac_func in inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18009: checking for $ac_func" >&5 +echo "configure:18118: 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:18146: \"$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 @@ -18058,7 +18167,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 -echo "configure:18062: checking for inet_addr in -lnsl" >&5 +echo "configure:18171: 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 @@ -18066,7 +18175,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:18190: \"$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 @@ -18096,7 +18205,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:18100: checking for inet_addr in -lresolv" >&5 +echo "configure:18209: 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 @@ -18104,7 +18213,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:18228: \"$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 @@ -18134,7 +18243,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lsocket""... $ac_c" 1>&6 -echo "configure:18138: checking for inet_addr in -lsocket" >&5 +echo "configure:18247: checking for inet_addr in -lsocket" >&5 ac_lib_var=`echo socket'_'inet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18142,7 +18251,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:18266: \"$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 @@ -18189,12 +18298,12 @@ done for ac_func in inet_aton do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18193: checking for $ac_func" >&5 +echo "configure:18302: 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:18330: \"$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 @@ -18242,7 +18351,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:18246: checking for inet_aton in -l$INET_LINK" >&5 +echo "configure:18355: 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 @@ -18250,7 +18359,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:18374: \"$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 @@ -18357,10 +18466,7 @@ if test "$TOOLKIT" != "MSW"; then THREADS_CFLAGS= if test "$wxUSE_THREADS" = "yes" ; then - if test "$wxUSE_WINE" = 1 ; then - echo "configure: warning: Threads are not supported under WINE... disabled" 1>&2 - wxUSE_THREADS="no" - elif test "$USE_BEOS" = 1; then + if test "$USE_BEOS" = 1; then echo "configure: warning: BeOS threads are not yet supported... disabled" 1>&2 wxUSE_THREADS="no" fi @@ -18396,18 +18502,18 @@ if test "$TOOLKIT" != "MSW"; then case $flag in none) echo $ac_n "checking whether pthreads work without any flags""... $ac_c" 1>&6 -echo "configure:18400: checking whether pthreads work without any flags" >&5 +echo "configure:18506: checking whether pthreads work without any flags" >&5 ;; -*) echo $ac_n "checking whether pthreads work with $flag""... $ac_c" 1>&6 -echo "configure:18405: checking whether pthreads work with $flag" >&5 +echo "configure:18511: checking whether pthreads work with $flag" >&5 THREADS_CFLAGS="$flag" ;; *) echo $ac_n "checking for the pthreads library -l$flag""... $ac_c" 1>&6 -echo "configure:18411: checking for the pthreads library -l$flag" >&5 +echo "configure:18517: checking for the pthreads library -l$flag" >&5 THREADS_LINK="-l$flag" ;; esac @@ -18418,14 +18524,14 @@ echo "configure:18411: checking for the pthreads library -l$flag" >&5 CFLAGS="$THREADS_CFLAGS $CFLAGS" cat > conftest.$ac_ext < int main() { pthread_create(0,0,0,0); ; return 0; } EOF -if { (eval echo configure:18429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* THREADS_OK=yes else @@ -18454,7 +18560,7 @@ rm -f conftest* LIBS="$THREADS_LINK $LIBS" echo $ac_n "checking if more special flags are required for pthreads""... $ac_c" 1>&6 -echo "configure:18458: checking if more special flags are required for pthreads" >&5 +echo "configure:18564: checking if more special flags are required for pthreads" >&5 flag=no case "${host}" in *-aix*) @@ -18487,12 +18593,12 @@ echo "configure:18458: checking if more special flags are required for pthreads" for ac_func in thr_setconcurrency do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18491: checking for $ac_func" >&5 +echo "configure:18597: 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:18625: \"$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 @@ -18544,17 +18650,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:18548: checking for $ac_hdr" >&5 +echo "configure:18654: 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:18558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18664: \"$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* @@ -18582,12 +18688,12 @@ done if test "$ac_cv_header_sched_h" = "yes"; then echo $ac_n "checking for sched_yield""... $ac_c" 1>&6 -echo "configure:18586: checking for sched_yield" >&5 +echo "configure:18692: checking for sched_yield" >&5 if eval "test \"`echo '$''{'ac_cv_func_sched_yield'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sched_yield=yes" else @@ -18632,7 +18738,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6 -echo "configure:18636: checking for sched_yield in -lposix4" >&5 +echo "configure:18742: checking for sched_yield in -lposix4" >&5 ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18640,7 +18746,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:18761: \"$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 @@ -18684,12 +18790,12 @@ fi HAVE_PRIOR_FUNCS=0 echo $ac_n "checking for pthread_attr_getschedpolicy""... $ac_c" 1>&6 -echo "configure:18688: checking for pthread_attr_getschedpolicy" >&5 +echo "configure:18794: checking for pthread_attr_getschedpolicy" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_getschedpolicy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_attr_getschedpolicy=yes" else @@ -18727,12 +18833,12 @@ fi if eval "test \"`echo '$ac_cv_func_'pthread_attr_getschedpolicy`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for pthread_attr_setschedparam""... $ac_c" 1>&6 -echo "configure:18731: checking for pthread_attr_setschedparam" >&5 +echo "configure:18837: checking for pthread_attr_setschedparam" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_setschedparam'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_attr_setschedparam=yes" else @@ -18770,12 +18876,12 @@ fi if eval "test \"`echo '$ac_cv_func_'pthread_attr_setschedparam`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for sched_get_priority_max""... $ac_c" 1>&6 -echo "configure:18774: checking for sched_get_priority_max" >&5 +echo "configure:18880: checking for sched_get_priority_max" >&5 if eval "test \"`echo '$''{'ac_cv_func_sched_get_priority_max'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sched_get_priority_max=yes" else @@ -18818,7 +18924,7 @@ if eval "test \"`echo '$ac_cv_func_'sched_get_priority_max`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6 -echo "configure:18822: checking for sched_get_priority_max in -lposix4" >&5 +echo "configure:18928: checking for sched_get_priority_max in -lposix4" >&5 ac_lib_var=`echo posix4'_'sched_get_priority_max | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18826,7 +18932,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:18947: \"$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 @@ -18882,12 +18988,12 @@ EOF fi echo $ac_n "checking for pthread_cancel""... $ac_c" 1>&6 -echo "configure:18886: checking for pthread_cancel" >&5 +echo "configure:18992: checking for pthread_cancel" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_cancel'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_cancel=yes" else @@ -18935,13 +19041,13 @@ fi echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 -echo "configure:18939: checking for pthread_cleanup_push/pop" >&5 +echo "configure:19045: 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() { @@ -18951,7 +19057,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_pthread_cleanup_push=yes @@ -18979,13 +19085,13 @@ EOF echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6 -echo "configure:18983: checking for pthread_mutexattr_t" >&5 +echo "configure:19089: checking for pthread_mutexattr_t" >&5 if eval "test \"`echo '$''{'wx_cv_type_pthread_mutexattr_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -18995,7 +19101,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_pthread_mutexattr_t=yes @@ -19022,13 +19128,13 @@ EOF else echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6 -echo "configure:19026: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 +echo "configure:19132: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -19037,7 +19143,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_pthread_rec_mutex_init=yes @@ -19072,7 +19178,7 @@ else case "${host}" in *-*-mingw32* ) echo $ac_n "checking if compiler supports -mthreads""... $ac_c" 1>&6 -echo "configure:19076: checking if compiler supports -mthreads" >&5 +echo "configure:19182: checking if compiler supports -mthreads" >&5 if eval "test \"`echo '$''{'wx_cv_cflags_mthread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19080,14 +19186,14 @@ else CFLAGS_OLD="$CFLAGS" CFLAGS="$CFLAGS -mthreads" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_cflags_mthread=yes else @@ -19126,7 +19232,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:19130: checking if -D_REENTRANT is needed" >&5 +echo "configure:19236: checking if -D_REENTRANT is needed" >&5 if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT" echo "$ac_t""yes" 1>&6 @@ -19251,6 +19357,7 @@ else fi fi + if test "$WXWIN_COMPATIBILITY_2" = "yes"; then cat >> confdefs.h <<\EOF #define WXWIN_COMPATIBILITY_2 1 @@ -19260,11 +19367,20 @@ EOF WXWIN_COMPATIBILITY_2_2="yes" fi -if test "x$WXWIN_COMPATIBILITY_2_2" != "xno"; then +if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then cat >> confdefs.h <<\EOF #define WXWIN_COMPATIBILITY_2_2 1 EOF + + WXWIN_COMPATIBILITY_2_4="yes" +fi + +if test "x$WXWIN_COMPATIBILITY_2_4" != "xno"; then + cat >> confdefs.h <<\EOF +#define WXWIN_COMPATIBILITY_2_4 1 +EOF + fi @@ -19514,12 +19630,12 @@ if test "$wxUSE_DATETIME" = "yes"; then for ac_func in strptime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19518: checking for $ac_func" >&5 +echo "configure:19634: 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:19662: \"$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 @@ -19568,13 +19684,13 @@ done echo $ac_n "checking for timezone variable in ""... $ac_c" 1>&6 -echo "configure:19572: checking for timezone variable in " >&5 +echo "configure:19688: 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 < @@ -19586,7 +19702,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=timezone @@ -19597,7 +19713,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -19609,7 +19725,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=_timezone @@ -19620,7 +19736,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -19632,7 +19748,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=__timezone @@ -19673,12 +19789,12 @@ EOF for ac_func in localtime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19677: checking for $ac_func" >&5 +echo "configure:19793: 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:19821: \"$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 @@ -19728,13 +19844,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:19732: checking for tm_gmtoff in struct tm" >&5 +echo "configure:19848: 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 < @@ -19746,7 +19862,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_tm_has_gmtoff=yes @@ -19775,12 +19891,12 @@ EOF for ac_func in gettimeofday ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19779: checking for $ac_func" >&5 +echo "configure:19895: 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:19923: \"$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 @@ -19830,7 +19946,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:19834: checking whether gettimeofday takes two arguments" >&5 +echo "configure:19950: 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 @@ -19845,7 +19961,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -19858,7 +19974,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=yes else @@ -19866,7 +19982,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -19879,7 +19995,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=no else @@ -19934,12 +20050,12 @@ fi if test "$wxUSE_SOCKETS" = "yes"; then if test "$TOOLKIT" != "MSW"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:19938: checking for socket" >&5 +echo "configure:20054: 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:20082: \"$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 @@ -19980,7 +20096,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:19984: checking for socket in -lsocket" >&5 +echo "configure:20100: 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 @@ -19988,7 +20104,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:20119: \"$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 @@ -20035,7 +20151,7 @@ fi if test "$wxUSE_SOCKETS" = "yes" ; then if test "$TOOLKIT" != "MSW"; then echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6 -echo "configure:20039: checking what is the type of the third argument of getsockname" >&5 +echo "configure:20155: 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 @@ -20050,7 +20166,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -20063,7 +20179,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:20067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=socklen_t else @@ -20071,7 +20187,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -20084,7 +20200,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:20088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=size_t else @@ -20092,7 +20208,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -20105,7 +20221,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:20109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=int else @@ -20177,17 +20293,17 @@ if test "$wxUSE_GUI" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:20181: checking for $ac_hdr" >&5 +echo "configure:20297: 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:20191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:20307: \"$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* @@ -20241,12 +20357,12 @@ if test "$TOOLKIT" != "MSW"; then for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20245: checking for $ac_func" >&5 +echo "configure:20361: 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:20389: \"$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 @@ -20297,7 +20413,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:20301: checking for dlopen in -ldl" >&5 +echo "configure:20417: 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 @@ -20305,7 +20421,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:20436: \"$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 @@ -20345,12 +20461,12 @@ else for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20349: checking for $ac_func" >&5 +echo "configure:20465: 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:20493: \"$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 @@ -20401,7 +20517,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6 -echo "configure:20405: checking for dld in -lshl_load" >&5 +echo "configure:20521: checking for dld in -lshl_load" >&5 ac_lib_var=`echo shl_load'_'dld | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20409,7 +20525,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lshl_load $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20540: \"$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 @@ -20459,12 +20575,12 @@ done for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20463: checking for $ac_func" >&5 +echo "configure:20579: 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:20607: \"$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 @@ -20512,7 +20628,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6 -echo "configure:20516: checking for dlerror in -ldl" >&5 +echo "configure:20632: checking for dlerror in -ldl" >&5 ac_lib_var=`echo dl'_'dlerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20520,7 +20636,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:20651: \"$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 @@ -20606,7 +20722,7 @@ EOF if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then echo $ac_n "checking for main in -lunicows""... $ac_c" 1>&6 -echo "configure:20610: checking for main in -lunicows" >&5 +echo "configure:20726: checking for main in -lunicows" >&5 ac_lib_var=`echo unicows'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20614,14 +20730,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lunicows $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20741: \"$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 @@ -20803,17 +20919,17 @@ if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:20807: checking for $ac_hdr" >&5 +echo "configure:20923: 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:20817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:20933: \"$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* @@ -20852,9 +20968,9 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking if g++ requires -fvtable-thunks""... $ac_c" 1>&6 -echo "configure:20856: checking if g++ requires -fvtable-thunks" >&5 +echo "configure:20972: checking if g++ requires -fvtable-thunks" >&5 cat > conftest.$ac_ext < #include @@ -20862,7 +20978,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:20866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -20915,126 +21031,6 @@ EOF fi fi -if test "$wxUSE_WINE" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ - -o "$wxUSE_CLIPBOARD" = "yes" \ - -o "$wxUSE_OLE" = "yes" \ - -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then - for ac_hdr in ole2.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:20927: 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:20937: \"$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 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -fi -done - - - if test "$ac_cv_header_ole2_h" = "yes" ; then - if test "$GCC" = yes ; then - - 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 - - - echo $ac_n "checking if g++ requires -fvtable-thunks""... $ac_c" 1>&6 -echo "configure:20976: checking if g++ requires -fvtable-thunks" >&5 - cat > conftest.$ac_ext < - #include -int main() { - -; return 0; } -EOF -if { (eval echo configure:20986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""no" 1>&6 -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks" -fi -rm -f conftest* - 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 - - ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)" - LIBS=" -lwine_uuid$LIBS" - cat >> confdefs.h <<\EOF -#define wxUSE_OLE 1 -EOF - - - fi - - cat >> confdefs.h <<\EOF -#define wxUSE_DATAOBJ 1 -EOF - - else - echo "configure: warning: Some features disabled because OLE headers not found" 1>&2 - - wxUSE_CLIPBOARD=no - wxUSE_DRAG_AND_DROP=no - wxUSE_DATAOBJ=no - wxUSE_OLE=no - fi - - if test "$wxUSE_METAFILE" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_METAFILE 1 -EOF - - - cat >> confdefs.h <<\EOF -#define wxUSE_ENH_METAFILE 1 -EOF - - fi -fi - if test "$wxUSE_IPC" = "yes"; then if test "$wxUSE_SOCKETS" != "yes"; then echo "configure: warning: wxWindows IPC classes require sockets... disabled" 1>&2 @@ -21349,15 +21345,11 @@ EOF fi if test "$wxUSE_STATLINE" = "yes"; then - if test "$wxUSE_WINE" = 1 ; then - echo "configure: warning: wxStaticLine is not supported under WINE" 1>&2 - else - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_STATLINE 1 EOF - USES_CONTROLS=1 - fi + USES_CONTROLS=1 fi if test "$wxUSE_STATUSBAR" = "yes"; then @@ -21441,17 +21433,13 @@ if test "$wxUSE_TOOLTIPS" = "yes"; then if test "$wxUSE_MOTIF" = 1; then echo "configure: warning: wxTooltip not supported yet under Motif... disabled" 1>&2 else - if test "$wxUSE_WINE" = 1; then - echo "configure: warning: wxTooltip not supported under WINE... disabled" 1>&2 + if test "$wxUSE_UNIVERSAL" = "yes"; then + echo "configure: warning: wxTooltip not supported yet in wxUniversal... disabled" 1>&2 else - if test "$wxUSE_UNIVERSAL" = "yes"; then - echo "configure: warning: wxTooltip not supported yet in wxUniversal... disabled" 1>&2 - else - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_TOOLTIPS 1 EOF - fi fi fi fi @@ -21818,6 +21806,8 @@ cat >> confdefs.h <&6 -echo "configure:21837: checking for $ac_func" >&5 +echo "configure:21827: 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:21855: \"$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 @@ -21888,12 +21878,12 @@ done for ac_func in floor do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:21892: checking for $ac_func" >&5 +echo "configure:21882: 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:21910: \"$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 @@ -21941,7 +21931,7 @@ fi done echo $ac_n "checking if floating point functions link without -lm""... $ac_c" 1>&6 -echo "configure:21945: checking if floating point functions link without -lm" >&5 +echo "configure:21935: checking if floating point functions link without -lm" >&5 if test "$have_cos" = 1 -a "$have_floor" = 1; then echo "$ac_t""yes" 1>&6 else @@ -21953,12 +21943,12 @@ else for ac_func in sin do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:21957: checking for $ac_func" >&5 +echo "configure:21947: 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:21975: \"$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 @@ -22008,12 +21998,12 @@ done for ac_func in ceil do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:22012: checking for $ac_func" >&5 +echo "configure:22002: 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:22030: \"$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 @@ -22061,7 +22051,7 @@ fi done echo $ac_n "checking if floating point functions link with -lm""... $ac_c" 1>&6 -echo "configure:22065: checking if floating point functions link with -lm" >&5 +echo "configure:22055: checking if floating point functions link with -lm" >&5 if test "$have_sin" = 1 -a "$have_ceil" = 1; then echo "$ac_t""yes" 1>&6 else @@ -22211,10 +22201,11 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:22218: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:22209: 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 @@ -22497,6 +22488,7 @@ s%@TOOLKIT_VPATH@%$TOOLKIT_VPATH%g s%@TOOLCHAIN_NAME@%$TOOLCHAIN_NAME%g s%@TOOLCHAIN_DEFS@%$TOOLCHAIN_DEFS%g s%@TOOLCHAIN_DLL_DEFS@%$TOOLCHAIN_DLL_DEFS%g +s%@top_builddir@%$top_builddir%g s%@cross_compiling@%$cross_compiling%g s%@WXCONFIG_LIBS@%$WXCONFIG_LIBS%g s%@WXCONFIG_LIBS_GL@%$WXCONFIG_LIBS_GL%g @@ -22897,6 +22889,11 @@ echo " Should wxWindows be compiled in debug mode? ${wxUSE_DEBUG:-n echo " Should wxWindows be linked as a shared library? ${wxUSE_SHARED:-no}" echo " Should wxWindows be compiled in Unicode mode? ${wxUSE_UNICODE:-no}" +echo " What level of wxWindows compatibility should be enabled?" +echo " wxWindows 2.0 ${WXWIN_COMPATIBILITY_2:-no}" +echo " wxWindows 2.2 ${WXWIN_COMPATIBILITY_2_2:-no}" +echo " wxWindows 2.4 ${WXWIN_COMPATIBILITY_2_4:-yes}" + echo " Which libraries should wxWindows use?" echo " jpeg ${wxUSE_LIBJPEG-none}" echo " png ${wxUSE_LIBPNG-none}"