X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70f7a477cb1aabfd6351a2a0d0555faf96c61dff..ee284519e408d285fd5e416f5de214fd31fd8417:/configure diff --git a/configure b/configure index 9ff8d71163..58cfbdf7cd 100755 --- a/configure +++ b/configure @@ -34,6 +34,8 @@ + + @@ -83,6 +85,8 @@ ac_help="$ac_help ac_help="$ac_help --enable-shared create shared library code" ac_help="$ac_help +--enable-burnt_name create set name in shared library " +ac_help="$ac_help --enable-optimise create optimised code" ac_help="$ac_help --enable-debug same as debug_flag and debug_info" @@ -147,6 +151,8 @@ ac_help="$ac_help ac_help="$ac_help --enable-std_iostreams use standard C++ stream classes" ac_help="$ac_help +--enable-filesystem use virtual file systems classes" +ac_help="$ac_help --enable-fs_inet use virtual HTTP/FTP filesystems" ac_help="$ac_help --enable-fs_zip use virtual ZIP filesystems" @@ -267,6 +273,8 @@ ac_help="$ac_help ac_help="$ac_help --enable-busyinfo use wxBusyInfo" ac_help="$ac_help +--enable-plot use wxPlot" +ac_help="$ac_help --enable-gif use gif images (GIF file format)" ac_help="$ac_help --enable-pcx use pcx images (PCX file format)" @@ -832,7 +840,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:836: checking host system type" >&5 +echo "configure:844: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -853,7 +861,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:857: checking target system type" >&5 +echo "configure:865: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -871,7 +879,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:875: checking build system type" >&5 +echo "configure:883: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -897,7 +905,7 @@ test "$host_alias" != "$target_alias" && WX_MAJOR_VERSION_NUMBER=2 WX_MINOR_VERSION_NUMBER=1 -WX_RELEASE_NUMBER=12 +WX_RELEASE_NUMBER=14 WX_INTERFACE_AGE=0 WX_BINARY_AGE=0 @@ -949,6 +957,8 @@ DEFAULT_DEFAULT_wxUSE_MSW=0 DEFAULT_DEFAULT_wxUSE_WINE=0 DEFAULT_DEFAULT_wxUSE_PM=0 +PROGRAM_EXT= + case "${host}" in *-hp-hpux* ) USE_HPUX=1 @@ -1123,6 +1133,7 @@ EOF #define WINVER 0x0400 EOF + PROGRAM_EXT=".exe" DEFAULT_DEFAULT_wxUSE_MSW=1 ;; @@ -1131,6 +1142,7 @@ EOF #define __EMX__ 1 EOF + PROGRAM_EXT=".exe" DEFAULT_DEFAULT_wxUSE_PM=1 ;; @@ -1164,7 +1176,7 @@ fi if test "$USE_LINUX" = 1; then echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6 -echo "configure:1168: checking for gettext in -lc" >&5 +echo "configure:1180: 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 @@ -1172,7 +1184,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:1199: \"$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 @@ -1223,6 +1235,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes + DEFAULT_wxUSE_BURNT_NAME=no DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no @@ -1246,6 +1259,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_LIBJPEG=no DEFAULT_wxUSE_LIBTIFF=no DEFAULT_wxUSE_ODBC=no + DEFAULT_wxUSE_OPENGL=no DEFAULT_wxUSE_STD_IOSTREAM=no DEFAULT_wxUSE_FILE=no @@ -1291,6 +1305,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_PROGRESSDLG=no DEFAULT_wxUSE_MINIFRAME=no DEFAULT_wxUSE_HTML=no + DEFAULT_wxUSE_FILESYSTEM=no DEFAULT_wxUSE_FS_INET=no DEFAULT_wxUSE_FS_ZIP=no DEFAULT_wxUSE_BUSYINFO=no @@ -1311,6 +1326,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no DEFAULT_wxUSE_NOTEBOOK=no + DEFAULT_wxUSE_PLOT=no DEFAULT_wxUSE_RADIOBOX=no DEFAULT_wxUSE_RADIOBTN=no DEFAULT_wxUSE_SASH=no @@ -1339,6 +1355,7 @@ else DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes + DEFAULT_wxUSE_BURNT_NAME=no DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no @@ -1361,7 +1378,8 @@ else DEFAULT_wxUSE_LIBPNG=yes DEFAULT_wxUSE_LIBJPEG=yes DEFAULT_wxUSE_LIBTIFF=yes - DEFAULT_wxUSE_ODBC=yes + DEFAULT_wxUSE_ODBC=no + DEFAULT_wxUSE_OPENGL=no DEFAULT_wxUSE_STD_IOSTREAM=no DEFAULT_wxUSE_FILE=yes @@ -1407,6 +1425,7 @@ else DEFAULT_wxUSE_PROGRESSDLG=yes DEFAULT_wxUSE_MINIFRAME=yes DEFAULT_wxUSE_HTML=yes + DEFAULT_wxUSE_FILESYSTEM=yes DEFAULT_wxUSE_FS_INET=yes DEFAULT_wxUSE_FS_ZIP=yes DEFAULT_wxUSE_BUSYINFO=yes @@ -1422,11 +1441,12 @@ else DEFAULT_wxUSE_COMBOBOX=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes - DEFAULT_wxUSE_NEW_GRID=no + DEFAULT_wxUSE_NEW_GRID=yes DEFAULT_wxUSE_IMAGLIST=yes DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes DEFAULT_wxUSE_NOTEBOOK=yes + DEFAULT_wxUSE_PLOT=yes DEFAULT_wxUSE_RADIOBOX=yes DEFAULT_wxUSE_RADIOBTN=yes DEFAULT_wxUSE_SASH=yes @@ -1467,7 +1487,7 @@ done echo $ac_n "checking "for --enable-gui"""... $ac_c" 1>&6 -echo "configure:1471: checking "for --enable-gui"" >&5 +echo "configure:1491: checking "for --enable-gui"" >&5 no_cache=0 # Check whether --enable-gui or --disable-gui was given. if test "${enable_gui+set}" = set; then @@ -1563,7 +1583,7 @@ fi echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6 -echo "configure:1567: checking "for --with-libpng"" >&5 +echo "configure:1587: checking "for --with-libpng"" >&5 no_cache=0 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then @@ -1571,8 +1591,12 @@ if test "${with_libpng+set}" = set; then if test "$withval" = yes; then ac_cv_use_libpng='wxUSE_LIBPNG=yes' - else + elif test "$withval" = no; then ac_cv_use_libpng='wxUSE_LIBPNG=no' + elif test "$withval" = sys; then + ac_cv_use_libpng='wxUSE_LIBPNG=sys' + else + { echo "configure: error: Invalid value for --with-libpng: should be yes, no or sys" 1>&2; exit 1; } fi else @@ -1596,13 +1620,17 @@ fi if test "$wxUSE_LIBPNG" = yes; then echo "$ac_t""yes" 1>&6 - else + elif test "$wxUSE_LIBPNG" = no; then echo "$ac_t""no" 1>&6 + elif test "$wxUSE_LIBPNG" = sys; then + echo "$ac_t""system version" 1>&6 + else + { echo "configure: error: Invalid value for --with-libpng: should be yes, no or sys" 1>&2; exit 1; } fi echo $ac_n "checking "for --with-libjpeg"""... $ac_c" 1>&6 -echo "configure:1606: checking "for --with-libjpeg"" >&5 +echo "configure:1634: checking "for --with-libjpeg"" >&5 no_cache=0 # Check whether --with-libjpeg or --without-libjpeg was given. if test "${with_libjpeg+set}" = set; then @@ -1610,8 +1638,12 @@ if test "${with_libjpeg+set}" = set; then if test "$withval" = yes; then ac_cv_use_libjpeg='wxUSE_LIBJPEG=yes' - else + elif test "$withval" = no; then ac_cv_use_libjpeg='wxUSE_LIBJPEG=no' + elif test "$withval" = sys; then + ac_cv_use_libjpeg='wxUSE_LIBJPEG=sys' + else + { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no or sys" 1>&2; exit 1; } fi else @@ -1635,13 +1667,17 @@ fi if test "$wxUSE_LIBJPEG" = yes; then echo "$ac_t""yes" 1>&6 - else + elif test "$wxUSE_LIBJPEG" = no; then echo "$ac_t""no" 1>&6 + elif test "$wxUSE_LIBJPEG" = sys; then + echo "$ac_t""system version" 1>&6 + else + { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no or sys" 1>&2; exit 1; } fi echo $ac_n "checking "for --with-libtiff"""... $ac_c" 1>&6 -echo "configure:1645: checking "for --with-libtiff"" >&5 +echo "configure:1681: checking "for --with-libtiff"" >&5 no_cache=0 # Check whether --with-libtiff or --without-libtiff was given. if test "${with_libtiff+set}" = set; then @@ -1649,8 +1685,12 @@ if test "${with_libtiff+set}" = set; then if test "$withval" = yes; then ac_cv_use_libtiff='wxUSE_LIBTIFF=yes' - else + elif test "$withval" = no; then ac_cv_use_libtiff='wxUSE_LIBTIFF=no' + elif test "$withval" = sys; then + ac_cv_use_libtiff='wxUSE_LIBTIFF=sys' + else + { echo "configure: error: Invalid value for --with-libtiff: should be yes, no or sys" 1>&2; exit 1; } fi else @@ -1674,13 +1714,17 @@ fi if test "$wxUSE_LIBTIFF" = yes; then echo "$ac_t""yes" 1>&6 - else + elif test "$wxUSE_LIBTIFF" = no; then echo "$ac_t""no" 1>&6 + elif test "$wxUSE_LIBTIFF" = sys; then + echo "$ac_t""system version" 1>&6 + else + { echo "configure: error: Invalid value for --with-libtiff: should be yes, no or sys" 1>&2; exit 1; } fi echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6 -echo "configure:1684: checking "for --with-opengl"" >&5 +echo "configure:1728: checking "for --with-opengl"" >&5 no_cache=0 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then @@ -1722,7 +1766,7 @@ fi echo $ac_n "checking "for --with-dmalloc"""... $ac_c" 1>&6 -echo "configure:1726: checking "for --with-dmalloc"" >&5 +echo "configure:1770: checking "for --with-dmalloc"" >&5 no_cache=0 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -1761,7 +1805,7 @@ fi echo $ac_n "checking "for --with-zlib"""... $ac_c" 1>&6 -echo "configure:1765: checking "for --with-zlib"" >&5 +echo "configure:1809: checking "for --with-zlib"" >&5 no_cache=0 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -1769,8 +1813,12 @@ if test "${with_zlib+set}" = set; then if test "$withval" = yes; then ac_cv_use_zlib='wxUSE_ZLIB=yes' - else + elif test "$withval" = no; then ac_cv_use_zlib='wxUSE_ZLIB=no' + elif test "$withval" = sys; then + ac_cv_use_zlib='wxUSE_ZLIB=sys' + else + { echo "configure: error: Invalid value for --with-zlib: should be yes, no or sys" 1>&2; exit 1; } fi else @@ -1794,13 +1842,17 @@ fi if test "$wxUSE_ZLIB" = yes; then echo "$ac_t""yes" 1>&6 - else + elif test "$wxUSE_ZLIB" = no; then echo "$ac_t""no" 1>&6 + elif test "$wxUSE_ZLIB" = sys; then + echo "$ac_t""system version" 1>&6 + else + { echo "configure: error: Invalid value for --with-zlib: should be yes, no or sys" 1>&2; exit 1; } fi echo $ac_n "checking "for --with-odbc"""... $ac_c" 1>&6 -echo "configure:1804: checking "for --with-odbc"" >&5 +echo "configure:1856: checking "for --with-odbc"" >&5 no_cache=0 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then @@ -1842,7 +1894,7 @@ fi echo $ac_n "checking "for --enable-shared"""... $ac_c" 1>&6 -echo "configure:1846: checking "for --enable-shared"" >&5 +echo "configure:1898: checking "for --enable-shared"" >&5 no_cache=0 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then @@ -1880,8 +1932,47 @@ fi fi + echo $ac_n "checking "for --enable-burnt_name"""... $ac_c" 1>&6 +echo "configure:1937: checking "for --enable-burnt_name"" >&5 + no_cache=0 + # Check whether --enable-burnt_name or --disable-burnt_name was given. +if test "${enable_burnt_name+set}" = set; then + enableval="$enable_burnt_name" + + if test "$enableval" = yes; then + ac_cv_use_burnt_name='wxUSE_BURNT_NAME=yes' + else + ac_cv_use_burnt_name='wxUSE_BURNT_NAME=no' + fi + +else + + LINE=`grep "wxUSE_BURNT_NAME" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_burnt_name='wxUSE_BURNT_NAME='$DEFAULT_wxUSE_BURNT_NAME + +fi + + + eval "$ac_cv_use_burnt_name" + if test "$no_cache" != 1; then + echo $ac_cv_use_burnt_name >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_BURNT_NAME" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking "for --enable-optimise"""... $ac_c" 1>&6 -echo "configure:1885: checking "for --enable-optimise"" >&5 +echo "configure:1976: checking "for --enable-optimise"" >&5 no_cache=0 # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then @@ -1920,7 +2011,7 @@ fi echo $ac_n "checking "for --enable-debug"""... $ac_c" 1>&6 -echo "configure:1924: checking "for --enable-debug"" >&5 +echo "configure:2015: checking "for --enable-debug"" >&5 no_cache=0 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -1968,7 +2059,7 @@ fi echo $ac_n "checking "for --enable-debug_flag"""... $ac_c" 1>&6 -echo "configure:1972: checking "for --enable-debug_flag"" >&5 +echo "configure:2063: checking "for --enable-debug_flag"" >&5 no_cache=0 # Check whether --enable-debug_flag or --disable-debug_flag was given. if test "${enable_debug_flag+set}" = set; then @@ -2007,7 +2098,7 @@ fi echo $ac_n "checking "for --enable-debug_info"""... $ac_c" 1>&6 -echo "configure:2011: checking "for --enable-debug_info"" >&5 +echo "configure:2102: checking "for --enable-debug_info"" >&5 no_cache=0 # Check whether --enable-debug_info or --disable-debug_info was given. if test "${enable_debug_info+set}" = set; then @@ -2046,7 +2137,7 @@ fi echo $ac_n "checking "for --enable-debug_gdb"""... $ac_c" 1>&6 -echo "configure:2050: checking "for --enable-debug_gdb"" >&5 +echo "configure:2141: checking "for --enable-debug_gdb"" >&5 no_cache=0 # Check whether --enable-debug_gdb or --disable-debug_gdb was given. if test "${enable_debug_gdb+set}" = set; then @@ -2085,7 +2176,7 @@ fi echo $ac_n "checking "for --enable-debug_cntxt"""... $ac_c" 1>&6 -echo "configure:2089: checking "for --enable-debug_cntxt"" >&5 +echo "configure:2180: checking "for --enable-debug_cntxt"" >&5 no_cache=0 # Check whether --enable-debug_cntxt or --disable-debug_cntxt was given. if test "${enable_debug_cntxt+set}" = set; then @@ -2124,7 +2215,7 @@ fi echo $ac_n "checking "for --enable-mem_tracing"""... $ac_c" 1>&6 -echo "configure:2128: checking "for --enable-mem_tracing"" >&5 +echo "configure:2219: checking "for --enable-mem_tracing"" >&5 no_cache=0 # Check whether --enable-mem_tracing or --disable-mem_tracing was given. if test "${enable_mem_tracing+set}" = set; then @@ -2163,7 +2254,7 @@ fi echo $ac_n "checking "for --enable-profile"""... $ac_c" 1>&6 -echo "configure:2167: checking "for --enable-profile"" >&5 +echo "configure:2258: checking "for --enable-profile"" >&5 no_cache=0 # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then @@ -2202,7 +2293,7 @@ fi echo $ac_n "checking "for --enable-no_rtti"""... $ac_c" 1>&6 -echo "configure:2206: checking "for --enable-no_rtti"" >&5 +echo "configure:2297: checking "for --enable-no_rtti"" >&5 no_cache=0 # Check whether --enable-no_rtti or --disable-no_rtti was given. if test "${enable_no_rtti+set}" = set; then @@ -2241,7 +2332,7 @@ fi echo $ac_n "checking "for --enable-no_exceptions"""... $ac_c" 1>&6 -echo "configure:2245: checking "for --enable-no_exceptions"" >&5 +echo "configure:2336: checking "for --enable-no_exceptions"" >&5 no_cache=0 # Check whether --enable-no_exceptions or --disable-no_exceptions was given. if test "${enable_no_exceptions+set}" = set; then @@ -2280,7 +2371,7 @@ fi echo $ac_n "checking "for --enable-permissive"""... $ac_c" 1>&6 -echo "configure:2284: checking "for --enable-permissive"" >&5 +echo "configure:2375: checking "for --enable-permissive"" >&5 no_cache=0 # Check whether --enable-permissive or --disable-permissive was given. if test "${enable_permissive+set}" = set; then @@ -2319,7 +2410,7 @@ fi echo $ac_n "checking "for --enable-no_deps"""... $ac_c" 1>&6 -echo "configure:2323: checking "for --enable-no_deps"" >&5 +echo "configure:2414: checking "for --enable-no_deps"" >&5 no_cache=0 # Check whether --enable-no_deps or --disable-no_deps was given. if test "${enable_no_deps+set}" = set; then @@ -2360,7 +2451,7 @@ fi echo $ac_n "checking "for --enable-intl"""... $ac_c" 1>&6 -echo "configure:2364: checking "for --enable-intl"" >&5 +echo "configure:2455: checking "for --enable-intl"" >&5 no_cache=0 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then @@ -2399,7 +2490,7 @@ fi echo $ac_n "checking "for --enable-config"""... $ac_c" 1>&6 -echo "configure:2403: checking "for --enable-config"" >&5 +echo "configure:2494: checking "for --enable-config"" >&5 no_cache=0 # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -2437,10 +2528,9 @@ fi fi -if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking "for --enable-sockets"""... $ac_c" 1>&6 -echo "configure:2444: checking "for --enable-sockets"" >&5 +echo "configure:2534: checking "for --enable-sockets"" >&5 no_cache=0 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then @@ -2477,13 +2567,10 @@ fi echo "$ac_t""no" 1>&6 fi -else -wxUSE_SOCKETS=no -fi echo $ac_n "checking "for --enable-dialupman"""... $ac_c" 1>&6 -echo "configure:2487: checking "for --enable-dialupman"" >&5 +echo "configure:2574: checking "for --enable-dialupman"" >&5 no_cache=0 # Check whether --enable-dialupman or --disable-dialupman was given. if test "${enable_dialupman+set}" = set; then @@ -2522,7 +2609,7 @@ fi echo $ac_n "checking "for --enable-ipc"""... $ac_c" 1>&6 -echo "configure:2526: checking "for --enable-ipc"" >&5 +echo "configure:2613: checking "for --enable-ipc"" >&5 no_cache=0 # Check whether --enable-ipc or --disable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -2561,7 +2648,7 @@ fi echo $ac_n "checking "for --enable-apple_ieee"""... $ac_c" 1>&6 -echo "configure:2565: checking "for --enable-apple_ieee"" >&5 +echo "configure:2652: checking "for --enable-apple_ieee"" >&5 no_cache=0 # Check whether --enable-apple_ieee or --disable-apple_ieee was given. if test "${enable_apple_ieee+set}" = set; then @@ -2600,7 +2687,7 @@ fi echo $ac_n "checking "for --enable-timedate"""... $ac_c" 1>&6 -echo "configure:2604: checking "for --enable-timedate"" >&5 +echo "configure:2691: checking "for --enable-timedate"" >&5 no_cache=0 # Check whether --enable-timedate or --disable-timedate was given. if test "${enable_timedate+set}" = set; then @@ -2639,7 +2726,7 @@ fi echo $ac_n "checking "for --enable-wave"""... $ac_c" 1>&6 -echo "configure:2643: checking "for --enable-wave"" >&5 +echo "configure:2730: checking "for --enable-wave"" >&5 no_cache=0 # Check whether --enable-wave or --disable-wave was given. if test "${enable_wave+set}" = set; then @@ -2678,7 +2765,7 @@ fi echo $ac_n "checking "for --enable-fraction"""... $ac_c" 1>&6 -echo "configure:2682: checking "for --enable-fraction"" >&5 +echo "configure:2769: checking "for --enable-fraction"" >&5 no_cache=0 # Check whether --enable-fraction or --disable-fraction was given. if test "${enable_fraction+set}" = set; then @@ -2717,7 +2804,7 @@ fi echo $ac_n "checking "for --enable-dynlib"""... $ac_c" 1>&6 -echo "configure:2721: checking "for --enable-dynlib"" >&5 +echo "configure:2808: checking "for --enable-dynlib"" >&5 no_cache=0 # Check whether --enable-dynlib or --disable-dynlib was given. if test "${enable_dynlib+set}" = set; then @@ -2756,7 +2843,7 @@ fi echo $ac_n "checking "for --enable-longlong"""... $ac_c" 1>&6 -echo "configure:2760: checking "for --enable-longlong"" >&5 +echo "configure:2847: checking "for --enable-longlong"" >&5 no_cache=0 # Check whether --enable-longlong or --disable-longlong was given. if test "${enable_longlong+set}" = set; then @@ -2795,7 +2882,7 @@ fi echo $ac_n "checking "for --enable-log"""... $ac_c" 1>&6 -echo "configure:2799: checking "for --enable-log"" >&5 +echo "configure:2886: checking "for --enable-log"" >&5 no_cache=0 # Check whether --enable-log or --disable-log was given. if test "${enable_log+set}" = set; then @@ -2834,7 +2921,7 @@ fi echo $ac_n "checking "for --enable-streams"""... $ac_c" 1>&6 -echo "configure:2838: checking "for --enable-streams"" >&5 +echo "configure:2925: checking "for --enable-streams"" >&5 no_cache=0 # Check whether --enable-streams or --disable-streams was given. if test "${enable_streams+set}" = set; then @@ -2873,7 +2960,7 @@ fi echo $ac_n "checking "for --enable-file"""... $ac_c" 1>&6 -echo "configure:2877: checking "for --enable-file"" >&5 +echo "configure:2964: checking "for --enable-file"" >&5 no_cache=0 # Check whether --enable-file or --disable-file was given. if test "${enable_file+set}" = set; then @@ -2912,7 +2999,7 @@ fi echo $ac_n "checking "for --enable-textfile"""... $ac_c" 1>&6 -echo "configure:2916: checking "for --enable-textfile"" >&5 +echo "configure:3003: checking "for --enable-textfile"" >&5 no_cache=0 # Check whether --enable-textfile or --disable-textfile was given. if test "${enable_textfile+set}" = set; then @@ -2951,7 +3038,7 @@ fi echo $ac_n "checking "for --enable-unicode"""... $ac_c" 1>&6 -echo "configure:2955: checking "for --enable-unicode"" >&5 +echo "configure:3042: checking "for --enable-unicode"" >&5 no_cache=0 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then @@ -2990,7 +3077,7 @@ fi echo $ac_n "checking "for --enable-wcsrtombs"""... $ac_c" 1>&6 -echo "configure:2994: checking "for --enable-wcsrtombs"" >&5 +echo "configure:3081: checking "for --enable-wcsrtombs"" >&5 no_cache=0 # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given. if test "${enable_wcsrtombs+set}" = set; then @@ -3029,7 +3116,7 @@ fi echo $ac_n "checking "for --enable-wxprintfv"""... $ac_c" 1>&6 -echo "configure:3033: checking "for --enable-wxprintfv"" >&5 +echo "configure:3120: checking "for --enable-wxprintfv"" >&5 no_cache=0 # Check whether --enable-wxprintfv or --disable-wxprintfv was given. if test "${enable_wxprintfv+set}" = set; then @@ -3068,7 +3155,7 @@ fi echo $ac_n "checking "for --enable-joystick"""... $ac_c" 1>&6 -echo "configure:3072: checking "for --enable-joystick"" >&5 +echo "configure:3159: checking "for --enable-joystick"" >&5 no_cache=0 # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then @@ -3107,7 +3194,7 @@ fi echo $ac_n "checking "for --enable-std_iostreams"""... $ac_c" 1>&6 -echo "configure:3111: checking "for --enable-std_iostreams"" >&5 +echo "configure:3198: checking "for --enable-std_iostreams"" >&5 no_cache=0 # Check whether --enable-std_iostreams or --disable-std_iostreams was given. if test "${enable_std_iostreams+set}" = set; then @@ -3145,8 +3232,47 @@ fi fi + echo $ac_n "checking "for --enable-filesystem"""... $ac_c" 1>&6 +echo "configure:3237: checking "for --enable-filesystem"" >&5 + no_cache=0 + # Check whether --enable-filesystem or --disable-filesystem was given. +if test "${enable_filesystem+set}" = set; then + enableval="$enable_filesystem" + + if test "$enableval" = yes; then + ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes' + else + ac_cv_use_filesystem='wxUSE_FILESYSTEM=no' + fi + +else + + LINE=`grep "wxUSE_FILESYSTEM" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM + +fi + + + eval "$ac_cv_use_filesystem" + if test "$no_cache" != 1; then + echo $ac_cv_use_filesystem >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_FILESYSTEM" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking "for --enable-fs_inet"""... $ac_c" 1>&6 -echo "configure:3150: checking "for --enable-fs_inet"" >&5 +echo "configure:3276: checking "for --enable-fs_inet"" >&5 no_cache=0 # Check whether --enable-fs_inet or --disable-fs_inet was given. if test "${enable_fs_inet+set}" = set; then @@ -3185,7 +3311,7 @@ fi echo $ac_n "checking "for --enable-fs_zip"""... $ac_c" 1>&6 -echo "configure:3189: checking "for --enable-fs_zip"" >&5 +echo "configure:3315: checking "for --enable-fs_zip"" >&5 no_cache=0 # Check whether --enable-fs_zip or --disable-fs_zip was given. if test "${enable_fs_zip+set}" = set; then @@ -3224,7 +3350,7 @@ fi echo $ac_n "checking "for --enable-zipstream"""... $ac_c" 1>&6 -echo "configure:3228: checking "for --enable-zipstream"" >&5 +echo "configure:3354: checking "for --enable-zipstream"" >&5 no_cache=0 # Check whether --enable-zipstream or --disable-zipstream was given. if test "${enable_zipstream+set}" = set; then @@ -3265,7 +3391,7 @@ fi echo $ac_n "checking "for --enable-threads"""... $ac_c" 1>&6 -echo "configure:3269: checking "for --enable-threads"" >&5 +echo "configure:3395: checking "for --enable-threads"" >&5 no_cache=0 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then @@ -3304,7 +3430,7 @@ fi echo $ac_n "checking "for --enable-serial"""... $ac_c" 1>&6 -echo "configure:3308: checking "for --enable-serial"" >&5 +echo "configure:3434: checking "for --enable-serial"" >&5 no_cache=0 # Check whether --enable-serial or --disable-serial was given. if test "${enable_serial+set}" = set; then @@ -3347,7 +3473,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking "for --enable-docview"""... $ac_c" 1>&6 -echo "configure:3351: checking "for --enable-docview"" >&5 +echo "configure:3477: checking "for --enable-docview"" >&5 no_cache=0 # Check whether --enable-docview or --disable-docview was given. if test "${enable_docview+set}" = set; then @@ -3386,7 +3512,7 @@ fi echo $ac_n "checking "for --enable-help"""... $ac_c" 1>&6 -echo "configure:3390: checking "for --enable-help"" >&5 +echo "configure:3516: checking "for --enable-help"" >&5 no_cache=0 # Check whether --enable-help or --disable-help was given. if test "${enable_help+set}" = set; then @@ -3425,7 +3551,7 @@ fi echo $ac_n "checking "for --enable-constraints"""... $ac_c" 1>&6 -echo "configure:3429: checking "for --enable-constraints"" >&5 +echo "configure:3555: checking "for --enable-constraints"" >&5 no_cache=0 # Check whether --enable-constraints or --disable-constraints was given. if test "${enable_constraints+set}" = set; then @@ -3464,7 +3590,7 @@ fi echo $ac_n "checking "for --enable-printarch"""... $ac_c" 1>&6 -echo "configure:3468: checking "for --enable-printarch"" >&5 +echo "configure:3594: checking "for --enable-printarch"" >&5 no_cache=0 # Check whether --enable-printarch or --disable-printarch was given. if test "${enable_printarch+set}" = set; then @@ -3503,7 +3629,7 @@ fi echo $ac_n "checking "for --enable-mdi"""... $ac_c" 1>&6 -echo "configure:3507: checking "for --enable-mdi"" >&5 +echo "configure:3633: checking "for --enable-mdi"" >&5 no_cache=0 # Check whether --enable-mdi or --disable-mdi was given. if test "${enable_mdi+set}" = set; then @@ -3543,7 +3669,7 @@ fi echo $ac_n "checking "for --enable-postscript"""... $ac_c" 1>&6 -echo "configure:3547: checking "for --enable-postscript"" >&5 +echo "configure:3673: checking "for --enable-postscript"" >&5 no_cache=0 # Check whether --enable-postscript or --disable-postscript was given. if test "${enable_postscript+set}" = set; then @@ -3584,7 +3710,7 @@ fi echo $ac_n "checking "for --enable-prologio"""... $ac_c" 1>&6 -echo "configure:3588: checking "for --enable-prologio"" >&5 +echo "configure:3714: checking "for --enable-prologio"" >&5 no_cache=0 # Check whether --enable-prologio or --disable-prologio was given. if test "${enable_prologio+set}" = set; then @@ -3623,7 +3749,7 @@ fi echo $ac_n "checking "for --enable-resources"""... $ac_c" 1>&6 -echo "configure:3627: checking "for --enable-resources"" >&5 +echo "configure:3753: checking "for --enable-resources"" >&5 no_cache=0 # Check whether --enable-resources or --disable-resources was given. if test "${enable_resources+set}" = set; then @@ -3663,7 +3789,7 @@ fi echo $ac_n "checking "for --enable-xresources"""... $ac_c" 1>&6 -echo "configure:3667: checking "for --enable-xresources"" >&5 +echo "configure:3793: checking "for --enable-xresources"" >&5 no_cache=0 # Check whether --enable-xresources or --disable-xresources was given. if test "${enable_xresources+set}" = set; then @@ -3704,7 +3830,7 @@ fi echo $ac_n "checking "for --enable-clipboard"""... $ac_c" 1>&6 -echo "configure:3708: checking "for --enable-clipboard"" >&5 +echo "configure:3834: checking "for --enable-clipboard"" >&5 no_cache=0 # Check whether --enable-clipboard or --disable-clipboard was given. if test "${enable_clipboard+set}" = set; then @@ -3743,7 +3869,7 @@ fi echo $ac_n "checking "for --enable-dnd"""... $ac_c" 1>&6 -echo "configure:3747: checking "for --enable-dnd"" >&5 +echo "configure:3873: checking "for --enable-dnd"" >&5 no_cache=0 # Check whether --enable-dnd or --disable-dnd was given. if test "${enable_dnd+set}" = set; then @@ -3783,7 +3909,7 @@ fi echo $ac_n "checking "for --enable-wxtree"""... $ac_c" 1>&6 -echo "configure:3787: checking "for --enable-wxtree"" >&5 +echo "configure:3913: checking "for --enable-wxtree"" >&5 no_cache=0 # Check whether --enable-wxtree or --disable-wxtree was given. if test "${enable_wxtree+set}" = set; then @@ -3824,7 +3950,7 @@ fi echo $ac_n "checking "for --enable-controls"""... $ac_c" 1>&6 -echo "configure:3828: checking "for --enable-controls"" >&5 +echo "configure:3954: checking "for --enable-controls"" >&5 no_cache=0 # Check whether --enable-controls or --disable-controls was given. if test "${enable_controls+set}" = set; then @@ -3872,7 +3998,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes - DEFAULT_wxUSE_NEW_GRID=no + DEFAULT_wxUSE_NEW_GRID=yes DEFAULT_wxUSE_IMAGLIST=yes DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes @@ -3932,7 +4058,7 @@ fi echo $ac_n "checking "for --enable-accel"""... $ac_c" 1>&6 -echo "configure:3936: checking "for --enable-accel"" >&5 +echo "configure:4062: checking "for --enable-accel"" >&5 no_cache=0 # Check whether --enable-accel or --disable-accel was given. if test "${enable_accel+set}" = set; then @@ -3971,7 +4097,7 @@ fi echo $ac_n "checking "for --enable-caret"""... $ac_c" 1>&6 -echo "configure:3975: checking "for --enable-caret"" >&5 +echo "configure:4101: checking "for --enable-caret"" >&5 no_cache=0 # Check whether --enable-caret or --disable-caret was given. if test "${enable_caret+set}" = set; then @@ -4010,7 +4136,7 @@ fi echo $ac_n "checking "for --enable-bmpbutton"""... $ac_c" 1>&6 -echo "configure:4014: checking "for --enable-bmpbutton"" >&5 +echo "configure:4140: checking "for --enable-bmpbutton"" >&5 no_cache=0 # Check whether --enable-bmpbutton or --disable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then @@ -4049,7 +4175,7 @@ fi echo $ac_n "checking "for --enable-checkbox"""... $ac_c" 1>&6 -echo "configure:4053: checking "for --enable-checkbox"" >&5 +echo "configure:4179: checking "for --enable-checkbox"" >&5 no_cache=0 # Check whether --enable-checkbox or --disable-checkbox was given. if test "${enable_checkbox+set}" = set; then @@ -4088,7 +4214,7 @@ fi echo $ac_n "checking "for --enable-checklst"""... $ac_c" 1>&6 -echo "configure:4092: checking "for --enable-checklst"" >&5 +echo "configure:4218: checking "for --enable-checklst"" >&5 no_cache=0 # Check whether --enable-checklst or --disable-checklst was given. if test "${enable_checklst+set}" = set; then @@ -4127,7 +4253,7 @@ fi echo $ac_n "checking "for --enable-choice"""... $ac_c" 1>&6 -echo "configure:4131: checking "for --enable-choice"" >&5 +echo "configure:4257: checking "for --enable-choice"" >&5 no_cache=0 # Check whether --enable-choice or --disable-choice was given. if test "${enable_choice+set}" = set; then @@ -4166,7 +4292,7 @@ fi echo $ac_n "checking "for --enable-combobox"""... $ac_c" 1>&6 -echo "configure:4170: checking "for --enable-combobox"" >&5 +echo "configure:4296: checking "for --enable-combobox"" >&5 no_cache=0 # Check whether --enable-combobox or --disable-combobox was given. if test "${enable_combobox+set}" = set; then @@ -4205,7 +4331,7 @@ fi echo $ac_n "checking "for --enable-gauge"""... $ac_c" 1>&6 -echo "configure:4209: checking "for --enable-gauge"" >&5 +echo "configure:4335: checking "for --enable-gauge"" >&5 no_cache=0 # Check whether --enable-gauge or --disable-gauge was given. if test "${enable_gauge+set}" = set; then @@ -4244,7 +4370,7 @@ fi echo $ac_n "checking "for --enable-grid"""... $ac_c" 1>&6 -echo "configure:4248: checking "for --enable-grid"" >&5 +echo "configure:4374: checking "for --enable-grid"" >&5 no_cache=0 # Check whether --enable-grid or --disable-grid was given. if test "${enable_grid+set}" = set; then @@ -4283,7 +4409,7 @@ fi echo $ac_n "checking "for --enable-newgrid"""... $ac_c" 1>&6 -echo "configure:4287: checking "for --enable-newgrid"" >&5 +echo "configure:4413: checking "for --enable-newgrid"" >&5 no_cache=0 # Check whether --enable-newgrid or --disable-newgrid was given. if test "${enable_newgrid+set}" = set; then @@ -4322,7 +4448,7 @@ fi echo $ac_n "checking "for --enable-imaglist"""... $ac_c" 1>&6 -echo "configure:4326: checking "for --enable-imaglist"" >&5 +echo "configure:4452: checking "for --enable-imaglist"" >&5 no_cache=0 # Check whether --enable-imaglist or --disable-imaglist was given. if test "${enable_imaglist+set}" = set; then @@ -4361,7 +4487,7 @@ fi echo $ac_n "checking "for --enable-listbox"""... $ac_c" 1>&6 -echo "configure:4365: checking "for --enable-listbox"" >&5 +echo "configure:4491: checking "for --enable-listbox"" >&5 no_cache=0 # Check whether --enable-listbox or --disable-listbox was given. if test "${enable_listbox+set}" = set; then @@ -4400,7 +4526,7 @@ fi echo $ac_n "checking "for --enable-listctrl"""... $ac_c" 1>&6 -echo "configure:4404: checking "for --enable-listctrl"" >&5 +echo "configure:4530: checking "for --enable-listctrl"" >&5 no_cache=0 # Check whether --enable-listctrl or --disable-listctrl was given. if test "${enable_listctrl+set}" = set; then @@ -4439,7 +4565,7 @@ fi echo $ac_n "checking "for --enable-notebook"""... $ac_c" 1>&6 -echo "configure:4443: checking "for --enable-notebook"" >&5 +echo "configure:4569: checking "for --enable-notebook"" >&5 no_cache=0 # Check whether --enable-notebook or --disable-notebook was given. if test "${enable_notebook+set}" = set; then @@ -4478,7 +4604,7 @@ fi echo $ac_n "checking "for --enable-radiobox"""... $ac_c" 1>&6 -echo "configure:4482: checking "for --enable-radiobox"" >&5 +echo "configure:4608: checking "for --enable-radiobox"" >&5 no_cache=0 # Check whether --enable-radiobox or --disable-radiobox was given. if test "${enable_radiobox+set}" = set; then @@ -4517,7 +4643,7 @@ fi echo $ac_n "checking "for --enable-radiobtn"""... $ac_c" 1>&6 -echo "configure:4521: checking "for --enable-radiobtn"" >&5 +echo "configure:4647: checking "for --enable-radiobtn"" >&5 no_cache=0 # Check whether --enable-radiobtn or --disable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then @@ -4556,7 +4682,7 @@ fi echo $ac_n "checking "for --enable-sash"""... $ac_c" 1>&6 -echo "configure:4560: checking "for --enable-sash"" >&5 +echo "configure:4686: checking "for --enable-sash"" >&5 no_cache=0 # Check whether --enable-sash or --disable-sash was given. if test "${enable_sash+set}" = set; then @@ -4595,7 +4721,7 @@ fi echo $ac_n "checking "for --enable-scrollbar"""... $ac_c" 1>&6 -echo "configure:4599: checking "for --enable-scrollbar"" >&5 +echo "configure:4725: checking "for --enable-scrollbar"" >&5 no_cache=0 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -4634,7 +4760,7 @@ fi echo $ac_n "checking "for --enable-slider"""... $ac_c" 1>&6 -echo "configure:4638: checking "for --enable-slider"" >&5 +echo "configure:4764: checking "for --enable-slider"" >&5 no_cache=0 # Check whether --enable-slider or --disable-slider was given. if test "${enable_slider+set}" = set; then @@ -4673,7 +4799,7 @@ fi echo $ac_n "checking "for --enable-spinbtn"""... $ac_c" 1>&6 -echo "configure:4677: checking "for --enable-spinbtn"" >&5 +echo "configure:4803: checking "for --enable-spinbtn"" >&5 no_cache=0 # Check whether --enable-spinbtn or --disable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then @@ -4712,7 +4838,7 @@ fi echo $ac_n "checking "for --enable-spinctrl"""... $ac_c" 1>&6 -echo "configure:4716: checking "for --enable-spinctrl"" >&5 +echo "configure:4842: checking "for --enable-spinctrl"" >&5 no_cache=0 # Check whether --enable-spinctrl or --disable-spinctrl was given. if test "${enable_spinctrl+set}" = set; then @@ -4751,7 +4877,7 @@ fi echo $ac_n "checking "for --enable-splitter"""... $ac_c" 1>&6 -echo "configure:4755: checking "for --enable-splitter"" >&5 +echo "configure:4881: checking "for --enable-splitter"" >&5 no_cache=0 # Check whether --enable-splitter or --disable-splitter was given. if test "${enable_splitter+set}" = set; then @@ -4790,7 +4916,7 @@ fi echo $ac_n "checking "for --enable-statbmp"""... $ac_c" 1>&6 -echo "configure:4794: checking "for --enable-statbmp"" >&5 +echo "configure:4920: checking "for --enable-statbmp"" >&5 no_cache=0 # Check whether --enable-statbmp or --disable-statbmp was given. if test "${enable_statbmp+set}" = set; then @@ -4829,7 +4955,7 @@ fi echo $ac_n "checking "for --enable-statbox"""... $ac_c" 1>&6 -echo "configure:4833: checking "for --enable-statbox"" >&5 +echo "configure:4959: checking "for --enable-statbox"" >&5 no_cache=0 # Check whether --enable-statbox or --disable-statbox was given. if test "${enable_statbox+set}" = set; then @@ -4868,7 +4994,7 @@ fi echo $ac_n "checking "for --enable-statline"""... $ac_c" 1>&6 -echo "configure:4872: checking "for --enable-statline"" >&5 +echo "configure:4998: checking "for --enable-statline"" >&5 no_cache=0 # Check whether --enable-statline or --disable-statline was given. if test "${enable_statline+set}" = set; then @@ -4907,7 +5033,7 @@ fi echo $ac_n "checking "for --enable-statusbar"""... $ac_c" 1>&6 -echo "configure:4911: checking "for --enable-statusbar"" >&5 +echo "configure:5037: checking "for --enable-statusbar"" >&5 no_cache=0 # Check whether --enable-statusbar or --disable-statusbar was given. if test "${enable_statusbar+set}" = set; then @@ -4946,7 +5072,7 @@ fi echo $ac_n "checking "for --enable-tabdialog"""... $ac_c" 1>&6 -echo "configure:4950: checking "for --enable-tabdialog"" >&5 +echo "configure:5076: checking "for --enable-tabdialog"" >&5 no_cache=0 # Check whether --enable-tabdialog or --disable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then @@ -4985,7 +5111,7 @@ fi echo $ac_n "checking "for --enable-toolbar"""... $ac_c" 1>&6 -echo "configure:4989: checking "for --enable-toolbar"" >&5 +echo "configure:5115: checking "for --enable-toolbar"" >&5 no_cache=0 # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then @@ -5024,7 +5150,7 @@ fi echo $ac_n "checking "for --enable-tbarnative"""... $ac_c" 1>&6 -echo "configure:5028: checking "for --enable-tbarnative"" >&5 +echo "configure:5154: checking "for --enable-tbarnative"" >&5 no_cache=0 # Check whether --enable-tbarnative or --disable-tbarnative was given. if test "${enable_tbarnative+set}" = set; then @@ -5063,7 +5189,7 @@ fi echo $ac_n "checking "for --enable-tbarsmpl"""... $ac_c" 1>&6 -echo "configure:5067: checking "for --enable-tbarsmpl"" >&5 +echo "configure:5193: checking "for --enable-tbarsmpl"" >&5 no_cache=0 # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given. if test "${enable_tbarsmpl+set}" = set; then @@ -5102,7 +5228,7 @@ fi echo $ac_n "checking "for --enable-treectrl"""... $ac_c" 1>&6 -echo "configure:5106: checking "for --enable-treectrl"" >&5 +echo "configure:5232: checking "for --enable-treectrl"" >&5 no_cache=0 # Check whether --enable-treectrl or --disable-treectrl was given. if test "${enable_treectrl+set}" = set; then @@ -5143,7 +5269,7 @@ fi echo $ac_n "checking "for --enable-commondlg"""... $ac_c" 1>&6 -echo "configure:5147: checking "for --enable-commondlg"" >&5 +echo "configure:5273: checking "for --enable-commondlg"" >&5 no_cache=0 # Check whether --enable-commondlg or --disable-commondlg was given. if test "${enable_commondlg+set}" = set; then @@ -5182,7 +5308,7 @@ fi echo $ac_n "checking "for --enable-dirdlg"""... $ac_c" 1>&6 -echo "configure:5186: checking "for --enable-dirdlg"" >&5 +echo "configure:5312: checking "for --enable-dirdlg"" >&5 no_cache=0 # Check whether --enable-dirdlg or --disable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then @@ -5221,7 +5347,7 @@ fi echo $ac_n "checking "for --enable-textdlg"""... $ac_c" 1>&6 -echo "configure:5225: checking "for --enable-textdlg"" >&5 +echo "configure:5351: checking "for --enable-textdlg"" >&5 no_cache=0 # Check whether --enable-textdlg or --disable-textdlg was given. if test "${enable_textdlg+set}" = set; then @@ -5260,7 +5386,7 @@ fi echo $ac_n "checking "for --enable-tipdlg"""... $ac_c" 1>&6 -echo "configure:5264: checking "for --enable-tipdlg"" >&5 +echo "configure:5390: checking "for --enable-tipdlg"" >&5 no_cache=0 # Check whether --enable-tipdlg or --disable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then @@ -5299,7 +5425,7 @@ fi echo $ac_n "checking "for --enable-progressdlg"""... $ac_c" 1>&6 -echo "configure:5303: checking "for --enable-progressdlg"" >&5 +echo "configure:5429: checking "for --enable-progressdlg"" >&5 no_cache=0 # Check whether --enable-progressdlg or --disable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then @@ -5338,7 +5464,7 @@ fi echo $ac_n "checking "for --enable-miniframe"""... $ac_c" 1>&6 -echo "configure:5342: checking "for --enable-miniframe"" >&5 +echo "configure:5468: checking "for --enable-miniframe"" >&5 no_cache=0 # Check whether --enable-miniframe or --disable-miniframe was given. if test "${enable_miniframe+set}" = set; then @@ -5377,7 +5503,7 @@ fi echo $ac_n "checking "for --enable-html"""... $ac_c" 1>&6 -echo "configure:5381: checking "for --enable-html"" >&5 +echo "configure:5507: checking "for --enable-html"" >&5 no_cache=0 # Check whether --enable-html or --disable-html was given. if test "${enable_html+set}" = set; then @@ -5416,7 +5542,7 @@ fi echo $ac_n "checking "for --enable-tooltips"""... $ac_c" 1>&6 -echo "configure:5420: checking "for --enable-tooltips"" >&5 +echo "configure:5546: checking "for --enable-tooltips"" >&5 no_cache=0 # Check whether --enable-tooltips or --disable-tooltips was given. if test "${enable_tooltips+set}" = set; then @@ -5455,7 +5581,7 @@ fi echo $ac_n "checking "for --enable-splines"""... $ac_c" 1>&6 -echo "configure:5459: checking "for --enable-splines"" >&5 +echo "configure:5585: checking "for --enable-splines"" >&5 no_cache=0 # Check whether --enable-splines or --disable-splines was given. if test "${enable_splines+set}" = set; then @@ -5494,7 +5620,7 @@ fi echo $ac_n "checking "for --enable-validators"""... $ac_c" 1>&6 -echo "configure:5498: checking "for --enable-validators"" >&5 +echo "configure:5624: checking "for --enable-validators"" >&5 no_cache=0 # Check whether --enable-validators or --disable-validators was given. if test "${enable_validators+set}" = set; then @@ -5533,7 +5659,7 @@ fi echo $ac_n "checking "for --enable-busyinfo"""... $ac_c" 1>&6 -echo "configure:5537: checking "for --enable-busyinfo"" >&5 +echo "configure:5663: checking "for --enable-busyinfo"" >&5 no_cache=0 # Check whether --enable-busyinfo or --disable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then @@ -5571,10 +5697,49 @@ fi fi + echo $ac_n "checking "for --enable-plot"""... $ac_c" 1>&6 +echo "configure:5702: checking "for --enable-plot"" >&5 + no_cache=0 + # Check whether --enable-plot or --disable-plot was given. +if test "${enable_plot+set}" = set; then + enableval="$enable_plot" + + if test "$enableval" = yes; then + ac_cv_use_plot='wxUSE_PLOT=yes' + else + ac_cv_use_plot='wxUSE_PLOT=no' + fi + +else + + LINE=`grep "wxUSE_PLOT" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_plot='wxUSE_PLOT='$DEFAULT_wxUSE_PLOT + +fi + + + eval "$ac_cv_use_plot" + if test "$no_cache" != 1; then + echo $ac_cv_use_plot >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PLOT" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking "for --enable-gif"""... $ac_c" 1>&6 -echo "configure:5578: checking "for --enable-gif"" >&5 +echo "configure:5743: checking "for --enable-gif"" >&5 no_cache=0 # Check whether --enable-gif or --disable-gif was given. if test "${enable_gif+set}" = set; then @@ -5613,7 +5778,7 @@ fi echo $ac_n "checking "for --enable-pcx"""... $ac_c" 1>&6 -echo "configure:5617: checking "for --enable-pcx"" >&5 +echo "configure:5782: checking "for --enable-pcx"" >&5 no_cache=0 # Check whether --enable-pcx or --disable-pcx was given. if test "${enable_pcx+set}" = set; then @@ -5652,7 +5817,7 @@ fi echo $ac_n "checking "for --enable-pnm"""... $ac_c" 1>&6 -echo "configure:5656: checking "for --enable-pnm"" >&5 +echo "configure:5821: checking "for --enable-pnm"" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -5699,7 +5864,7 @@ fi echo $ac_n "checking for toolkit""... $ac_c" 1>&6 -echo "configure:5703: checking for toolkit" >&5 +echo "configure:5868: checking for toolkit" >&5 if test "$wxUSE_GUI" = "yes"; then @@ -5724,7 +5889,19 @@ else done fi -NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} + ${wxUSE_PM:-0}` +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" + ;; +esac case "$NUM_TOOLKITS" in 1) @@ -5752,6 +5929,7 @@ for toolkit in `echo $ALL_TOOLKITS`; do done else + PATH_IFS=':' echo "$ac_t""base only" 1>&6 fi @@ -5804,23 +5982,22 @@ fi rm -f confcache -if eval "test $host != $build"; then - if eval "test $host_alias != NONE"; then +if test "$build" != "$host" ; then CC=$host_alias-gcc CXX=$host_alias-c++ AR=$host_alias-ar RANLIB=$host_alias-ranlib DLLTOOL=$host_alias-dlltool + RESCOMP=$host_alias-windres LD=$host_alias-ld NM=$host_alias-nm STRIP=$host_alias-strip - fi fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5824: checking for $ac_word" >&5 +echo "configure:6001: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5850,7 +6027,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5854: checking for $ac_word" >&5 +echo "configure:6031: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5901,7 +6078,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5905: checking for $ac_word" >&5 +echo "configure:6082: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5933,7 +6110,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:5937: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:6114: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -5944,12 +6121,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 5948 "configure" +#line 6125 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:5953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -5975,12 +6152,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:5979: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:6156: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:5984: checking whether we are using GNU C" >&5 +echo "configure:6161: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5989,7 +6166,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:5993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:6170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -6008,7 +6185,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:6012: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:6189: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6043,7 +6220,7 @@ fi CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'` echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:6047: checking how to run the C preprocessor" >&5 +echo "configure:6224: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -6058,13 +6235,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -6075,13 +6252,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -6092,13 +6269,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6102: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -6125,13 +6302,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:6129: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:6306: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -6149,7 +6326,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -6185,7 +6362,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6189: checking for $ac_word" >&5 +echo "configure:6366: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6217,7 +6394,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:6221: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:6398: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -6228,12 +6405,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 6232 "configure" +#line 6409 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:6237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -6259,12 +6436,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:6263: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:6440: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:6268: checking whether we are using GNU C++" >&5 +echo "configure:6445: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6273,7 +6450,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:6277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:6454: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -6292,7 +6469,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:6296: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:6473: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6325,7 +6502,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:6329: checking how to run the C++ preprocessor" >&5 +echo "configure:6506: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6338,12 +6515,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -6381,7 +6558,7 @@ cross_compiling=$ac_cv_prog_cc_cross # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6385: checking for $ac_word" >&5 +echo "configure:6562: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6412,7 +6589,7 @@ fi # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6416: checking for $ac_word" >&5 +echo "configure:6593: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6452,7 +6629,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:6456: checking for a BSD compatible install" >&5 +echo "configure:6633: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6508,7 +6685,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6512: checking for $ac_word" >&5 +echo "configure:6689: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6537,7 +6714,7 @@ fi echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6 -echo "configure:6541: checking "make for VPATH support"" >&5 +echo "configure:6718: checking "make for VPATH support"" >&5 cat - << EOF > confMake check : file cp \$? \$@ @@ -6566,7 +6743,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6570: checking for $ac_word" >&5 +echo "configure:6747: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6600,7 +6777,7 @@ test -n "$YACC" || YACC="yacc" # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6604: checking for $ac_word" >&5 +echo "configure:6781: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6634,7 +6811,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:6638: checking for yywrap in -l$ac_lib" >&5 +echo "configure:6815: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6642,7 +6819,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6677,7 +6854,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:6681: checking whether ln -s works" >&5 +echo "configure:6858: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6742,6 +6919,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 \ @@ -6815,8 +6995,12 @@ rm -f confcache +AFMINSTALL= + if test "$wxUSE_GUI" = "yes"; then +USE_GUI=1 + TOOLKIT= TOOLKIT_INCLUDE= @@ -6832,14 +7016,12 @@ 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 + echo "configure: warning: skipping windows.h check for cross-compilation" 1>&2 else echo $ac_n "checking for Windows headers""... $ac_c" 1>&6 -echo "configure:6843: checking for Windows headers" >&5 +echo "configure:7025: checking for Windows headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -6862,6 +7044,10 @@ for ac_dir in $SEARCH_INCLUDE; INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32" + if test "$wxUSE_ODBC" = "yes" ; then + LIBS="$LIBS -lodbc32 -lole32 -loleaut32" + fi + if test "$wxUSE_MINGW" = 1; then LDFLAGS="$LDFLAGS -mwindows" fi @@ -6874,7 +7060,16 @@ for ac_dir in $SEARCH_INCLUDE; GENERICOBJS="\$(MSW_GENERICOBJS)" UNIXOBJS= GUIDIST=MSW_DIST - PROGRAM_EXT=.exe + + RCINCSWITCH="--include-dir" + RCDEFSWITCH="--define" + RCPREPROCESSOR="--preprocessor \"\$(CC) -c -E -xc-header -DRC_INVOKED\"" + RCINPUTSWITCH="-i" + RCOUTPUTSWITCH="-o" + RESFLAGS="$RCPREPROCESSOR $RCINCSWITCH \$(top_srcdir)/include $RCINCSWITCH \$(top_srcdir)/\$(program_dir) $RCDEFSWITCH __WIN32__ $RCDEFSWITCH __WIN95__ $RCDEFSWITCH __GNUWIN32__" + + RESPROGRAM="\$(RES_PROGRAM)" + fi if test "$wxUSE_GTK" = 1; then @@ -6895,7 +7090,7 @@ if test "$wxUSE_GTK" = 1; then # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6899: checking for $ac_word" >&5 +echo "configure:7094: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6930,11 +7125,11 @@ fi min_gtk_version=1.2.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:6934: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:7129: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` - GTK_LIBS=`$GTK_CONFIG --libs` + GTK_LIBS=`$GTK_CONFIG --libs gthread` ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" @@ -6943,12 +7138,13 @@ echo "configure:6934: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < #include #include +#include int main () @@ -6975,7 +7171,7 @@ main () } EOF -if { (eval echo configure:6979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6999,16 +7195,31 @@ 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.3 or above?" 1>&2; exit 1; } + : fi + if test "$WXGTK12" != 1; then + { echo "configure: error: + Please check that gtk-config is in path, the directory + where GTK+ libraries are installed (returned by + 'gtk-config --libs' command) is in LD_LIBRARY_PATH or + equivalent variable and GTK+ is version 1.2.3 or above. + " 1>&2; exit 1; } + fi + + TOOLKIT_INCLUDE="$GTK_CFLAGS" - GUI_TK_LIBRARY="$GTK_LIBS -lgthread" + + + GUI_TK_LIBRARY="$GTK_LIBS" + TOOLKIT=GTK + AFMINSTALL=afminstall + GUIOBJS="\$(GTK_GUIOBJS)" GUIHEADERS="\$(GTK_HEADERS)" COMMONOBJS="\$(GTK_COMMONOBJS)" @@ -7020,8 +7231,8 @@ fi UNIXDEPS="\$(UNIX_DEPS)" GUIDIST=GTK_DIST -echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 -echo "configure:7025: checking for gdk_im_open in -lgdk" >&5 + echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 +echo "configure:7236: checking for gdk_im_open in -lgdk" >&5 ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7029,7 +7240,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgdk $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7063,12 +7274,11 @@ else echo "$ac_t""no" 1>&6 fi - fi if test "$wxUSE_WINE" = 1; then echo $ac_n "checking for WINE includes""... $ac_c" 1>&6 -echo "configure:7072: checking for WINE includes" >&5 +echo "configure:7282: checking for WINE includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -7089,7 +7299,7 @@ for ac_dir in $SEARCH_INCLUDE; XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:7093: checking for Xpm library" >&5 +echo "configure:7303: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -7117,7 +7327,7 @@ EOF MESA_LINK="" echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 -echo "configure:7121: checking for Mesa library" >&5 +echo "configure:7331: checking for Mesa library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -7161,7 +7371,7 @@ if test "$wxUSE_MOTIF" = 1; then # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:7165: checking for X" >&5 +echo "configure:7375: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -7223,12 +7433,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7297,14 +7507,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -7410,17 +7620,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:7414: checking whether -R must be followed by a space" >&5 +echo "configure:7624: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -7436,14 +7646,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -7475,7 +7685,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:7479: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:7689: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7483,7 +7693,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7516,7 +7726,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:7520: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:7730: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7524,7 +7734,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7564,12 +7774,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:7568: checking for gethostbyname" >&5 +echo "configure:7778: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -7613,7 +7823,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:7617: checking for gethostbyname in -lnsl" >&5 +echo "configure:7827: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7621,7 +7831,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7662,12 +7872,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:7666: checking for connect" >&5 +echo "configure:7876: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -7711,7 +7921,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:7715: checking for connect in -lsocket" >&5 +echo "configure:7925: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7719,7 +7929,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7754,12 +7964,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:7758: checking for remove" >&5 +echo "configure:7968: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -7803,7 +8013,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:7807: checking for remove in -lposix" >&5 +echo "configure:8017: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7811,7 +8021,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7846,12 +8056,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:7850: checking for shmat" >&5 +echo "configure:8060: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -7895,7 +8105,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:7899: checking for shmat in -lipc" >&5 +echo "configure:8109: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7903,7 +8113,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7947,7 +8157,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:7951: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:8161: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7955,7 +8165,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7998,9 +8208,13 @@ fi GUI_TK_LIBRARY="$X_LIBS" TOOLKIT_INCLUDE="$X_CFLAGS" + AFMINSTALL=afminstall + + COMPILED_X_PROGRAM=0 + echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 -echo "configure:8004: checking for Motif/Lesstif headers" >&5 +echo "configure:8218: checking for Motif/Lesstif headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -8014,13 +8228,43 @@ for ac_dir in $SEARCH_INCLUDE; if test "$ac_find_includes" != "" ; then echo "$ac_t""found $ac_find_includes" 1>&6 else - echo "$ac_t""no" 1>&6 - { echo "configure: error: please set CFLAGS to contain the location of Xm/Xm.h" 1>&2; exit 1; } + cat > conftest.$ac_ext < + +int main() { + + int version; + + version = xmUseVersion; + +; return 0; } +EOF +if { (eval echo configure:8246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + echo "$ac_t""found in default search path" 1>&6 + COMPILED_X_PROGRAM=1 + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + echo "$ac_t""no" 1>&6 + { echo "configure: error: please set CFLAGS to contain the location of Xm/Xm.h" 1>&2; exit 1; } + + +fi +rm -f conftest* fi - echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 -echo "configure:8023: checking for Motif/Lesstif library" >&5 - + if test "$COMPILED_X_PROGRAM" = 0; then + echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 +echo "configure:8267: checking for Motif/Lesstif library" >&5 + ac_find_libraries= for ac_dir in $SEARCH_LIB; do @@ -8032,8 +8276,8 @@ for ac_dir in $SEARCH_LIB; done done - if test "$ac_find_libraries" != "" ; then - + if test "$ac_find_libraries" != "" ; then + ac_path_to_include=$ac_find_includes echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null result=$? @@ -8043,7 +8287,7 @@ for ac_dir in $SEARCH_LIB; ac_path_to_include="-I$ac_find_includes" fi - + echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null result=$? if test $result = 0; then @@ -8053,48 +8297,48 @@ for ac_dir in $SEARCH_LIB; fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" - echo "$ac_t""found at $ac_find_libraries" 1>&6 - else - echo "$ac_t""no" 1>&6 - { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; } - fi + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" + echo "$ac_t""found at $ac_find_libraries" 1>&6 + else + cat > conftest.$ac_ext <&6 -echo "configure:8066: checking for Xt library" >&5 - -ac_find_libraries= -for ac_dir in $SEARCH_LIB; - do - for ac_extension in a so sl; do - if test -f "$ac_dir/libXt.$ac_extension"; then - ac_find_libraries=$ac_dir - break 2 - fi - done - done + #include + +int main() { - if test "$ac_find_libraries" != "" ; then - - echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null - result=$? - if test $result = 0; then - ac_path_to_link="" - else - ac_path_to_link="-L$ac_find_libraries" - fi + int version; - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - echo "$ac_t""found at $ac_find_libraries" 1>&6 - else - echo "$ac_t""no" 1>&6 - { echo "configure: error: please set LDFLAGS to contain the location of libXt" 1>&2; exit 1; } + version = xmUseVersion; + +; return 0; } +EOF +if { (eval echo configure:8319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + echo "$ac_t""found in default search path" 1>&6 + COMPILED_X_PROGRAM=1 + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + echo "$ac_t""no" 1>&6 + { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; } + + +fi +rm -f conftest* + fi fi + XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:8098: checking for Xpm library" >&5 +echo "configure:8342: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -8125,8 +8369,42 @@ EOF echo "$ac_t""found at $ac_find_libraries" 1>&6 else - echo "$ac_t""no" 1>&6 - echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2 + cat > conftest.$ac_ext < + +int main() { + + int version; + + version = XpmLibraryVersion(); + +; return 0; } +EOF +if { (eval echo configure:8387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + XPM_LINK="-lXpm " + cat >> confdefs.h <<\EOF +#define wxHAVE_LIB_XPM 1 +EOF + + echo "$ac_t""found in default search path" 1>&6 + COMPILED_X_PROGRAM=0 + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + echo "$ac_t""no" 1>&6 + echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2 + + +fi +rm -f conftest* fi GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11 -lm" @@ -8161,18 +8439,25 @@ if test "$wxUSE_PM" = 1; then fi if test "$TOOLKIT" != "PM" ; then - TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"` + TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"` else TOOLKIT_DIR="os2" fi -TOOLKIT_DEF="-D__WX${TOOLKIT}__" + TOOLKIT_DEF="-D__WX${TOOLKIT}__" + + WX_LIBRARY="wx_${TOOLKIT_DIR}" -WX_LIBRARY="wx_${TOOLKIT_DIR}" + ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(OGLOBJS)" + + if test "$TOOLKIT" != "MSW"; then + if test "$wxUSE_ODBC" = "yes" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)" + fi + fi - ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(IODBCOBJS)" if test "$wxUSE_LIBJPEG" = "yes" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)" + ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)" fi if test "$wxUSE_LIBTIFF" = "yes" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)" @@ -8183,26 +8468,48 @@ WX_LIBRARY="wx_${TOOLKIT_DIR}" if test "$wxUSE_ZLIB" = "yes" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" fi - ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)" - ALL_HEADERS="\$(GUIHEADERS) \$(HTML_HEADERS) \$(UNIX_HEADERS) \$(PROTOCOL_HEADERS) \$(GENERIC_HEADERS) \$(WX_HEADERS)" + ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS) \$(OGLDEPS)" + + PORT_FILES="src/\$(TOOLKITDIR)/files.lst" + RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst" + RPM_SPEC="wx\$(TOOLKIT).spec" + + GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST" + DISTDIR="wx\$(TOOLKIT)" else - - ALL_OBJECTS="\$(BASE_OBJS)" - ALL_DEPFILES="\${BASE_DEPS}" - ALL_HEADERS="\${BASE_HEADERS}" + USE_GUI=0 + + TOOLKIT_DIR="base" + TOOLKIT_DEF="-D__WXBASE__" + + ALL_OBJECTS="\$(BASE_OBJS) \${BASE_UNIX_OBJS}" + ALL_DEPFILES="\${BASE_DEPS} \${BASE_UNIX_DEPS}" WX_LIBRARY="wxbase" + + PORT_FILES="src/files.lst" + RPM_FILES="src/rpmfiles.lst" + RPM_SPEC="wxBase.spec" + + GUIDIST="BASE_DIST" + DISTDIR="wxBase" fi WX_LIBRARY_NAME="lib${WX_LIBRARY}.la" +WX_LIBRARY_NAME_GL="lib${WX_LIBRARY}_gl.la" WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" +WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a" WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" +WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}" WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so" WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so" +WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}" +WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so" +WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so" SHARED_LD= PIC_FLAG= @@ -8222,15 +8529,29 @@ if test "$wxUSE_SHARED" = "yes"; then PIC_FLAG="+Z" fi WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl" - WX_ALL=${WX_LIBRARY_NAME_SHARED} - ;; + WX_LIBRARY_NAME_SHARED_GL="libwx_${TOOLKIT_DIR}_gl.sl" + if test "$wxUSE_OPENGL" = "yes"; then + WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}" + else + WX_ALL="${WX_LIBRARY_NAME_SHARED}" + fi + ;; *-*-linux* ) SHARED_LD="${CC} -shared -o" PIC_FLAG="-fPIC" - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" - ;; + if test "$wxUSE_BURNT_NAME" = "yes" ; then + BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}" + BURNT_LIBRARY_NAME_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}" + fi + if test "$wxUSE_OPENGL" = "yes"; then + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" + WX_ALL="CREATE_LINKS CREATE_LINKS_GL" + else + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" + WX_ALL="CREATE_LINKS" + fi + ;; *-*-irix5* | *-*-irix6* ) if test "$GCC" = yes ; then SHARED_LD="${CC} -shared -o" @@ -8238,8 +8559,13 @@ if test "$wxUSE_SHARED" = "yes"; then else SHARED_LD="${CXX} -shared -o" fi - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" + if test "$wxUSE_OPENGL" = "yes"; then + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" + WX_ALL="CREATE_LINKS CREATE_LINKS_GL" + else + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" + WX_ALL="CREATE_LINKS" + fi ;; *-*-solaris2* ) if test "$GCC" = yes ; then @@ -8249,8 +8575,13 @@ if test "$wxUSE_SHARED" = "yes"; then SHARED_LD="${CXX} -G -o" PIC_FLAG="-KPIC" fi - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" + if test "$wxUSE_OPENGL" = "yes"; then + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" + WX_ALL="CREATE_LINKS CREATE_LINKS_GL" + else + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" + WX_ALL="CREATE_LINKS" + fi ;; *-*-sunos4* ) SHARED_LD="${CC} -shared -o" @@ -8288,10 +8619,12 @@ if test "$wxUSE_SHARED" = "yes"; then ;; *-*-cygwin32* ) WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" + WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" WX_ALL="${WX_LIBRARY_NAME_STATIC}" ;; *-*-mingw32* ) WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" + WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" WX_ALL="${WX_LIBRARY_NAME_STATIC}" ;; *-pc-os2_emx ) @@ -8310,9 +8643,11 @@ if test "$wxUSE_SHARED" = "yes"; then if test "x$WX_TARGET_LIBRARY" = "x"; then WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}" + WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}" fi else WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" + WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" WX_ALL="${WX_LIBRARY_NAME_STATIC}" fi @@ -8321,17 +8656,17 @@ for ac_hdr in strings.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8325: checking for $ac_hdr" >&5 +echo "configure:8660: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8670: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8361,17 +8696,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8365: checking for $ac_hdr" >&5 +echo "configure:8700: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8401,17 +8736,17 @@ for ac_hdr in wchar.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8405: checking for $ac_hdr" >&5 +echo "configure:8740: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8441,17 +8776,17 @@ for ac_hdr in wcstr.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8445: checking for $ac_hdr" >&5 +echo "configure:8780: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8455: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8481,17 +8816,17 @@ for ac_hdr in fnmatch.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8485: checking for $ac_hdr" >&5 +echo "configure:8820: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8519,21 +8854,22 @@ done if test "$wxUSE_GUI" = "yes"; then - for ac_hdr in X11/XKBlib.h + if test "$wxUSE_UNIX" = "yes"; then + for ac_hdr in X11/XKBlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8527: checking for $ac_hdr" >&5 +echo "configure:8863: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8559,16 +8895,17 @@ else fi done + fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:8567: checking for ANSI C header files" >&5 +echo "configure:8904: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8576,7 +8913,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8593,7 +8930,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -8611,7 +8948,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -8632,7 +8969,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -8643,7 +8980,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:8647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -8667,12 +9004,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:8671: checking for mode_t" >&5 +echo "configure:9008: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -8700,12 +9037,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:8704: checking for off_t" >&5 +echo "configure:9041: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -8733,12 +9070,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:8737: checking for pid_t" >&5 +echo "configure:9074: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -8766,12 +9103,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:8770: checking for size_t" >&5 +echo "configure:9107: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -8799,12 +9136,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:8803: checking for uid_t in sys/types.h" >&5 +echo "configure:9140: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -8835,13 +9172,13 @@ fi echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6 -echo "configure:8839: checking for pw_gecos in struct passwd" >&5 +echo "configure:9176: checking for pw_gecos in struct passwd" >&5 if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -8852,7 +9189,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_pw_gecos=yes @@ -8879,12 +9216,12 @@ echo "$ac_t""$wx_cv_struct_pw_gecos" 1>&6 echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:8883: checking for working const" >&5 +echo "configure:9220: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -8954,21 +9291,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:8958: checking for inline" >&5 +echo "configure:9295: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -8995,7 +9332,7 @@ esac echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:8999: checking size of char" >&5 +echo "configure:9336: checking size of char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9003,7 +9340,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < main() @@ -9014,7 +9351,7 @@ main() exit(0); } EOF -if { (eval echo configure:9018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -9034,7 +9371,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:9038: checking size of short" >&5 +echo "configure:9375: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9042,7 +9379,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < main() @@ -9053,7 +9390,7 @@ main() exit(0); } EOF -if { (eval echo configure:9057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -9073,7 +9410,7 @@ EOF echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:9077: checking size of int *" >&5 +echo "configure:9414: checking size of int *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9081,7 +9418,7 @@ else ac_cv_sizeof_int_p=4 else cat > conftest.$ac_ext < main() @@ -9092,7 +9429,7 @@ main() exit(0); } EOF -if { (eval echo configure:9096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_p=`cat conftestval` else @@ -9112,7 +9449,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:9116: checking size of int" >&5 +echo "configure:9453: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9120,7 +9457,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -9131,7 +9468,7 @@ main() exit(0); } EOF -if { (eval echo configure:9135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -9151,7 +9488,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:9155: checking size of long" >&5 +echo "configure:9492: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9159,7 +9496,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -9170,7 +9507,7 @@ main() exit(0); } EOF -if { (eval echo configure:9174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -9190,7 +9527,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:9194: checking size of long long" >&5 +echo "configure:9531: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9198,7 +9535,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -9209,7 +9546,7 @@ main() exit(0); } EOF -if { (eval echo configure:9213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -9230,14 +9567,14 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:9234: checking whether byte ordering is bigendian" >&5 +echo "configure:9571: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -9248,11 +9585,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:9252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -9263,7 +9600,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:9267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -9283,7 +9620,7 @@ if test "$cross_compiling" = yes; then ac_cv_c_bigendian=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -9343,17 +9680,17 @@ cross_compiling=$ac_cv_prog_cxx_cross do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9347: checking for $ac_hdr" >&5 +echo "configure:9684: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9401,7 +9738,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:9405: checking if C++ compiler supports bool" >&5 +echo "configure:9742: checking if C++ compiler supports bool" >&5 if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9416,7 +9753,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -9470,13 +9807,13 @@ EOF echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6 -echo "configure:9474: checking if you need GNU extensions" >&5 +echo "configure:9811: checking if you need GNU extensions" >&5 if eval "test \"`echo '$''{'wx_cv_gnu_extensions'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -9489,7 +9826,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_gnu_extensions=yes else @@ -9514,7 +9851,7 @@ fi echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6 -echo "configure:9518: checking for wcslen in -lc" >&5 +echo "configure:9855: checking for wcslen in -lc" >&5 ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9522,7 +9859,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9559,7 +9896,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:9563: checking for wcslen in -lw" >&5 +echo "configure:9900: checking for wcslen in -lw" >&5 ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9567,7 +9904,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9609,12 +9946,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:9613: checking for vprintf" >&5 +echo "configure:9950: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -9661,12 +9998,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:9665: checking for _doprnt" >&5 +echo "configure:10002: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -9717,12 +10054,12 @@ fi for ac_func in vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9721: checking for $ac_func" >&5 +echo "configure:10058: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9785,7 +10122,7 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 -echo "configure:9789: checking for vsscanf" >&5 +echo "configure:10126: checking for vsscanf" >&5 if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9795,7 +10132,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF @@ -9853,17 +10190,17 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross -if test "$USE_UNIX" = 1; then +if test "$TOOLKIT" != "MSW"; then for ac_func in vfork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9862: checking for $ac_func" >&5 +echo "configure:10199: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9914,12 +10251,12 @@ done for ac_func in timegm do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9918: checking for $ac_func" >&5 +echo "configure:10255: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9981,12 +10318,12 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then for ac_func in nanosleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9985: checking for $ac_func" >&5 +echo "configure:10322: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10034,7 +10371,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:10038: checking for nanosleep in -lposix4" >&5 +echo "configure:10375: checking for nanosleep in -lposix4" >&5 ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10042,7 +10379,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10081,12 +10418,12 @@ else for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10085: checking for $ac_func" >&5 +echo "configure:10422: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10148,12 +10485,12 @@ fi for ac_func in uname gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10152: checking for $ac_func" >&5 +echo "configure:10489: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10201,20 +10538,32 @@ fi done + +ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + + for ac_func in strtok_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10208: checking for $ac_func" >&5 +echo "configure:10554: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); @@ -10232,7 +10581,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:10236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10257,16 +10606,24 @@ fi done +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + + INET_LINK= for ac_func in inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10265: checking for $ac_func" >&5 +echo "configure:10622: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10314,7 +10671,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 -echo "configure:10318: checking for inet_addr in -lnsl" >&5 +echo "configure:10675: checking for inet_addr in -lnsl" >&5 ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10322,7 +10679,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10352,7 +10709,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6 -echo "configure:10356: checking for inet_addr in -lresolv" >&5 +echo "configure:10713: checking for inet_addr in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10360,7 +10717,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10404,12 +10761,12 @@ done for ac_func in inet_aton do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10408: checking for $ac_func" >&5 +echo "configure:10765: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10457,7 +10814,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6 -echo "configure:10461: checking for inet_aton in -l$INET_LINK" >&5 +echo "configure:10818: checking for inet_aton in -l$INET_LINK" >&5 ac_lib_var=`echo $INET_LINK'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10465,7 +10822,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$INET_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10564,7 +10921,7 @@ rm -f confcache -if test "$USE_UNIX" = 1; then +if test "$TOOLKIT" != "MSW"; then THREADS_LINK="" @@ -10583,7 +10940,7 @@ fi if test "$wxUSE_THREADS" = "yes" ; then echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:10587: checking for pthread_create in -lpthread" >&5 +echo "configure:10944: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10591,7 +10948,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10625,7 +10982,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:10629: checking for pthread_create in -lc_r" >&5 +echo "configure:10986: checking for pthread_create in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10633,7 +10990,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10668,17 +11025,17 @@ else ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 -echo "configure:10672: checking for sys/prctl.h" >&5 +echo "configure:11029: checking for sys/prctl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10718,12 +11075,12 @@ if test "$wxUSE_THREADS" = "yes" ; then for ac_func in thr_setconcurrency do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10722: checking for $ac_func" >&5 +echo "configure:11079: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10776,17 +11133,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10780: checking for $ac_hdr" >&5 +echo "configure:11137: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10814,7 +11171,7 @@ done echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:10818: checking for sched_yield in -l$THREADS_LINK" >&5 +echo "configure:11175: checking for sched_yield in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10822,7 +11179,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10855,7 +11212,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6 -echo "configure:10859: checking for sched_yield in -l"posix4"" >&5 +echo "configure:11216: checking for sched_yield in -l"posix4"" >&5 ac_lib_var=`echo "posix4"'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10863,7 +11220,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l"posix4" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10904,7 +11261,7 @@ fi echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:10908: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 +echo "configure:11265: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10912,7 +11269,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10945,7 +11302,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6 -echo "configure:10949: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5 +echo "configure:11306: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5 ac_lib_var=`echo "posix4"'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10953,7 +11310,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l"posix4" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10994,7 +11351,7 @@ fi echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:10998: checking for pthread_cancel in -l$THREADS_LINK" >&5 +echo "configure:11355: checking for pthread_cancel in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11002,7 +11359,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11039,13 +11396,13 @@ fi echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 -echo "configure:11043: checking for pthread_cleanup_push/pop" >&5 +echo "configure:11400: checking for pthread_cleanup_push/pop" >&5 if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -11055,7 +11412,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_pthread_cleanup_push=yes @@ -11096,7 +11453,7 @@ EOF else if test "$ac_cv_func_strtok_r" = "yes"; then echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6 -echo "configure:11100: checking if -D_REENTRANT is needed" >&5 +echo "configure:11457: checking if -D_REENTRANT is needed" >&5 if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then CFLAGS="${CFLAGS} -D_REENTRANT" CXXFLAGS="${CXXFLAGS} -D_REENTRANT" @@ -11161,6 +11518,10 @@ EOF cat >> confdefs.h <<\EOF #define wxUSE_GLOBAL_MEMORY_OPERATORS 1 +EOF + + cat >> confdefs.h <<\EOF +#define wxUSE_DEBUG_NEW_ALWAYS 1 EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck" @@ -11212,56 +11573,121 @@ fi ZLIB_INCLUDE= -if test "$wxUSE_ZLIB" = "yes" ; then +if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then cat >> confdefs.h <<\EOF #define wxUSE_ZLIB 1 EOF - ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib" + if test "$wxUSE_ZLIB" = "yes" ; then + ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib" + else + ZLIB_LINK= + ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 +echo "configure:11588: checking for zlib.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:11598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 +echo "configure:11615: checking for deflate in -lz" >&5 +ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lz $LIBS" +cat > conftest.$ac_ext <> confdefs.h <<\EOF -#define wxUSE_LIBPNG 1 +int main() { +deflate() +; return 0; } EOF +if { (eval echo configure:11634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" - PNG_INCLUDE="-I\${top_srcdir}/src/png" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png" +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ZLIB_LINK="-lz" +else + echo "$ac_t""no" 1>&6 fi -JPEG_INCLUDE= -if test "$wxUSE_LIBJPEG" = "yes" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_LIBJPEG 1 -EOF +else + echo "$ac_t""no" 1>&6 +fi - JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg" + if test "x$ZLIB_LINK" = "x" ; then + { echo "configure: error: system zlib compression library not found! Use --with-zlib=yes to use built-in zlib" 1>&2; exit 1; } + fi + fi fi -TIFF_INCLUDE= -if test "$wxUSE_LIBTIFF" = "yes" ; then +PNG_INCLUDE= +if test "$wxUSE_LIBPNG" = "yes" -o "$wxUSE_LIBPNG" = "sys" ; then cat >> confdefs.h <<\EOF -#define wxUSE_LIBTIFF 1 +#define wxUSE_LIBPNG 1 EOF - TIFF_INCLUDE="-I\${top_srcdir}/src/tiff" -fi + if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then + echo "configure: warning: --with-libpng=sys doesn't work without --with-zlib=sys, will compile the built-in libpng instead" 1>&2 + wxUSE_LIBPNG=yes + fi -if test "$wxUSE_OPENGL" = "yes"; then - ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6 -echo "configure:11255: checking for GL/gl.h" >&5 + if test "$wxUSE_LIBPNG" = "yes" ; then + PNG_INCLUDE="-I\${top_srcdir}/src/png" + else + PNG_LINK= + ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for png.h""... $ac_c" 1>&6 +echo "configure:11681: checking for png.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11277,28 +11703,27 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - - echo $ac_n "checking for glInitNames in -lGL""... $ac_c" 1>&6 -echo "configure:11283: checking for glInitNames in -lGL" >&5 -ac_lib_var=`echo GL'_'glInitNames | sed 'y%./+-%__p_%'` + echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6 +echo "configure:11708: checking for png_check_sig in -lpng" >&5 +ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lGL wxUSE_OPENGL=0 $LIBS" +LIBS="-lpng -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11313,38 +11738,83 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - - OPENGL_LINK="-lGL" - cat >> confdefs.h <<\EOF -#define wxUSE_OPENGL 1 -EOF + PNG_LINK="-lpng" +else + echo "$ac_t""no" 1>&6 +fi - UTILS_SUBDIRS="$UTILS_SUBDIRS glcanvas/src" - + else echo "$ac_t""no" 1>&6 +fi + + if test "x$PNG_LINK" = "x" ; then + { echo "configure: error: system png library not found! Use --with-libpng=yes to use the built-in libpng" 1>&2; exit 1; } + fi + fi + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png" +fi - echo $ac_n "checking for glInitNames in -lMesaGL""... $ac_c" 1>&6 -echo "configure:11329: checking for glInitNames in -lMesaGL" >&5 -ac_lib_var=`echo MesaGL'_'glInitNames | sed 'y%./+-%__p_%'` +JPEG_INCLUDE= +if test "$wxUSE_LIBJPEG" = "yes" -o "$wxUSE_LIBJPEG" = "sys" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_LIBJPEG 1 +EOF + + if test "$wxUSE_LIBJPEG" = "yes" ; then + JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg" + else + JPEG_LINK= + ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 +echo "configure:11772: checking for jpeglib.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:11782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 +echo "configure:11799: checking for jpeg_read_header in -ljpeg" >&5 +ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lMesaGL $LIBS" +LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11359,74 +11829,292 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - - OPENGL_LINK="-lMesaGL" - cat >> confdefs.h <<\EOF -#define wxUSE_OPENGL 1 -EOF - - UTILS_SUBDIRS="$UTILS_SUBDIRS glcanvas/src" - + JPEG_LINK="-ljpeg" else echo "$ac_t""no" 1>&6 -wxUSE_OPENGL=0 -fi - - fi - else echo "$ac_t""no" 1>&6 -wxUSE_OPENGL=0 fi + if test "x$JPEG_LINK" = "x" ; then + { echo "configure: error: system jpeg library not found! Use --with-libjpeg=yes to use the built-in one" 1>&2; exit 1; } + fi + fi fi - -if test "$wxUSE_GUI" = "yes"; then +TIFF_INCLUDE= +if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then cat >> confdefs.h <<\EOF -#define wxUSE_GUI 1 +#define wxUSE_LIBTIFF 1 EOF - - else - cat >> confdefs.h <<\EOF -#define wxUSE_NOGUI 1 + if test "$wxUSE_LIBTIFF" = "yes" ; then + TIFF_INCLUDE="-I\${top_srcdir}/src/tiff" + else + TIFF_LINK= + ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 +echo "configure:11860: checking for tiffio.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < EOF - +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:11870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi - - -if test "$wxUSE_UNIX" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_UNIX 1 -EOF - +rm -f conftest* fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6 +echo "configure:11887: checking for TIFFError in -ltiff" >&5 +ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ltiff -lm $LIBS" +cat > conftest.$ac_ext <> confdefs.h <<\EOF -#define wxUSE_APPLE_IEEE 1 +int main() { +TIFFError() +; return 0; } EOF - +if { (eval echo configure:11906: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi +rm -f conftest* +LIBS="$ac_save_LIBS" -if test "$wxUSE_WAVE" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_WAVE 1 -EOF +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + TIFF_LINK="-ltiff" +else + echo "$ac_t""no" 1>&6 +fi +else + echo "$ac_t""no" 1>&6 fi -if test "$wxUSE_FILE" = "yes"; then + if test "x$TIFF_LINK" = "x" ; then + { echo "configure: error: system tiff library not found! Use --with-libtiff=yes to use the built-in one" 1>&2; exit 1; } + fi + fi +fi + +if test "$wxUSE_OPENGL" = "yes"; then + ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6 +echo "configure:11939: checking for GL/gl.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:11949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + cat >> confdefs.h <<\EOF +#define wxUSE_OPENGL 1 +EOF + + cat >> confdefs.h <<\EOF +#define wxUSE_GLCANVAS 1 +EOF + + echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6 +echo "configure:11975: checking for glFlush in -lGL" >&5 +ac_lib_var=`echo GL'_'glFlush | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lGL $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + OPENGL_LINK="-lGL" + +else + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6 +echo "configure:12016: checking for glFlush in -lMesaGL" >&5 +ac_lib_var=`echo MesaGL'_'glFlush | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lMesaGL $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + OPENGL_LINK="-lMesaGL" + +else + echo "$ac_t""no" 1>&6 +fi + + +fi + + +else + echo "$ac_t""no" 1>&6 +wxUSE_OPENGL=0 +fi + +fi + + +if test "$wxUSE_GUI" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_GUI 1 +EOF + + + else + cat >> confdefs.h <<\EOF +#define wxUSE_NOGUI 1 +EOF + +fi + + +if test "$wxUSE_UNIX" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_UNIX 1 +EOF + +fi + + +if test "$wxUSE_APPLE_IEEE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_APPLE_IEEE 1 +EOF + +fi + +if test "$wxUSE_WAVE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_WAVE 1 +EOF + +fi + +if test "$wxUSE_FILE" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_FILE 1 EOF fi +if test "$wxUSE_FILESYSTEM" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_FILESYSTEM 1 +EOF + +fi + if test "$wxUSE_FS_INET" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_FS_INET 1 @@ -11511,6 +12199,13 @@ EOF fi +if test "$wxUSE_PLOT" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_PLOT 1 +EOF + +fi + if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then cat >> confdefs.h <<\EOF #define wxUSE_DIALUP_MANAGER 1 @@ -11531,12 +12226,12 @@ if test "$wxUSE_TIMEDATE" = "yes"; then for ac_func in strptime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11535: checking for $ac_func" >&5 +echo "configure:12230: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11585,13 +12280,13 @@ done echo $ac_n "checking for timezone variable in ""... $ac_c" 1>&6 -echo "configure:11589: checking for timezone variable in " >&5 +echo "configure:12284: checking for timezone variable in " >&5 if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -11603,7 +12298,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=__timezone @@ -11614,7 +12309,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -11626,7 +12321,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=_timezone @@ -11637,7 +12332,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -11649,7 +12344,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=timezone @@ -11681,15 +12376,15 @@ echo "$ac_t""$wx_cv_var_timezone" 1>&6 EOF - for ac_func in localtime gettimeofday ftime + for ac_func in localtime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11688: checking for $ac_func" >&5 +echo "configure:12383: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11730,7 +12425,7 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then cat >> confdefs.h <&6 fi @@ -11739,13 +12434,13 @@ done if test "$ac_cv_func_localtime" = "yes"; then echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:11743: checking for tm_gmtoff in struct tm" >&5 +echo "configure:12438: checking for tm_gmtoff in struct tm" >&5 if eval "test \"`echo '$''{'wx_cv_struct_tm_has_gmtoff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -11757,7 +12452,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_tm_has_gmtoff=yes @@ -11778,9 +12473,67 @@ rm -f conftest* fi echo "$ac_t""$wx_cv_struct_tm_has_gmtoff" 1>&6 - elif test "$ac_cv_func_gettimeofday" = "yes"; then + fi + + for ac_func in gettimeofday ftime +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:12482: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:12510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + + if test "$ac_cv_func_gettimeofday" = "yes"; then echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6 -echo "configure:11784: checking whether gettimeofday takes two arguments" >&5 +echo "configure:12537: checking whether gettimeofday takes two arguments" >&5 if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11795,7 +12548,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -11809,7 +12562,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=yes else @@ -11817,7 +12570,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -11830,7 +12583,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11834: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=no else @@ -11872,14 +12625,16 @@ EOF fi +if test "$TOOLKIT" != "MSW"; then + if test "$wxUSE_SOCKETS" = "yes"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:11878: checking for socket" >&5 +echo "configure:12633: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -11920,7 +12675,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:11924: checking for socket in -lsocket" >&5 +echo "configure:12679: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11928,7 +12683,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11969,89 +12724,122 @@ fi fi +fi + if test "$wxUSE_SOCKETS" = "yes" ; then - - ac_ext=C + echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6 +echo "configure:12732: checking what is the type of the third argument of getsockname" >&5 +if eval "test \"`echo '$''{'wx_cv_type_getsockname3'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + + ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cxx_cross - echo $ac_n "checking the type of the third argument of getsockname""... $ac_c" 1>&6 -echo "configure:11983: checking the type of the third argument of getsockname" >&5 - cat > conftest.$ac_ext < conftest.$ac_ext < + + #include + #include + int main() { -socklen_t len; getsockname(0, 0, &len); + + socklen_t len; + getsockname(0, 0, &len); + ; return 0; } EOF -if { (eval echo configure:11992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - cat >> confdefs.h <<\EOF -#define SOCKLEN_T socklen_t -EOF - echo "$ac_t""socklen_t" 1>&6 + wx_cv_type_getsockname3=socklen_t else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < + + #include + #include + int main() { -size_t len; getsockname(0, 0, &len); + + size_t len; + getsockname(0, 0, &len); + ; return 0; } EOF -if { (eval echo configure:12010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - cat >> confdefs.h <<\EOF -#define SOCKLEN_T size_t -EOF - echo "$ac_t""size_t" 1>&6 + wx_cv_type_getsockname3=size_t else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < + + #include + #include + int main() { -int len; getsockname(0, 0, &len); + + int len; + getsockname(0, 0, &len); + ; return 0; } EOF -if { (eval echo configure:12028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - cat >> confdefs.h <<\EOF -#define SOCKLEN_T int -EOF - echo "$ac_t""int" 1>&6 + wx_cv_type_getsockname3=int else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - echo "$ac_t""unknown" 1>&6 - + wx_cv_type_getsockname3=unknown + fi rm -f conftest* - + fi rm -f conftest* - + fi rm -f conftest* - ac_ext=c + + ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross + +fi + +echo "$ac_t""$wx_cv_type_getsockname3" 1>&6 + + if test "$wx_cv_type_getsockname3" = "unknown"; then + wxUSE_SOCKETS=no + echo "configure: warning: Couldn't find socklen_t synonym for this system" 1>&2 + else + cat >> confdefs.h <> confdefs.h <<\EOF #define wxUSE_SOCKETS 1 EOF @@ -12061,22 +12849,24 @@ EOF fi +if test "$TOOLKIT" != "MSW"; then + if test "$wxUSE_JOYSTICK" = 1; then for ac_hdr in linux/joystick.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12070: checking for $ac_hdr" >&5 +echo "configure:12860: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12102,28 +12892,37 @@ else fi done - if test "$ac_cv_header_linux_joystick_h" = "yes"; then + if test "$ac_cv_header_linux_joystick_h" != "yes"; then + wxUSE_JOYSTICK=0 + echo "configure: warning: Joystick not supported yb this system" 1>&2 + fi +fi + +fi + +if test "$wxUSE_JOYSTICK" = 1; then cat >> confdefs.h <<\EOF #define wxUSE_JOYSTICK 1 EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" - fi fi +if test "$TOOLKIT" != "MSW"; then + HAVE_DL_FUNCS=0 HAVE_SHL_FUNCS=0 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:12122: checking for $ac_func" >&5 +echo "configure:12921: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12174,7 +12973,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:12178: checking for dlopen in -ldl" >&5 +echo "configure:12977: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12182,7 +12981,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12222,12 +13021,12 @@ else for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12226: checking for $ac_func" >&5 +echo "configure:13025: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12300,6 +13099,8 @@ done fi fi +fi + if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then cat >> confdefs.h <<\EOF #define wxUSE_DYNLIB_CLASS 1 @@ -12479,17 +13280,17 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12483: checking for $ac_hdr" >&5 +echo "configure:13284: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12597,20 +13398,21 @@ EOF fi -if test "$wxUSE_GRID" = "yes"; then +if test "$wxUSE_NEW_GRID" = "yes"; then + wxUSE_GRID="yes" cat >> confdefs.h <<\EOF -#define wxUSE_GRID 1 +#define wxUSE_NEW_GRID 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid" fi -if test "$wxUSE_NEW_GRID" = "yes"; then +if test "$wxUSE_GRID" = "yes"; then cat >> confdefs.h <<\EOF -#define wxUSE_NEW_GRID 1 +#define wxUSE_GRID 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid" fi if test "$wxUSE_IMAGLIST" = "yes"; then @@ -12736,6 +13538,8 @@ if test "$wxUSE_STATUSBAR" = "yes"; then #define wxUSE_STATUSBAR 1 EOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar" fi if test "$wxUSE_TABDIALOG" = "yes"; then @@ -12901,19 +13705,24 @@ EOF fi -OSINFO=`uname -s -r -m` -OSINFO="\"$OSINFO\"" +if test "$cross_compiling" = "yes"; then + OSINFO="\"$host\"" +else + OSINFO=`uname -s -r -m` + OSINFO="\"$OSINFO\"" +fi + cat >> confdefs.h <&6 -echo "configure:13004: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:13845: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13027,14 +13868,26 @@ else fi +if test -d include; then + if test -d include/wx; then + if test -d include/wx/${TOOLKIT_DIR}; then + if test -f include/wx/${TOOLKIT_DIR}/setup.h; then + mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h + fi + fi + fi +fi + -if test "${TOOLKIT_DIR}" = "msw" ; then - GL_TOOLKIT_DIR="win" -else - GL_TOOLKIT_DIR="${TOOLKIT_DIR}" -fi +if test "$wxUSE_GUI" = "yes"; then + wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS + wx_cv_path_ifs=$PATH_IFS + wx_cv_program_ext=$PROGRAM_EXT + wx_cv_target_library=$WX_TARGET_LIBRARY + subdirs="demos samples utils contrib" +fi trap '' 1 2 15 cat > confcache <<\EOF @@ -13143,73 +13996,6 @@ trap 'rm -fr `echo " src/makeprog.env src/makelib.env Makefile - demos/Makefile - demos/bombs/Makefile - demos/forty/Makefile - demos/fractal/Makefile - demos/life/Makefile - demos/poem/Makefile - samples/Makefile - samples/caret/Makefile - samples/calendar/Makefile - samples/checklst/Makefile - samples/config/Makefile - samples/controls/Makefile - samples/console/Makefile - samples/db/Makefile - samples/dialogs/Makefile - samples/docview/Makefile - samples/docvwmdi/Makefile - samples/dnd/Makefile - samples/drawing/Makefile - samples/font/Makefile - samples/grid/Makefile - samples/help/Makefile - samples/image/Makefile - samples/internat/Makefile - samples/layout/Makefile - samples/listctrl/Makefile - samples/mdi/Makefile - samples/minifram/Makefile - samples/minimal/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 - samples/scroll/Makefile - samples/scrollsub/Makefile - samples/splitter/Makefile - samples/text/Makefile - samples/thread/Makefile - samples/toolbar/Makefile - samples/treectrl/Makefile - samples/typetest/Makefile - samples/validate/Makefile - samples/sockets/Makefile - samples/wizard/Makefile - samples/html/Makefile - samples/html/about/Makefile - samples/html/help/Makefile - samples/html/printing/Makefile - samples/html/helpview/Makefile - samples/html/test/Makefile - samples/html/zip/Makefile - samples/html/virtual/Makefile - samples/html/widget/Makefile - utils/Makefile - utils/wxMMedia2/Makefile - utils/wxMMedia2/lib/Makefile - utils/wxMMedia2/sample/Makefile - utils/glcanvas/Makefile - utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile - utils/ogl/Makefile - utils/ogl/src/Makefile setup.h:setup.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF @@ -13610,12 +14355,37 @@ EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF chmod +x wx-config + mv wx-config wx${TOOLKIT_DIR}-config + ${LN_S} wx${TOOLKIT_DIR}-config wx-config + + + if test ! -d lib; then + mkdir lib + fi + if test ! -d lib/wx; then + mkdir lib/wx + fi + if test ! -d lib/wx/include; then + mkdir lib/wx/include + fi + if test ! -d lib/wx/include/wx; then + mkdir lib/wx/include/wx + fi + if test ! -d lib/wx/include/wx/${TOOLKIT_DIR}; then + mkdir lib/wx/include/wx/${TOOLKIT_DIR} + fi + if test -f setup.h; then + cp -f setup.h lib/wx/include/wx/${TOOLKIT_DIR}/setup.h + fi + + if test ! -d include; then mkdir include fi @@ -13628,6 +14398,7 @@ cat >> $CONFIG_STATUS <<\EOF if test -f setup.h; then mv -f setup.h include/wx/${TOOLKIT_DIR}/setup.h fi + exit 0 EOF @@ -13635,4 +14406,101 @@ chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +if test "$no_recursion" != yes; then + + # Remove --cache-file and --srcdir arguments so they do not pile up. + ac_sub_configure_args= + ac_prev= + for ac_arg in $ac_configure_args; do + if test -n "$ac_prev"; then + ac_prev= + continue + fi + case "$ac_arg" in + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + ;; + *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; + esac + done + + for ac_config_dir in demos samples utils contrib; do + + # Do not complain, so a configure script can configure whichever + # parts of a large source tree are present. + if test ! -d $srcdir/$ac_config_dir; then + continue + fi + + echo configuring in $ac_config_dir + + case "$srcdir" in + .) ;; + *) + if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :; + else + { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; } + fi + ;; + esac + + ac_popdir=`pwd` + cd $ac_config_dir + + # A "../" for each directory in /$ac_config_dir. + ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` + + case "$srcdir" in + .) # No --srcdir option. We are building in place. + ac_sub_srcdir=$srcdir ;; + /*) # Absolute path. + ac_sub_srcdir=$srcdir/$ac_config_dir ;; + *) # Relative path. + ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; + esac + + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_sub_srcdir/configure; then + ac_sub_configure=$ac_sub_srcdir/configure + elif test -f $ac_sub_srcdir/configure.in; then + ac_sub_configure=$ac_configure + else + echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 + ac_sub_configure= + fi + + # The recursion is here. + if test -n "$ac_sub_configure"; then + + # Make the cache file name correct relative to the subdirectory. + case "$cache_file" in + /*) ac_sub_cache_file=$cache_file ;; + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac + case "$ac_given_INSTALL" in + [/$]*) INSTALL="$ac_given_INSTALL" ;; + *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. + if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir + then : + else + { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } + fi + fi + + cd $ac_popdir + done +fi +