X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2b8b0662c6132c0076dd703e80f9751caa439cf..8480b297e70a29b785421ded6db22ae024e35038:/configure?ds=sidebyside diff --git a/configure b/configure index e366a412fd..f3f1a4a9e2 100755 --- a/configure +++ b/configure @@ -38,7 +38,7 @@ # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 +# Generated automatically using autoconf version 2.14 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -60,6 +60,8 @@ ac_help="$ac_help --with-cygwin use Cygwin for MS-Windows" ac_help="$ac_help --with-mingw use GCC Minimal MS-Windows" +ac_help="$ac_help + --with-pm use OS/2 Presentation Manager" ac_help="$ac_help --with-gtk-prefix=PFX Prefix where GTK is installed" ac_help="$ac_help @@ -594,7 +596,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" + echo "configure generated by autoconf version 2.14" exit 0 ;; -with-* | --with-*) @@ -830,7 +832,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:834: checking host system type" >&5 +echo "configure:836: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -851,7 +853,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:855: checking target system type" >&5 +echo "configure:857: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -869,7 +871,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:873: checking build system type" >&5 +echo "configure:875: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -895,7 +897,7 @@ test "$host_alias" != "$target_alias" && WX_MAJOR_VERSION_NUMBER=2 WX_MINOR_VERSION_NUMBER=1 -WX_RELEASE_NUMBER=12 +WX_RELEASE_NUMBER=13 WX_INTERFACE_AGE=0 WX_BINARY_AGE=0 @@ -933,17 +935,19 @@ USE_DATA_GENERAL= NEEDS_D_REENTRANT_FOR_R_FUNCS=0 -ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE" +ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE PM" DEFAULT_wxUSE_GTK=0 DEFAULT_wxUSE_MOTIF=0 DEFAULT_wxUSE_MSW=0 DEFAULT_wxUSE_WINE=0 +DEFAULT_wxUSE_PM=0 DEFAULT_DEFAULT_wxUSE_GTK=0 DEFAULT_DEFAULT_wxUSE_MOTIF=0 DEFAULT_DEFAULT_wxUSE_MSW=0 DEFAULT_DEFAULT_wxUSE_WINE=0 +DEFAULT_DEFAULT_wxUSE_PM=0 case "${host}" in *-hp-hpux* ) @@ -1119,6 +1123,7 @@ EOF #define WINVER 0x0400 EOF + PROGRAM_EXT=".exe" DEFAULT_DEFAULT_wxUSE_MSW=1 ;; @@ -1127,6 +1132,8 @@ EOF #define __EMX__ 1 EOF + PROGRAM_EXT=".exe" + DEFAULT_DEFAULT_wxUSE_PM=1 ;; *-*-beos* ) @@ -1159,7 +1166,7 @@ fi if test "$USE_LINUX" = 1; then echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6 -echo "configure:1163: checking for gettext in -lc" >&5 +echo "configure:1170: checking for gettext in -lc" >&5 ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1167,7 +1174,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1189: \"$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 @@ -1356,7 +1363,7 @@ else DEFAULT_wxUSE_LIBPNG=yes DEFAULT_wxUSE_LIBJPEG=yes DEFAULT_wxUSE_LIBTIFF=yes - DEFAULT_wxUSE_ODBC=yes + DEFAULT_wxUSE_ODBC=no DEFAULT_wxUSE_STD_IOSTREAM=no DEFAULT_wxUSE_FILE=yes @@ -1462,7 +1469,7 @@ done echo $ac_n "checking "for --enable-gui"""... $ac_c" 1>&6 -echo "configure:1466: checking "for --enable-gui"" >&5 +echo "configure:1473: checking "for --enable-gui"" >&5 no_cache=0 # Check whether --enable-gui or --disable-gui was given. if test "${enable_gui+set}" = set; then @@ -1532,6 +1539,12 @@ if test "${with_mingw+set}" = set; then wxUSE_MINGW="$withval" CACHE_MINGW=1 TOOLKIT_GIVEN=1 fi +# Check whether --with-pm or --without-pm was given. +if test "${with_pm+set}" = set; then + withval="$with_pm" + wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1 +fi + # Check whether --with-gtk-prefix or --without-gtk-prefix was given. if test "${with_gtk_prefix+set}" = set; then @@ -1552,7 +1565,7 @@ fi echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6 -echo "configure:1556: checking "for --with-libpng"" >&5 +echo "configure:1569: checking "for --with-libpng"" >&5 no_cache=0 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then @@ -1591,7 +1604,7 @@ fi echo $ac_n "checking "for --with-libjpeg"""... $ac_c" 1>&6 -echo "configure:1595: checking "for --with-libjpeg"" >&5 +echo "configure:1608: checking "for --with-libjpeg"" >&5 no_cache=0 # Check whether --with-libjpeg or --without-libjpeg was given. if test "${with_libjpeg+set}" = set; then @@ -1630,7 +1643,7 @@ fi echo $ac_n "checking "for --with-libtiff"""... $ac_c" 1>&6 -echo "configure:1634: checking "for --with-libtiff"" >&5 +echo "configure:1647: checking "for --with-libtiff"" >&5 no_cache=0 # Check whether --with-libtiff or --without-libtiff was given. if test "${with_libtiff+set}" = set; then @@ -1669,7 +1682,7 @@ fi echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6 -echo "configure:1673: checking "for --with-opengl"" >&5 +echo "configure:1686: checking "for --with-opengl"" >&5 no_cache=0 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then @@ -1711,7 +1724,7 @@ fi echo $ac_n "checking "for --with-dmalloc"""... $ac_c" 1>&6 -echo "configure:1715: checking "for --with-dmalloc"" >&5 +echo "configure:1728: checking "for --with-dmalloc"" >&5 no_cache=0 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -1750,7 +1763,7 @@ fi echo $ac_n "checking "for --with-zlib"""... $ac_c" 1>&6 -echo "configure:1754: checking "for --with-zlib"" >&5 +echo "configure:1767: checking "for --with-zlib"" >&5 no_cache=0 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -1789,7 +1802,7 @@ fi echo $ac_n "checking "for --with-odbc"""... $ac_c" 1>&6 -echo "configure:1793: checking "for --with-odbc"" >&5 +echo "configure:1806: checking "for --with-odbc"" >&5 no_cache=0 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then @@ -1831,7 +1844,7 @@ fi echo $ac_n "checking "for --enable-shared"""... $ac_c" 1>&6 -echo "configure:1835: checking "for --enable-shared"" >&5 +echo "configure:1848: checking "for --enable-shared"" >&5 no_cache=0 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then @@ -1870,7 +1883,7 @@ fi echo $ac_n "checking "for --enable-optimise"""... $ac_c" 1>&6 -echo "configure:1874: checking "for --enable-optimise"" >&5 +echo "configure:1887: checking "for --enable-optimise"" >&5 no_cache=0 # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then @@ -1909,7 +1922,7 @@ fi echo $ac_n "checking "for --enable-debug"""... $ac_c" 1>&6 -echo "configure:1913: checking "for --enable-debug"" >&5 +echo "configure:1926: checking "for --enable-debug"" >&5 no_cache=0 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -1957,7 +1970,7 @@ fi echo $ac_n "checking "for --enable-debug_flag"""... $ac_c" 1>&6 -echo "configure:1961: checking "for --enable-debug_flag"" >&5 +echo "configure:1974: checking "for --enable-debug_flag"" >&5 no_cache=0 # Check whether --enable-debug_flag or --disable-debug_flag was given. if test "${enable_debug_flag+set}" = set; then @@ -1996,7 +2009,7 @@ fi echo $ac_n "checking "for --enable-debug_info"""... $ac_c" 1>&6 -echo "configure:2000: checking "for --enable-debug_info"" >&5 +echo "configure:2013: checking "for --enable-debug_info"" >&5 no_cache=0 # Check whether --enable-debug_info or --disable-debug_info was given. if test "${enable_debug_info+set}" = set; then @@ -2035,7 +2048,7 @@ fi echo $ac_n "checking "for --enable-debug_gdb"""... $ac_c" 1>&6 -echo "configure:2039: checking "for --enable-debug_gdb"" >&5 +echo "configure:2052: checking "for --enable-debug_gdb"" >&5 no_cache=0 # Check whether --enable-debug_gdb or --disable-debug_gdb was given. if test "${enable_debug_gdb+set}" = set; then @@ -2074,7 +2087,7 @@ fi echo $ac_n "checking "for --enable-debug_cntxt"""... $ac_c" 1>&6 -echo "configure:2078: checking "for --enable-debug_cntxt"" >&5 +echo "configure:2091: checking "for --enable-debug_cntxt"" >&5 no_cache=0 # Check whether --enable-debug_cntxt or --disable-debug_cntxt was given. if test "${enable_debug_cntxt+set}" = set; then @@ -2113,7 +2126,7 @@ fi echo $ac_n "checking "for --enable-mem_tracing"""... $ac_c" 1>&6 -echo "configure:2117: checking "for --enable-mem_tracing"" >&5 +echo "configure:2130: checking "for --enable-mem_tracing"" >&5 no_cache=0 # Check whether --enable-mem_tracing or --disable-mem_tracing was given. if test "${enable_mem_tracing+set}" = set; then @@ -2152,7 +2165,7 @@ fi echo $ac_n "checking "for --enable-profile"""... $ac_c" 1>&6 -echo "configure:2156: checking "for --enable-profile"" >&5 +echo "configure:2169: checking "for --enable-profile"" >&5 no_cache=0 # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then @@ -2191,7 +2204,7 @@ fi echo $ac_n "checking "for --enable-no_rtti"""... $ac_c" 1>&6 -echo "configure:2195: checking "for --enable-no_rtti"" >&5 +echo "configure:2208: checking "for --enable-no_rtti"" >&5 no_cache=0 # Check whether --enable-no_rtti or --disable-no_rtti was given. if test "${enable_no_rtti+set}" = set; then @@ -2230,7 +2243,7 @@ fi echo $ac_n "checking "for --enable-no_exceptions"""... $ac_c" 1>&6 -echo "configure:2234: checking "for --enable-no_exceptions"" >&5 +echo "configure:2247: checking "for --enable-no_exceptions"" >&5 no_cache=0 # Check whether --enable-no_exceptions or --disable-no_exceptions was given. if test "${enable_no_exceptions+set}" = set; then @@ -2269,7 +2282,7 @@ fi echo $ac_n "checking "for --enable-permissive"""... $ac_c" 1>&6 -echo "configure:2273: checking "for --enable-permissive"" >&5 +echo "configure:2286: checking "for --enable-permissive"" >&5 no_cache=0 # Check whether --enable-permissive or --disable-permissive was given. if test "${enable_permissive+set}" = set; then @@ -2308,7 +2321,7 @@ fi echo $ac_n "checking "for --enable-no_deps"""... $ac_c" 1>&6 -echo "configure:2312: checking "for --enable-no_deps"" >&5 +echo "configure:2325: checking "for --enable-no_deps"" >&5 no_cache=0 # Check whether --enable-no_deps or --disable-no_deps was given. if test "${enable_no_deps+set}" = set; then @@ -2349,7 +2362,7 @@ fi echo $ac_n "checking "for --enable-intl"""... $ac_c" 1>&6 -echo "configure:2353: checking "for --enable-intl"" >&5 +echo "configure:2366: checking "for --enable-intl"" >&5 no_cache=0 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then @@ -2388,7 +2401,7 @@ fi echo $ac_n "checking "for --enable-config"""... $ac_c" 1>&6 -echo "configure:2392: checking "for --enable-config"" >&5 +echo "configure:2405: checking "for --enable-config"" >&5 no_cache=0 # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -2429,7 +2442,7 @@ fi if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking "for --enable-sockets"""... $ac_c" 1>&6 -echo "configure:2433: checking "for --enable-sockets"" >&5 +echo "configure:2446: checking "for --enable-sockets"" >&5 no_cache=0 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then @@ -2472,7 +2485,7 @@ fi echo $ac_n "checking "for --enable-dialupman"""... $ac_c" 1>&6 -echo "configure:2476: checking "for --enable-dialupman"" >&5 +echo "configure:2489: checking "for --enable-dialupman"" >&5 no_cache=0 # Check whether --enable-dialupman or --disable-dialupman was given. if test "${enable_dialupman+set}" = set; then @@ -2511,7 +2524,7 @@ fi echo $ac_n "checking "for --enable-ipc"""... $ac_c" 1>&6 -echo "configure:2515: checking "for --enable-ipc"" >&5 +echo "configure:2528: checking "for --enable-ipc"" >&5 no_cache=0 # Check whether --enable-ipc or --disable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -2550,7 +2563,7 @@ fi echo $ac_n "checking "for --enable-apple_ieee"""... $ac_c" 1>&6 -echo "configure:2554: checking "for --enable-apple_ieee"" >&5 +echo "configure:2567: checking "for --enable-apple_ieee"" >&5 no_cache=0 # Check whether --enable-apple_ieee or --disable-apple_ieee was given. if test "${enable_apple_ieee+set}" = set; then @@ -2589,7 +2602,7 @@ fi echo $ac_n "checking "for --enable-timedate"""... $ac_c" 1>&6 -echo "configure:2593: checking "for --enable-timedate"" >&5 +echo "configure:2606: checking "for --enable-timedate"" >&5 no_cache=0 # Check whether --enable-timedate or --disable-timedate was given. if test "${enable_timedate+set}" = set; then @@ -2628,7 +2641,7 @@ fi echo $ac_n "checking "for --enable-wave"""... $ac_c" 1>&6 -echo "configure:2632: checking "for --enable-wave"" >&5 +echo "configure:2645: checking "for --enable-wave"" >&5 no_cache=0 # Check whether --enable-wave or --disable-wave was given. if test "${enable_wave+set}" = set; then @@ -2667,7 +2680,7 @@ fi echo $ac_n "checking "for --enable-fraction"""... $ac_c" 1>&6 -echo "configure:2671: checking "for --enable-fraction"" >&5 +echo "configure:2684: checking "for --enable-fraction"" >&5 no_cache=0 # Check whether --enable-fraction or --disable-fraction was given. if test "${enable_fraction+set}" = set; then @@ -2706,7 +2719,7 @@ fi echo $ac_n "checking "for --enable-dynlib"""... $ac_c" 1>&6 -echo "configure:2710: checking "for --enable-dynlib"" >&5 +echo "configure:2723: checking "for --enable-dynlib"" >&5 no_cache=0 # Check whether --enable-dynlib or --disable-dynlib was given. if test "${enable_dynlib+set}" = set; then @@ -2745,7 +2758,7 @@ fi echo $ac_n "checking "for --enable-longlong"""... $ac_c" 1>&6 -echo "configure:2749: checking "for --enable-longlong"" >&5 +echo "configure:2762: checking "for --enable-longlong"" >&5 no_cache=0 # Check whether --enable-longlong or --disable-longlong was given. if test "${enable_longlong+set}" = set; then @@ -2784,7 +2797,7 @@ fi echo $ac_n "checking "for --enable-log"""... $ac_c" 1>&6 -echo "configure:2788: checking "for --enable-log"" >&5 +echo "configure:2801: checking "for --enable-log"" >&5 no_cache=0 # Check whether --enable-log or --disable-log was given. if test "${enable_log+set}" = set; then @@ -2823,7 +2836,7 @@ fi echo $ac_n "checking "for --enable-streams"""... $ac_c" 1>&6 -echo "configure:2827: checking "for --enable-streams"" >&5 +echo "configure:2840: checking "for --enable-streams"" >&5 no_cache=0 # Check whether --enable-streams or --disable-streams was given. if test "${enable_streams+set}" = set; then @@ -2862,7 +2875,7 @@ fi echo $ac_n "checking "for --enable-file"""... $ac_c" 1>&6 -echo "configure:2866: checking "for --enable-file"" >&5 +echo "configure:2879: checking "for --enable-file"" >&5 no_cache=0 # Check whether --enable-file or --disable-file was given. if test "${enable_file+set}" = set; then @@ -2901,7 +2914,7 @@ fi echo $ac_n "checking "for --enable-textfile"""... $ac_c" 1>&6 -echo "configure:2905: checking "for --enable-textfile"" >&5 +echo "configure:2918: checking "for --enable-textfile"" >&5 no_cache=0 # Check whether --enable-textfile or --disable-textfile was given. if test "${enable_textfile+set}" = set; then @@ -2940,7 +2953,7 @@ fi echo $ac_n "checking "for --enable-unicode"""... $ac_c" 1>&6 -echo "configure:2944: checking "for --enable-unicode"" >&5 +echo "configure:2957: checking "for --enable-unicode"" >&5 no_cache=0 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then @@ -2979,7 +2992,7 @@ fi echo $ac_n "checking "for --enable-wcsrtombs"""... $ac_c" 1>&6 -echo "configure:2983: checking "for --enable-wcsrtombs"" >&5 +echo "configure:2996: checking "for --enable-wcsrtombs"" >&5 no_cache=0 # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given. if test "${enable_wcsrtombs+set}" = set; then @@ -3018,7 +3031,7 @@ fi echo $ac_n "checking "for --enable-wxprintfv"""... $ac_c" 1>&6 -echo "configure:3022: checking "for --enable-wxprintfv"" >&5 +echo "configure:3035: checking "for --enable-wxprintfv"" >&5 no_cache=0 # Check whether --enable-wxprintfv or --disable-wxprintfv was given. if test "${enable_wxprintfv+set}" = set; then @@ -3057,7 +3070,7 @@ fi echo $ac_n "checking "for --enable-joystick"""... $ac_c" 1>&6 -echo "configure:3061: checking "for --enable-joystick"" >&5 +echo "configure:3074: checking "for --enable-joystick"" >&5 no_cache=0 # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then @@ -3096,7 +3109,7 @@ fi echo $ac_n "checking "for --enable-std_iostreams"""... $ac_c" 1>&6 -echo "configure:3100: checking "for --enable-std_iostreams"" >&5 +echo "configure:3113: checking "for --enable-std_iostreams"" >&5 no_cache=0 # Check whether --enable-std_iostreams or --disable-std_iostreams was given. if test "${enable_std_iostreams+set}" = set; then @@ -3135,7 +3148,7 @@ fi echo $ac_n "checking "for --enable-fs_inet"""... $ac_c" 1>&6 -echo "configure:3139: checking "for --enable-fs_inet"" >&5 +echo "configure:3152: checking "for --enable-fs_inet"" >&5 no_cache=0 # Check whether --enable-fs_inet or --disable-fs_inet was given. if test "${enable_fs_inet+set}" = set; then @@ -3174,7 +3187,7 @@ fi echo $ac_n "checking "for --enable-fs_zip"""... $ac_c" 1>&6 -echo "configure:3178: checking "for --enable-fs_zip"" >&5 +echo "configure:3191: checking "for --enable-fs_zip"" >&5 no_cache=0 # Check whether --enable-fs_zip or --disable-fs_zip was given. if test "${enable_fs_zip+set}" = set; then @@ -3213,7 +3226,7 @@ fi echo $ac_n "checking "for --enable-zipstream"""... $ac_c" 1>&6 -echo "configure:3217: checking "for --enable-zipstream"" >&5 +echo "configure:3230: checking "for --enable-zipstream"" >&5 no_cache=0 # Check whether --enable-zipstream or --disable-zipstream was given. if test "${enable_zipstream+set}" = set; then @@ -3254,7 +3267,7 @@ fi echo $ac_n "checking "for --enable-threads"""... $ac_c" 1>&6 -echo "configure:3258: checking "for --enable-threads"" >&5 +echo "configure:3271: checking "for --enable-threads"" >&5 no_cache=0 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then @@ -3293,7 +3306,7 @@ fi echo $ac_n "checking "for --enable-serial"""... $ac_c" 1>&6 -echo "configure:3297: checking "for --enable-serial"" >&5 +echo "configure:3310: checking "for --enable-serial"" >&5 no_cache=0 # Check whether --enable-serial or --disable-serial was given. if test "${enable_serial+set}" = set; then @@ -3336,7 +3349,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking "for --enable-docview"""... $ac_c" 1>&6 -echo "configure:3340: checking "for --enable-docview"" >&5 +echo "configure:3353: checking "for --enable-docview"" >&5 no_cache=0 # Check whether --enable-docview or --disable-docview was given. if test "${enable_docview+set}" = set; then @@ -3375,7 +3388,7 @@ fi echo $ac_n "checking "for --enable-help"""... $ac_c" 1>&6 -echo "configure:3379: checking "for --enable-help"" >&5 +echo "configure:3392: checking "for --enable-help"" >&5 no_cache=0 # Check whether --enable-help or --disable-help was given. if test "${enable_help+set}" = set; then @@ -3414,7 +3427,7 @@ fi echo $ac_n "checking "for --enable-constraints"""... $ac_c" 1>&6 -echo "configure:3418: checking "for --enable-constraints"" >&5 +echo "configure:3431: checking "for --enable-constraints"" >&5 no_cache=0 # Check whether --enable-constraints or --disable-constraints was given. if test "${enable_constraints+set}" = set; then @@ -3453,7 +3466,7 @@ fi echo $ac_n "checking "for --enable-printarch"""... $ac_c" 1>&6 -echo "configure:3457: checking "for --enable-printarch"" >&5 +echo "configure:3470: checking "for --enable-printarch"" >&5 no_cache=0 # Check whether --enable-printarch or --disable-printarch was given. if test "${enable_printarch+set}" = set; then @@ -3492,7 +3505,7 @@ fi echo $ac_n "checking "for --enable-mdi"""... $ac_c" 1>&6 -echo "configure:3496: checking "for --enable-mdi"" >&5 +echo "configure:3509: checking "for --enable-mdi"" >&5 no_cache=0 # Check whether --enable-mdi or --disable-mdi was given. if test "${enable_mdi+set}" = set; then @@ -3532,7 +3545,7 @@ fi echo $ac_n "checking "for --enable-postscript"""... $ac_c" 1>&6 -echo "configure:3536: checking "for --enable-postscript"" >&5 +echo "configure:3549: checking "for --enable-postscript"" >&5 no_cache=0 # Check whether --enable-postscript or --disable-postscript was given. if test "${enable_postscript+set}" = set; then @@ -3573,7 +3586,7 @@ fi echo $ac_n "checking "for --enable-prologio"""... $ac_c" 1>&6 -echo "configure:3577: checking "for --enable-prologio"" >&5 +echo "configure:3590: checking "for --enable-prologio"" >&5 no_cache=0 # Check whether --enable-prologio or --disable-prologio was given. if test "${enable_prologio+set}" = set; then @@ -3612,7 +3625,7 @@ fi echo $ac_n "checking "for --enable-resources"""... $ac_c" 1>&6 -echo "configure:3616: checking "for --enable-resources"" >&5 +echo "configure:3629: checking "for --enable-resources"" >&5 no_cache=0 # Check whether --enable-resources or --disable-resources was given. if test "${enable_resources+set}" = set; then @@ -3652,7 +3665,7 @@ fi echo $ac_n "checking "for --enable-xresources"""... $ac_c" 1>&6 -echo "configure:3656: checking "for --enable-xresources"" >&5 +echo "configure:3669: checking "for --enable-xresources"" >&5 no_cache=0 # Check whether --enable-xresources or --disable-xresources was given. if test "${enable_xresources+set}" = set; then @@ -3693,7 +3706,7 @@ fi echo $ac_n "checking "for --enable-clipboard"""... $ac_c" 1>&6 -echo "configure:3697: checking "for --enable-clipboard"" >&5 +echo "configure:3710: checking "for --enable-clipboard"" >&5 no_cache=0 # Check whether --enable-clipboard or --disable-clipboard was given. if test "${enable_clipboard+set}" = set; then @@ -3732,7 +3745,7 @@ fi echo $ac_n "checking "for --enable-dnd"""... $ac_c" 1>&6 -echo "configure:3736: checking "for --enable-dnd"" >&5 +echo "configure:3749: checking "for --enable-dnd"" >&5 no_cache=0 # Check whether --enable-dnd or --disable-dnd was given. if test "${enable_dnd+set}" = set; then @@ -3772,7 +3785,7 @@ fi echo $ac_n "checking "for --enable-wxtree"""... $ac_c" 1>&6 -echo "configure:3776: checking "for --enable-wxtree"" >&5 +echo "configure:3789: checking "for --enable-wxtree"" >&5 no_cache=0 # Check whether --enable-wxtree or --disable-wxtree was given. if test "${enable_wxtree+set}" = set; then @@ -3813,7 +3826,7 @@ fi echo $ac_n "checking "for --enable-controls"""... $ac_c" 1>&6 -echo "configure:3817: checking "for --enable-controls"" >&5 +echo "configure:3830: checking "for --enable-controls"" >&5 no_cache=0 # Check whether --enable-controls or --disable-controls was given. if test "${enable_controls+set}" = set; then @@ -3921,7 +3934,7 @@ fi echo $ac_n "checking "for --enable-accel"""... $ac_c" 1>&6 -echo "configure:3925: checking "for --enable-accel"" >&5 +echo "configure:3938: checking "for --enable-accel"" >&5 no_cache=0 # Check whether --enable-accel or --disable-accel was given. if test "${enable_accel+set}" = set; then @@ -3960,7 +3973,7 @@ fi echo $ac_n "checking "for --enable-caret"""... $ac_c" 1>&6 -echo "configure:3964: checking "for --enable-caret"" >&5 +echo "configure:3977: checking "for --enable-caret"" >&5 no_cache=0 # Check whether --enable-caret or --disable-caret was given. if test "${enable_caret+set}" = set; then @@ -3999,7 +4012,7 @@ fi echo $ac_n "checking "for --enable-bmpbutton"""... $ac_c" 1>&6 -echo "configure:4003: checking "for --enable-bmpbutton"" >&5 +echo "configure:4016: checking "for --enable-bmpbutton"" >&5 no_cache=0 # Check whether --enable-bmpbutton or --disable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then @@ -4038,7 +4051,7 @@ fi echo $ac_n "checking "for --enable-checkbox"""... $ac_c" 1>&6 -echo "configure:4042: checking "for --enable-checkbox"" >&5 +echo "configure:4055: checking "for --enable-checkbox"" >&5 no_cache=0 # Check whether --enable-checkbox or --disable-checkbox was given. if test "${enable_checkbox+set}" = set; then @@ -4077,7 +4090,7 @@ fi echo $ac_n "checking "for --enable-checklst"""... $ac_c" 1>&6 -echo "configure:4081: checking "for --enable-checklst"" >&5 +echo "configure:4094: checking "for --enable-checklst"" >&5 no_cache=0 # Check whether --enable-checklst or --disable-checklst was given. if test "${enable_checklst+set}" = set; then @@ -4116,7 +4129,7 @@ fi echo $ac_n "checking "for --enable-choice"""... $ac_c" 1>&6 -echo "configure:4120: checking "for --enable-choice"" >&5 +echo "configure:4133: checking "for --enable-choice"" >&5 no_cache=0 # Check whether --enable-choice or --disable-choice was given. if test "${enable_choice+set}" = set; then @@ -4155,7 +4168,7 @@ fi echo $ac_n "checking "for --enable-combobox"""... $ac_c" 1>&6 -echo "configure:4159: checking "for --enable-combobox"" >&5 +echo "configure:4172: checking "for --enable-combobox"" >&5 no_cache=0 # Check whether --enable-combobox or --disable-combobox was given. if test "${enable_combobox+set}" = set; then @@ -4194,7 +4207,7 @@ fi echo $ac_n "checking "for --enable-gauge"""... $ac_c" 1>&6 -echo "configure:4198: checking "for --enable-gauge"" >&5 +echo "configure:4211: checking "for --enable-gauge"" >&5 no_cache=0 # Check whether --enable-gauge or --disable-gauge was given. if test "${enable_gauge+set}" = set; then @@ -4233,7 +4246,7 @@ fi echo $ac_n "checking "for --enable-grid"""... $ac_c" 1>&6 -echo "configure:4237: checking "for --enable-grid"" >&5 +echo "configure:4250: checking "for --enable-grid"" >&5 no_cache=0 # Check whether --enable-grid or --disable-grid was given. if test "${enable_grid+set}" = set; then @@ -4272,7 +4285,7 @@ fi echo $ac_n "checking "for --enable-newgrid"""... $ac_c" 1>&6 -echo "configure:4276: checking "for --enable-newgrid"" >&5 +echo "configure:4289: checking "for --enable-newgrid"" >&5 no_cache=0 # Check whether --enable-newgrid or --disable-newgrid was given. if test "${enable_newgrid+set}" = set; then @@ -4311,7 +4324,7 @@ fi echo $ac_n "checking "for --enable-imaglist"""... $ac_c" 1>&6 -echo "configure:4315: checking "for --enable-imaglist"" >&5 +echo "configure:4328: checking "for --enable-imaglist"" >&5 no_cache=0 # Check whether --enable-imaglist or --disable-imaglist was given. if test "${enable_imaglist+set}" = set; then @@ -4350,7 +4363,7 @@ fi echo $ac_n "checking "for --enable-listbox"""... $ac_c" 1>&6 -echo "configure:4354: checking "for --enable-listbox"" >&5 +echo "configure:4367: checking "for --enable-listbox"" >&5 no_cache=0 # Check whether --enable-listbox or --disable-listbox was given. if test "${enable_listbox+set}" = set; then @@ -4389,7 +4402,7 @@ fi echo $ac_n "checking "for --enable-listctrl"""... $ac_c" 1>&6 -echo "configure:4393: checking "for --enable-listctrl"" >&5 +echo "configure:4406: checking "for --enable-listctrl"" >&5 no_cache=0 # Check whether --enable-listctrl or --disable-listctrl was given. if test "${enable_listctrl+set}" = set; then @@ -4428,7 +4441,7 @@ fi echo $ac_n "checking "for --enable-notebook"""... $ac_c" 1>&6 -echo "configure:4432: checking "for --enable-notebook"" >&5 +echo "configure:4445: checking "for --enable-notebook"" >&5 no_cache=0 # Check whether --enable-notebook or --disable-notebook was given. if test "${enable_notebook+set}" = set; then @@ -4467,7 +4480,7 @@ fi echo $ac_n "checking "for --enable-radiobox"""... $ac_c" 1>&6 -echo "configure:4471: checking "for --enable-radiobox"" >&5 +echo "configure:4484: checking "for --enable-radiobox"" >&5 no_cache=0 # Check whether --enable-radiobox or --disable-radiobox was given. if test "${enable_radiobox+set}" = set; then @@ -4506,7 +4519,7 @@ fi echo $ac_n "checking "for --enable-radiobtn"""... $ac_c" 1>&6 -echo "configure:4510: checking "for --enable-radiobtn"" >&5 +echo "configure:4523: checking "for --enable-radiobtn"" >&5 no_cache=0 # Check whether --enable-radiobtn or --disable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then @@ -4545,7 +4558,7 @@ fi echo $ac_n "checking "for --enable-sash"""... $ac_c" 1>&6 -echo "configure:4549: checking "for --enable-sash"" >&5 +echo "configure:4562: checking "for --enable-sash"" >&5 no_cache=0 # Check whether --enable-sash or --disable-sash was given. if test "${enable_sash+set}" = set; then @@ -4584,7 +4597,7 @@ fi echo $ac_n "checking "for --enable-scrollbar"""... $ac_c" 1>&6 -echo "configure:4588: checking "for --enable-scrollbar"" >&5 +echo "configure:4601: checking "for --enable-scrollbar"" >&5 no_cache=0 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -4623,7 +4636,7 @@ fi echo $ac_n "checking "for --enable-slider"""... $ac_c" 1>&6 -echo "configure:4627: checking "for --enable-slider"" >&5 +echo "configure:4640: checking "for --enable-slider"" >&5 no_cache=0 # Check whether --enable-slider or --disable-slider was given. if test "${enable_slider+set}" = set; then @@ -4662,7 +4675,7 @@ fi echo $ac_n "checking "for --enable-spinbtn"""... $ac_c" 1>&6 -echo "configure:4666: checking "for --enable-spinbtn"" >&5 +echo "configure:4679: checking "for --enable-spinbtn"" >&5 no_cache=0 # Check whether --enable-spinbtn or --disable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then @@ -4701,7 +4714,7 @@ fi echo $ac_n "checking "for --enable-spinctrl"""... $ac_c" 1>&6 -echo "configure:4705: checking "for --enable-spinctrl"" >&5 +echo "configure:4718: checking "for --enable-spinctrl"" >&5 no_cache=0 # Check whether --enable-spinctrl or --disable-spinctrl was given. if test "${enable_spinctrl+set}" = set; then @@ -4740,7 +4753,7 @@ fi echo $ac_n "checking "for --enable-splitter"""... $ac_c" 1>&6 -echo "configure:4744: checking "for --enable-splitter"" >&5 +echo "configure:4757: checking "for --enable-splitter"" >&5 no_cache=0 # Check whether --enable-splitter or --disable-splitter was given. if test "${enable_splitter+set}" = set; then @@ -4779,7 +4792,7 @@ fi echo $ac_n "checking "for --enable-statbmp"""... $ac_c" 1>&6 -echo "configure:4783: checking "for --enable-statbmp"" >&5 +echo "configure:4796: checking "for --enable-statbmp"" >&5 no_cache=0 # Check whether --enable-statbmp or --disable-statbmp was given. if test "${enable_statbmp+set}" = set; then @@ -4818,7 +4831,7 @@ fi echo $ac_n "checking "for --enable-statbox"""... $ac_c" 1>&6 -echo "configure:4822: checking "for --enable-statbox"" >&5 +echo "configure:4835: checking "for --enable-statbox"" >&5 no_cache=0 # Check whether --enable-statbox or --disable-statbox was given. if test "${enable_statbox+set}" = set; then @@ -4857,7 +4870,7 @@ fi echo $ac_n "checking "for --enable-statline"""... $ac_c" 1>&6 -echo "configure:4861: checking "for --enable-statline"" >&5 +echo "configure:4874: checking "for --enable-statline"" >&5 no_cache=0 # Check whether --enable-statline or --disable-statline was given. if test "${enable_statline+set}" = set; then @@ -4896,7 +4909,7 @@ fi echo $ac_n "checking "for --enable-statusbar"""... $ac_c" 1>&6 -echo "configure:4900: checking "for --enable-statusbar"" >&5 +echo "configure:4913: checking "for --enable-statusbar"" >&5 no_cache=0 # Check whether --enable-statusbar or --disable-statusbar was given. if test "${enable_statusbar+set}" = set; then @@ -4935,7 +4948,7 @@ fi echo $ac_n "checking "for --enable-tabdialog"""... $ac_c" 1>&6 -echo "configure:4939: checking "for --enable-tabdialog"" >&5 +echo "configure:4952: checking "for --enable-tabdialog"" >&5 no_cache=0 # Check whether --enable-tabdialog or --disable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then @@ -4974,7 +4987,7 @@ fi echo $ac_n "checking "for --enable-toolbar"""... $ac_c" 1>&6 -echo "configure:4978: checking "for --enable-toolbar"" >&5 +echo "configure:4991: checking "for --enable-toolbar"" >&5 no_cache=0 # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then @@ -5013,7 +5026,7 @@ fi echo $ac_n "checking "for --enable-tbarnative"""... $ac_c" 1>&6 -echo "configure:5017: checking "for --enable-tbarnative"" >&5 +echo "configure:5030: checking "for --enable-tbarnative"" >&5 no_cache=0 # Check whether --enable-tbarnative or --disable-tbarnative was given. if test "${enable_tbarnative+set}" = set; then @@ -5052,7 +5065,7 @@ fi echo $ac_n "checking "for --enable-tbarsmpl"""... $ac_c" 1>&6 -echo "configure:5056: checking "for --enable-tbarsmpl"" >&5 +echo "configure:5069: checking "for --enable-tbarsmpl"" >&5 no_cache=0 # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given. if test "${enable_tbarsmpl+set}" = set; then @@ -5091,7 +5104,7 @@ fi echo $ac_n "checking "for --enable-treectrl"""... $ac_c" 1>&6 -echo "configure:5095: checking "for --enable-treectrl"" >&5 +echo "configure:5108: checking "for --enable-treectrl"" >&5 no_cache=0 # Check whether --enable-treectrl or --disable-treectrl was given. if test "${enable_treectrl+set}" = set; then @@ -5132,7 +5145,7 @@ fi echo $ac_n "checking "for --enable-commondlg"""... $ac_c" 1>&6 -echo "configure:5136: checking "for --enable-commondlg"" >&5 +echo "configure:5149: checking "for --enable-commondlg"" >&5 no_cache=0 # Check whether --enable-commondlg or --disable-commondlg was given. if test "${enable_commondlg+set}" = set; then @@ -5171,7 +5184,7 @@ fi echo $ac_n "checking "for --enable-dirdlg"""... $ac_c" 1>&6 -echo "configure:5175: checking "for --enable-dirdlg"" >&5 +echo "configure:5188: checking "for --enable-dirdlg"" >&5 no_cache=0 # Check whether --enable-dirdlg or --disable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then @@ -5210,7 +5223,7 @@ fi echo $ac_n "checking "for --enable-textdlg"""... $ac_c" 1>&6 -echo "configure:5214: checking "for --enable-textdlg"" >&5 +echo "configure:5227: checking "for --enable-textdlg"" >&5 no_cache=0 # Check whether --enable-textdlg or --disable-textdlg was given. if test "${enable_textdlg+set}" = set; then @@ -5249,7 +5262,7 @@ fi echo $ac_n "checking "for --enable-tipdlg"""... $ac_c" 1>&6 -echo "configure:5253: checking "for --enable-tipdlg"" >&5 +echo "configure:5266: checking "for --enable-tipdlg"" >&5 no_cache=0 # Check whether --enable-tipdlg or --disable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then @@ -5288,7 +5301,7 @@ fi echo $ac_n "checking "for --enable-progressdlg"""... $ac_c" 1>&6 -echo "configure:5292: checking "for --enable-progressdlg"" >&5 +echo "configure:5305: checking "for --enable-progressdlg"" >&5 no_cache=0 # Check whether --enable-progressdlg or --disable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then @@ -5327,7 +5340,7 @@ fi echo $ac_n "checking "for --enable-miniframe"""... $ac_c" 1>&6 -echo "configure:5331: checking "for --enable-miniframe"" >&5 +echo "configure:5344: checking "for --enable-miniframe"" >&5 no_cache=0 # Check whether --enable-miniframe or --disable-miniframe was given. if test "${enable_miniframe+set}" = set; then @@ -5366,7 +5379,7 @@ fi echo $ac_n "checking "for --enable-html"""... $ac_c" 1>&6 -echo "configure:5370: checking "for --enable-html"" >&5 +echo "configure:5383: checking "for --enable-html"" >&5 no_cache=0 # Check whether --enable-html or --disable-html was given. if test "${enable_html+set}" = set; then @@ -5405,7 +5418,7 @@ fi echo $ac_n "checking "for --enable-tooltips"""... $ac_c" 1>&6 -echo "configure:5409: checking "for --enable-tooltips"" >&5 +echo "configure:5422: checking "for --enable-tooltips"" >&5 no_cache=0 # Check whether --enable-tooltips or --disable-tooltips was given. if test "${enable_tooltips+set}" = set; then @@ -5444,7 +5457,7 @@ fi echo $ac_n "checking "for --enable-splines"""... $ac_c" 1>&6 -echo "configure:5448: checking "for --enable-splines"" >&5 +echo "configure:5461: checking "for --enable-splines"" >&5 no_cache=0 # Check whether --enable-splines or --disable-splines was given. if test "${enable_splines+set}" = set; then @@ -5483,7 +5496,7 @@ fi echo $ac_n "checking "for --enable-validators"""... $ac_c" 1>&6 -echo "configure:5487: checking "for --enable-validators"" >&5 +echo "configure:5500: checking "for --enable-validators"" >&5 no_cache=0 # Check whether --enable-validators or --disable-validators was given. if test "${enable_validators+set}" = set; then @@ -5522,7 +5535,7 @@ fi echo $ac_n "checking "for --enable-busyinfo"""... $ac_c" 1>&6 -echo "configure:5526: checking "for --enable-busyinfo"" >&5 +echo "configure:5539: checking "for --enable-busyinfo"" >&5 no_cache=0 # Check whether --enable-busyinfo or --disable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then @@ -5563,7 +5576,7 @@ fi echo $ac_n "checking "for --enable-gif"""... $ac_c" 1>&6 -echo "configure:5567: checking "for --enable-gif"" >&5 +echo "configure:5580: checking "for --enable-gif"" >&5 no_cache=0 # Check whether --enable-gif or --disable-gif was given. if test "${enable_gif+set}" = set; then @@ -5602,7 +5615,7 @@ fi echo $ac_n "checking "for --enable-pcx"""... $ac_c" 1>&6 -echo "configure:5606: checking "for --enable-pcx"" >&5 +echo "configure:5619: checking "for --enable-pcx"" >&5 no_cache=0 # Check whether --enable-pcx or --disable-pcx was given. if test "${enable_pcx+set}" = set; then @@ -5641,7 +5654,7 @@ fi echo $ac_n "checking "for --enable-pnm"""... $ac_c" 1>&6 -echo "configure:5645: checking "for --enable-pnm"" >&5 +echo "configure:5658: checking "for --enable-pnm"" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -5688,7 +5701,7 @@ fi echo $ac_n "checking for toolkit""... $ac_c" 1>&6 -echo "configure:5692: checking for toolkit" >&5 +echo "configure:5705: checking for toolkit" >&5 if test "$wxUSE_GUI" = "yes"; then @@ -5715,6 +5728,19 @@ fi NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}` +case "${host}" in + *-pc-os2_emx ) + NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` + # PATH_IFS is autodetected by OS/2's configure (usually ';') + LEX_STEM="lexyy" + ;; + *) + PATH_IFS=':' + LEX_STEM="lex.yy" + PROGRAM_EXT= + ;; +esac + case "$NUM_TOOLKITS" in 1) ;; @@ -5741,6 +5767,7 @@ for toolkit in `echo $ALL_TOOLKITS`; do done else + PATH_IFS=':' echo "$ac_t""base only" 1>&6 fi @@ -5809,7 +5836,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5813: checking for $ac_word" >&5 +echo "configure:5840: 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 @@ -5839,7 +5866,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:5843: checking for $ac_word" >&5 +echo "configure:5870: 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 @@ -5890,7 +5917,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:5894: checking for $ac_word" >&5 +echo "configure:5921: 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 @@ -5922,7 +5949,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:5926: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:5953: 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. @@ -5933,12 +5960,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 5937 "configure" +#line 5964 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:5942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5969: \"$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 @@ -5964,12 +5991,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:5968: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:5995: 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:5973: checking whether we are using GNU C" >&5 +echo "configure:6000: 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 @@ -5978,7 +6005,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:5982: \"$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:6009: \"$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 @@ -5997,7 +6024,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:6001: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:6028: 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 @@ -6032,7 +6059,7 @@ fi CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'` echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:6036: checking how to run the C preprocessor" >&5 +echo "configure:6063: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -6047,13 +6074,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:6057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6084: \"$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 : @@ -6064,13 +6091,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:6074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6101: \"$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 : @@ -6081,13 +6108,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:6091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6118: \"$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 : @@ -6114,13 +6141,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:6118: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:6145: 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 @@ -6138,7 +6165,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -6174,7 +6201,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:6178: checking for $ac_word" >&5 +echo "configure:6205: 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 @@ -6206,7 +6233,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:6210: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:6237: 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. @@ -6217,12 +6244,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 6221 "configure" +#line 6248 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:6226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6253: \"$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 @@ -6248,12 +6275,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:6252: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:6279: 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:6257: checking whether we are using GNU C++" >&5 +echo "configure:6284: 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 @@ -6262,7 +6289,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:6266: \"$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:6293: \"$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 @@ -6281,7 +6308,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:6285: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:6312: 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 @@ -6314,7 +6341,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:6318: checking how to run the C++ preprocessor" >&5 +echo "configure:6345: 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 @@ -6327,12 +6354,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:6336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6363: \"$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 : @@ -6370,7 +6397,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:6374: checking for $ac_word" >&5 +echo "configure:6401: 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 @@ -6401,7 +6428,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:6405: checking for $ac_word" >&5 +echo "configure:6432: 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 @@ -6441,7 +6468,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:6445: checking for a BSD compatible install" >&5 +echo "configure:6472: 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 @@ -6497,7 +6524,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6501: checking for $ac_word" >&5 +echo "configure:6528: 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 @@ -6526,7 +6553,7 @@ fi echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6 -echo "configure:6530: checking "make for VPATH support"" >&5 +echo "configure:6557: checking "make for VPATH support"" >&5 cat - << EOF > confMake check : file cp \$? \$@ @@ -6555,7 +6582,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:6559: checking for $ac_word" >&5 +echo "configure:6586: 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 @@ -6589,7 +6616,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:6593: checking for $ac_word" >&5 +echo "configure:6620: 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 @@ -6623,7 +6650,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:6627: checking for yywrap in -l$ac_lib" >&5 +echo "configure:6654: 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 @@ -6631,7 +6658,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:6673: \"$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 @@ -6666,7 +6693,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:6670: checking whether ln -s works" >&5 +echo "configure:6697: 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 @@ -6731,6 +6758,9 @@ SEARCH_INCLUDE="\ /usr/x386/include \ /usr/XFree86/include/X11 \ \ + X:/XFree86/include \ + X:/XFree86/include/X11 \ + \ /usr/include/gtk \ /usr/local/include/gtk \ /usr/include/glib \ @@ -6804,8 +6834,12 @@ rm -f confcache +AFMINSTALL= + if test "$wxUSE_GUI" = "yes"; then +USE_GUI=1 + TOOLKIT= TOOLKIT_INCLUDE= @@ -6817,17 +6851,16 @@ GUI_TK_LIBRARY= GUI_TK_LINK= WXGTK12= +WXGTK13= WXWINE= -PROGRAM_EXT= - if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then if test "$cross_compiling" = "yes" ; then echo "configure: warning: Cross compiling --- skipping windows.h check" 1>&2 else echo $ac_n "checking for Windows headers""... $ac_c" 1>&6 -echo "configure:6831: checking for Windows headers" >&5 +echo "configure:6864: checking for Windows headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -6862,7 +6895,6 @@ for ac_dir in $SEARCH_INCLUDE; GENERICOBJS="\$(MSW_GENERICOBJS)" UNIXOBJS= GUIDIST=MSW_DIST - PROGRAM_EXT=.exe fi if test "$wxUSE_GTK" = 1; then @@ -6883,7 +6915,7 @@ if test "$wxUSE_GTK" = 1; then # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6887: checking for $ac_word" >&5 +echo "configure:6919: 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 @@ -6916,9 +6948,9 @@ else echo "$ac_t""no" 1>&6 fi - min_gtk_version=1.2.1 + min_gtk_version=1.2.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:6922: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:6954: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -6931,7 +6963,7 @@ echo "configure:6922: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -6963,7 +6995,7 @@ main () } EOF -if { (eval echo configure:6967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6987,16 +7019,18 @@ fi echo "$ac_t""no" 1>&6 GTK_CFLAGS="" GTK_LIBS="" - { echo "configure: error: Is gtk-config in path and GTK+ is version 1.2.1 or above?" 1>&2; exit 1; } + { echo "configure: error: Is gtk-config in path and GTK+ is version 1.2.3 or above?" 1>&2; exit 1; } fi TOOLKIT_INCLUDE="$GTK_CFLAGS" - GUI_TK_LIBRARY="$GTK_LIBS" + GUI_TK_LIBRARY="$GTK_LIBS -lgthread" TOOLKIT=GTK + AFMINSTALL=afminstall + GUIOBJS="\$(GTK_GUIOBJS)" GUIHEADERS="\$(GTK_HEADERS)" COMMONOBJS="\$(GTK_COMMONOBJS)" @@ -7009,7 +7043,7 @@ fi GUIDIST=GTK_DIST echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 -echo "configure:7013: checking for gdk_im_open in -lgdk" >&5 +echo "configure:7047: 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 @@ -7017,7 +7051,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:7066: \"$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 @@ -7056,7 +7090,7 @@ fi if test "$wxUSE_WINE" = 1; then echo $ac_n "checking for WINE includes""... $ac_c" 1>&6 -echo "configure:7060: checking for WINE includes" >&5 +echo "configure:7094: checking for WINE includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -7077,7 +7111,7 @@ for ac_dir in $SEARCH_INCLUDE; XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:7081: checking for Xpm library" >&5 +echo "configure:7115: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -7105,7 +7139,7 @@ EOF MESA_LINK="" echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 -echo "configure:7109: checking for Mesa library" >&5 +echo "configure:7143: checking for Mesa library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -7149,7 +7183,7 @@ if test "$wxUSE_MOTIF" = 1; then # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:7153: checking for X" >&5 +echo "configure:7187: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -7211,12 +7245,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:7220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7254: \"$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* @@ -7285,14 +7319,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:7330: \"$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. @@ -7398,17 +7432,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:7402: checking whether -R must be followed by a space" >&5 +echo "configure:7436: 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:7446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -7424,14 +7458,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:7469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -7463,7 +7497,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:7467: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:7501: 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 @@ -7471,7 +7505,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:7520: \"$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 @@ -7504,7 +7538,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:7508: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:7542: 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 @@ -7512,7 +7546,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:7561: \"$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 @@ -7552,12 +7586,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:7556: checking for gethostbyname" >&5 +echo "configure:7590: 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:7619: \"$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 @@ -7601,7 +7636,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:7605: checking for gethostbyname in -lnsl" >&5 +echo "configure:7640: 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 @@ -7609,7 +7644,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:7659: \"$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 @@ -7650,12 +7685,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:7654: checking for connect" >&5 +echo "configure:7689: 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:7718: \"$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 @@ -7699,7 +7735,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:7703: checking for connect in -lsocket" >&5 +echo "configure:7739: 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 @@ -7707,7 +7743,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:7758: \"$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 @@ -7742,12 +7778,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:7746: checking for remove" >&5 +echo "configure:7782: 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:7811: \"$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 @@ -7791,7 +7828,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:7795: checking for remove in -lposix" >&5 +echo "configure:7832: 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 @@ -7799,7 +7836,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:7851: \"$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 @@ -7834,12 +7871,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:7838: checking for shmat" >&5 +echo "configure:7875: 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:7904: \"$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 @@ -7883,7 +7921,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:7887: checking for shmat in -lipc" >&5 +echo "configure:7925: 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 @@ -7891,7 +7929,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:7944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7935,7 +7973,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:7939: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:7977: 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 @@ -7943,7 +7981,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:7996: \"$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 @@ -7986,9 +8024,11 @@ fi GUI_TK_LIBRARY="$X_LIBS" TOOLKIT_INCLUDE="$X_CFLAGS" + AFMINSTALL=afminstall + echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 -echo "configure:7992: checking for Motif/Lesstif headers" >&5 +echo "configure:8032: checking for Motif/Lesstif headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -8007,7 +8047,7 @@ for ac_dir in $SEARCH_INCLUDE; fi echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 -echo "configure:8011: checking for Motif/Lesstif library" >&5 +echo "configure:8051: checking for Motif/Lesstif library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -8050,7 +8090,7 @@ for ac_dir in $SEARCH_LIB; fi echo $ac_n "checking for Xt library""... $ac_c" 1>&6 -echo "configure:8054: checking for Xt library" >&5 +echo "configure:8094: checking for Xt library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -8082,7 +8122,7 @@ for ac_dir in $SEARCH_LIB; XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:8086: checking for Xpm library" >&5 +echo "configure:8126: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -8133,7 +8173,26 @@ EOF GUIDIST=MOTIF_DIST fi -TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"` +if test "$wxUSE_PM" = 1; then + TOOLKIT=PM + + GUIOBJS="\$(PM_GUIOBJS)" + GUIHEADERS="\$(PM_HEADERS)" + COMMONOBJS="\$(PM_COMMONOBJS)" + GENERICOBJS="\$(PM_GENERICOBJS)" + GUIDEPS="\$(PM_GUIDEPS)" + COMMONDEPS="\$(PM_COMMONDEPS)" + GENERICDEPS="\$(PM_GENERICDEPS)" + UNIXOBJS= + UNIXDEPS= + GUIDIST=GTK_DIST +fi + +if test "$TOOLKIT" != "PM" ; then + TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"` +else + TOOLKIT_DIR="os2" +fi TOOLKIT_DEF="-D__WX${TOOLKIT}__" @@ -8156,6 +8215,8 @@ WX_LIBRARY="wx_${TOOLKIT_DIR}" ALL_HEADERS="\$(GUIHEADERS) \$(HTML_HEADERS) \$(UNIX_HEADERS) \$(PROTOCOL_HEADERS) \$(GENERIC_HEADERS) \$(WX_HEADERS)" else + USE_GUI=0 + ALL_OBJECTS="\$(BASE_OBJS)" ALL_DEPFILES="\${BASE_DEPS}" ALL_HEADERS="\${BASE_HEADERS}" @@ -8264,6 +8325,8 @@ if test "$wxUSE_SHARED" = "yes"; then WX_ALL="${WX_LIBRARY_NAME_STATIC}" ;; *-pc-os2_emx ) + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" + WX_ALL="${WX_LIBRARY_NAME_STATIC}" ;; *-*-beos* ) SHARED_LD="${LD} -shared -o" @@ -8288,17 +8351,17 @@ for ac_hdr in strings.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8292: checking for $ac_hdr" >&5 +echo "configure:8355: 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:8302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8365: \"$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* @@ -8328,17 +8391,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:8332: checking for $ac_hdr" >&5 +echo "configure:8395: 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:8342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8405: \"$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* @@ -8368,17 +8431,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:8372: checking for $ac_hdr" >&5 +echo "configure:8435: 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:8382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8445: \"$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* @@ -8408,17 +8471,17 @@ for ac_hdr in wcstr.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8412: checking for $ac_hdr" >&5 +echo "configure:8475: 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:8422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8485: \"$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* @@ -8448,17 +8511,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:8452: checking for $ac_hdr" >&5 +echo "configure:8515: 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:8462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8525: \"$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* @@ -8490,17 +8553,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:8494: checking for $ac_hdr" >&5 +echo "configure:8557: 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:8504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8567: \"$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* @@ -8530,12 +8593,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:8534: checking for ANSI C header files" >&5 +echo "configure:8597: 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 @@ -8543,7 +8606,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8610: \"$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* @@ -8560,7 +8623,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 @@ -8578,7 +8641,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 @@ -8599,7 +8662,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -8610,7 +8673,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:8614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -8634,12 +8697,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:8638: checking for mode_t" >&5 +echo "configure:8701: 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 @@ -8667,12 +8730,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:8671: checking for off_t" >&5 +echo "configure:8734: 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 @@ -8700,12 +8763,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:8704: checking for pid_t" >&5 +echo "configure:8767: 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 @@ -8733,12 +8796,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:8737: checking for size_t" >&5 +echo "configure:8800: 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 @@ -8766,12 +8829,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:8770: checking for uid_t in sys/types.h" >&5 +echo "configure:8833: 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 @@ -8802,13 +8865,13 @@ fi echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6 -echo "configure:8806: checking for pw_gecos in struct passwd" >&5 +echo "configure:8869: 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() { @@ -8819,7 +8882,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_pw_gecos=yes @@ -8846,12 +8909,12 @@ echo "$ac_t""$wx_cv_struct_pw_gecos" 1>&6 echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:8850: checking for working const" >&5 +echo "configure:8913: 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:8967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -8921,21 +8984,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:8925: checking for inline" >&5 +echo "configure:8988: 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:9002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -8962,7 +9025,7 @@ esac echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:8966: checking size of char" >&5 +echo "configure:9029: 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 @@ -8970,7 +9033,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < main() @@ -8981,7 +9044,7 @@ main() exit(0); } EOF -if { (eval echo configure:8985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9048: \"$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 @@ -9001,7 +9064,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:9005: checking size of short" >&5 +echo "configure:9068: 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 @@ -9009,7 +9072,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < main() @@ -9020,7 +9083,7 @@ main() exit(0); } EOF -if { (eval echo configure:9024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9087: \"$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 @@ -9040,7 +9103,7 @@ EOF echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:9044: checking size of int *" >&5 +echo "configure:9107: checking size of int *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9048,7 +9111,7 @@ else ac_cv_sizeof_int_p=4 else cat > conftest.$ac_ext < main() @@ -9059,7 +9122,7 @@ main() exit(0); } EOF -if { (eval echo configure:9063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_p=`cat conftestval` else @@ -9079,7 +9142,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:9083: checking size of int" >&5 +echo "configure:9146: 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 @@ -9087,7 +9150,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -9098,7 +9161,7 @@ main() exit(0); } EOF -if { (eval echo configure:9102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9165: \"$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 @@ -9118,7 +9181,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:9122: checking size of long" >&5 +echo "configure:9185: 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 @@ -9126,7 +9189,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -9137,7 +9200,7 @@ main() exit(0); } EOF -if { (eval echo configure:9141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9204: \"$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 @@ -9157,7 +9220,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:9161: checking size of long long" >&5 +echo "configure:9224: 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 @@ -9165,7 +9228,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -9176,7 +9239,7 @@ main() exit(0); } EOF -if { (eval echo configure:9180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9243: \"$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 @@ -9197,14 +9260,14 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:9201: checking whether byte ordering is bigendian" >&5 +echo "configure:9264: 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 @@ -9215,11 +9278,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:9219: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9282: \"$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 @@ -9230,7 +9293,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:9234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -9250,7 +9313,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:9330: \"$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 @@ -9310,17 +9373,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:9314: checking for $ac_hdr" >&5 +echo "configure:9377: 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:9324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9387: \"$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* @@ -9368,7 +9431,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:9372: checking if C++ compiler supports bool" >&5 +echo "configure:9435: 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 @@ -9383,7 +9446,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -9437,13 +9500,13 @@ EOF echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6 -echo "configure:9441: checking if you need GNU extensions" >&5 +echo "configure:9504: checking if you need GNU extensions" >&5 if eval "test \"`echo '$''{'wx_cv_gnu_extensions'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -9456,7 +9519,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_gnu_extensions=yes else @@ -9481,7 +9544,7 @@ fi echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6 -echo "configure:9485: checking for wcslen in -lc" >&5 +echo "configure:9548: checking for wcslen in -lc" >&5 ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9489,7 +9552,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9567: \"$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 @@ -9526,7 +9589,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:9530: checking for wcslen in -lw" >&5 +echo "configure:9593: 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 @@ -9534,7 +9597,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:9612: \"$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 @@ -9576,12 +9639,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:9580: checking for vprintf" >&5 +echo "configure:9643: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -9628,12 +9692,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:9632: checking for _doprnt" >&5 +echo "configure:9696: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -9684,12 +9749,12 @@ fi for ac_func in vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9688: checking for $ac_func" >&5 +echo "configure:9753: 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:9782: \"$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 @@ -9752,7 +9818,7 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 -echo "configure:9756: checking for vsscanf" >&5 +echo "configure:9822: checking for vsscanf" >&5 if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9762,7 +9828,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:9859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF @@ -9825,12 +9891,12 @@ if test "$USE_UNIX" = 1; then for ac_func in vfork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9829: checking for $ac_func" >&5 +echo "configure:9895: 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:9924: \"$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 @@ -9881,12 +9948,12 @@ done for ac_func in timegm do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9885: checking for $ac_func" >&5 +echo "configure:9952: 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:9981: \"$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 @@ -9948,12 +10016,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:9952: checking for $ac_func" >&5 +echo "configure:10020: 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:10049: \"$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 @@ -10001,7 +10070,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:10005: checking for nanosleep in -lposix4" >&5 +echo "configure:10074: 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 @@ -10009,7 +10078,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:10093: \"$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 @@ -10048,12 +10117,12 @@ else for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10052: checking for $ac_func" >&5 +echo "configure:10121: 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:10150: \"$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 @@ -10115,12 +10185,12 @@ fi for ac_func in uname gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10119: checking for $ac_func" >&5 +echo "configure:10189: 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:10218: \"$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 @@ -10171,12 +10242,12 @@ done for ac_func in strtok_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10175: checking for $ac_func" >&5 +echo "configure:10246: 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:10275: \"$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 @@ -10228,12 +10300,12 @@ INET_LINK= for ac_func in inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10232: checking for $ac_func" >&5 +echo "configure:10304: 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:10333: \"$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 @@ -10281,7 +10354,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 -echo "configure:10285: checking for inet_addr in -lnsl" >&5 +echo "configure:10358: 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 @@ -10289,7 +10362,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:10377: \"$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 @@ -10319,7 +10392,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:10323: checking for inet_addr in -lresolv" >&5 +echo "configure:10396: 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 @@ -10327,7 +10400,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:10415: \"$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 @@ -10371,12 +10444,12 @@ done for ac_func in inet_aton do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10375: checking for $ac_func" >&5 +echo "configure:10448: 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:10477: \"$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 @@ -10424,7 +10498,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:10428: checking for inet_aton in -l$INET_LINK" >&5 +echo "configure:10502: 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 @@ -10432,7 +10506,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:10521: \"$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 @@ -10550,7 +10624,7 @@ fi if test "$wxUSE_THREADS" = "yes" ; then echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:10554: checking for pthread_create in -lpthread" >&5 +echo "configure:10628: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10558,7 +10632,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10647: \"$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 @@ -10592,7 +10666,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:10596: checking for pthread_create in -lc_r" >&5 +echo "configure:10670: checking for pthread_create in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10600,7 +10674,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10689: \"$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 @@ -10635,17 +10709,17 @@ else ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 -echo "configure:10639: checking for sys/prctl.h" >&5 +echo "configure:10713: checking for sys/prctl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10723: \"$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* @@ -10685,12 +10759,12 @@ if test "$wxUSE_THREADS" = "yes" ; then for ac_func in thr_setconcurrency do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10689: checking for $ac_func" >&5 +echo "configure:10763: 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:10792: \"$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 @@ -10743,17 +10818,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10747: checking for $ac_hdr" >&5 +echo "configure:10822: 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:10757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10832: \"$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* @@ -10781,7 +10856,7 @@ done echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:10785: checking for sched_yield in -l$THREADS_LINK" >&5 +echo "configure:10860: checking for sched_yield in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10789,7 +10864,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10879: \"$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 @@ -10822,7 +10897,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6 -echo "configure:10826: checking for sched_yield in -l"posix4"" >&5 +echo "configure:10901: checking for sched_yield in -l"posix4"" >&5 ac_lib_var=`echo "posix4"'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10830,7 +10905,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l"posix4" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10920: \"$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 @@ -10871,7 +10946,7 @@ fi echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:10875: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 +echo "configure:10950: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10879,7 +10954,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10969: \"$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 @@ -10912,7 +10987,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6 -echo "configure:10916: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5 +echo "configure:10991: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5 ac_lib_var=`echo "posix4"'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10920,7 +10995,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l"posix4" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11010: \"$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 @@ -10961,7 +11036,7 @@ fi echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:10965: checking for pthread_cancel in -l$THREADS_LINK" >&5 +echo "configure:11040: checking for pthread_cancel in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10969,7 +11044,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11059: \"$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 @@ -11006,13 +11081,13 @@ fi echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 -echo "configure:11010: checking for pthread_cleanup_push/pop" >&5 +echo "configure:11085: 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() { @@ -11022,7 +11097,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_pthread_cleanup_push=yes @@ -11063,7 +11138,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:11067: checking if -D_REENTRANT is needed" >&5 +echo "configure:11142: checking if -D_REENTRANT is needed" >&5 if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then CFLAGS="${CFLAGS} -D_REENTRANT" CXXFLAGS="${CXXFLAGS} -D_REENTRANT" @@ -11074,6 +11149,14 @@ echo "configure:11067: checking if -D_REENTRANT is needed" >&5 fi fi +if test "$WXGTK13" = 1 ; then + cat >> confdefs.h <> confdefs.h <&6 -echo "configure:11214: checking for GL/gl.h" >&5 +echo "configure:11297: 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:11224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11307: \"$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* @@ -11238,7 +11321,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for glInitNames in -lGL""... $ac_c" 1>&6 -echo "configure:11242: checking for glInitNames in -lGL" >&5 +echo "configure:11325: checking for glInitNames in -lGL" >&5 ac_lib_var=`echo GL'_'glInitNames | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11246,7 +11329,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lGL wxUSE_OPENGL=0 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11344: \"$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 @@ -11284,7 +11367,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for glInitNames in -lMesaGL""... $ac_c" 1>&6 -echo "configure:11288: checking for glInitNames in -lMesaGL" >&5 +echo "configure:11371: checking for glInitNames in -lMesaGL" >&5 ac_lib_var=`echo MesaGL'_'glInitNames | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11292,7 +11375,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lMesaGL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11390: \"$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 @@ -11475,7 +11558,7 @@ if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then #define wxUSE_DIALUP_MANAGER 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS nettest" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup" fi if test "$wxUSE_STREAMS" = "yes" ; then @@ -11490,12 +11573,12 @@ if test "$wxUSE_TIMEDATE" = "yes"; then for ac_func in strptime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11494: checking for $ac_func" >&5 +echo "configure:11577: 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:11606: \"$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 @@ -11544,13 +11628,13 @@ done echo $ac_n "checking for timezone variable in ""... $ac_c" 1>&6 -echo "configure:11548: checking for timezone variable in " >&5 +echo "configure:11632: 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 < @@ -11562,7 +11646,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=__timezone @@ -11573,7 +11657,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -11585,7 +11669,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=_timezone @@ -11596,7 +11680,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -11608,7 +11692,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=timezone @@ -11643,12 +11727,12 @@ EOF for ac_func in localtime gettimeofday ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11647: checking for $ac_func" >&5 +echo "configure:11731: 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:11760: \"$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 @@ -11698,13 +11783,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:11702: checking for tm_gmtoff in struct tm" >&5 +echo "configure:11787: 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 < @@ -11716,7 +11801,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_tm_has_gmtoff=yes @@ -11739,7 +11824,7 @@ fi echo "$ac_t""$wx_cv_struct_tm_has_gmtoff" 1>&6 elif test "$ac_cv_func_gettimeofday" = "yes"; then echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6 -echo "configure:11743: checking whether gettimeofday takes two arguments" >&5 +echo "configure:11828: 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 @@ -11754,7 +11839,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -11768,7 +11853,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=yes else @@ -11776,7 +11861,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -11789,7 +11874,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=no else @@ -11833,12 +11918,12 @@ fi if test "$wxUSE_SOCKETS" = "yes"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:11837: checking for socket" >&5 +echo "configure:11922: 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:11951: \"$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 @@ -11879,7 +11965,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:11883: checking for socket in -lsocket" >&5 +echo "configure:11969: 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 @@ -11887,7 +11973,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:11988: \"$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 @@ -11938,16 +12024,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking the type of the third argument of getsockname""... $ac_c" 1>&6 -echo "configure:11942: checking the type of the third argument of getsockname" >&5 +echo "configure:12028: checking the type of the third argument of getsockname" >&5 cat > conftest.$ac_ext < int main() { socklen_t len; getsockname(0, 0, &len); ; return 0; } EOF -if { (eval echo configure:11951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T socklen_t @@ -11958,14 +12044,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { size_t len; getsockname(0, 0, &len); ; return 0; } EOF -if { (eval echo configure:11969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T size_t @@ -11976,14 +12062,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { int len; getsockname(0, 0, &len); ; return 0; } EOF -if { (eval echo configure:11987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T int @@ -12015,7 +12101,7 @@ cross_compiling=$ac_cv_prog_cc_cross #define wxUSE_SOCKETS 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets" INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol" fi @@ -12025,17 +12111,17 @@ if test "$wxUSE_JOYSTICK" = 1; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12029: checking for $ac_hdr" >&5 +echo "configure:12115: 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:12039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12125: \"$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* @@ -12077,12 +12163,12 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12081: checking for $ac_func" >&5 +echo "configure:12167: 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:12196: \"$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 @@ -12133,7 +12220,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:12137: checking for dlopen in -ldl" >&5 +echo "configure:12224: 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 @@ -12141,7 +12228,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:12243: \"$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 @@ -12181,12 +12268,12 @@ else for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12185: checking for $ac_func" >&5 +echo "configure:12272: 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:12301: \"$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 @@ -12438,17 +12526,17 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12442: checking for $ac_hdr" >&5 +echo "configure:12530: 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:12452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12540: \"$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* @@ -12891,15 +12979,21 @@ LDFLAGS="$LDFLAGS $PROFILE" if test "$wxUSE_GUI" = "yes"; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \ - font forty fractal image minimal richedit wxpoem" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs drawing dynamic \ + font fractal image minimal richedit" CPPFLAGS="$CPPFLAGS \$(EXTRADEFS)" else SAMPLES_SUBDIRS="" fi -SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '`" +SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`" + + + + + + @@ -12958,7 +13052,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:12962: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:13056: 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 @@ -13084,7 +13178,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13" + echo "$CONFIG_STATUS generated by autoconf version 2.14" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -13101,9 +13195,16 @@ trap 'rm -fr `echo " src/makeprog.env src/makelib.env Makefile + demos/Makefile + demos/bombs/Makefile + demos/dbbrowse/Makefile + demos/forty/Makefile + demos/fractal/Makefile + demos/life/Makefile + demos/poem/Makefile samples/Makefile - samples/bombs/Makefile samples/caret/Makefile + samples/calendar/Makefile samples/checklst/Makefile samples/config/Makefile samples/controls/Makefile @@ -13114,22 +13215,25 @@ trap 'rm -fr `echo " samples/docvwmdi/Makefile samples/dnd/Makefile samples/drawing/Makefile - samples/forty/Makefile + samples/exec/Makefile samples/font/Makefile - samples/fractal/Makefile + samples/grid/Makefile + samples/help/Makefile samples/image/Makefile samples/internat/Makefile + samples/ipc/Makefile samples/layout/Makefile samples/listctrl/Makefile samples/mdi/Makefile samples/minifram/Makefile samples/minimal/Makefile - samples/nettest/Makefile + samples/dialup/Makefile samples/newgrid/Makefile samples/notebook/Makefile samples/png/Makefile samples/printing/Makefile samples/proplist/Makefile + samples/propsize/Makefile samples/richedit/Makefile samples/resource/Makefile samples/sashtest/Makefile @@ -13142,8 +13246,7 @@ trap 'rm -fr `echo " samples/treectrl/Makefile samples/typetest/Makefile samples/validate/Makefile - samples/wxpoem/Makefile - samples/wxsocket/Makefile + samples/sockets/Makefile samples/wizard/Makefile samples/html/Makefile samples/html/about/Makefile @@ -13162,6 +13265,14 @@ trap 'rm -fr `echo " utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile utils/ogl/Makefile utils/ogl/src/Makefile + utils/makegen/Makefile + utils/HelpGen/Makefile + utils/HelpGen/src/Makefile + utils/tex2rtf/Makefile + utils/tex2rtf/src/Makefile + utils/hhp2cached/Makefile + utils/dialoged/Makefile + utils/dialoged/src/Makefile setup.h:setup.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF