X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d6c4365363f84bf587c7f5f916e5830ef8a11e3..5836c9080be6e3748580755dc9bd371e17e1018c:/configure diff --git a/configure b/configure index 4db31dbfa5..23d8c2f337 100755 --- a/configure +++ b/configure @@ -68,9 +68,7 @@ ac_help="$ac_help ac_help="$ac_help --with-wine use WINE" ac_help="$ac_help - --with-cygwin use Cygwin for MS-Windows" -ac_help="$ac_help - --with-mingw use GCC Minimal MS-Windows" + --with-msw use MS-Windows" ac_help="$ac_help --with-pm use OS/2 Presentation Manager" ac_help="$ac_help @@ -170,7 +168,9 @@ ac_help="$ac_help ac_help="$ac_help --enable-ffile use wxFFile classes" ac_help="$ac_help - --enable-textfile use wxTextFile classes" + --enable-textbuf use wxTextBuffer class" +ac_help="$ac_help + --enable-textfile use wxTextFile class" ac_help="$ac_help --enable-fontmap use font encodings conversion classes" ac_help="$ac_help @@ -192,7 +192,7 @@ ac_help="$ac_help ac_help="$ac_help --enable-snglinst use wxSingleInstanceChecker class" ac_help="$ac_help - --enable-mimetypes use wxMimeTypesManager" + --enable-mimetype use wxMimeTypesManager" ac_help="$ac_help --enable-sysoptions use wxSystemOptions" ac_help="$ac_help @@ -219,6 +219,8 @@ ac_help="$ac_help --enable-loggui use standard GUI logger" ac_help="$ac_help --enable-logwin use wxLogWindow" +ac_help="$ac_help + --enable-logdialog use wxLogDialog" ac_help="$ac_help --enable-postscript use wxPostscriptDC device context (default for gtk+)" ac_help="$ac_help @@ -937,7 +939,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:941: checking host system type" >&5 +echo "configure:943: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -958,7 +960,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:962: checking target system type" >&5 +echo "configure:964: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -976,7 +978,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:980: checking build system type" >&5 +echo "configure:982: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1007,6 +1009,8 @@ WX_RELEASE_NUMBER=2 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER +WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER + WX_CURRENT=1 WX_REVISION=0 WX_AGE=0 @@ -1028,7 +1032,6 @@ USE_SUN= USE_SOLARIS= USE_SUNOS= USE_ALPHA= -USE_IA64= USE_OSF= USE_BSD= USE_DARWIN= @@ -1037,13 +1040,11 @@ USE_OPENBSD= USE_NETBSD= USE_VMS= USE_ULTRIX= -USE_CYGWIN= -USE_MINGW= USE_DATA_GENERAL= NEEDS_D_REENTRANT_FOR_R_FUNCS=0 -ALL_TOOLKITS="CYGWIN GTK MAC MGL MINGW MOTIF PM WINE" +ALL_TOOLKITS="GTK MAC MGL MOTIF MSW PM WINE" DEFAULT_wxUSE_GTK=0 DEFAULT_wxUSE_MAC=0 @@ -1086,13 +1087,6 @@ EOF USE_ALPHA=1 cat >> confdefs.h <<\EOF #define __ALPHA__ 1 -EOF - - fi - if test "x$TMP" = "xia64"; then - USE_IA64=1 - cat >> confdefs.h <<\EOF -#define __IA64__ 1 EOF fi @@ -1279,7 +1273,7 @@ EOF DEFAULT_DEFAULT_wxUSE_MSW=1 ;; - *-pc-os2_emx ) + *-pc-os2_emx | *-pc-os2-emx ) cat >> confdefs.h <<\EOF #define __EMX__ 1 EOF @@ -1329,12 +1323,12 @@ fi if test "$USE_LINUX" = 1; then echo $ac_n "checking for glibc 2.1 or later""... $ac_c" 1>&6 -echo "configure:1333: checking for glibc 2.1 or later" >&5 +echo "configure:1327: checking for glibc 2.1 or later" >&5 if eval "test \"`echo '$''{'wx_lib_glibc21'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -1345,7 +1339,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_lib_glibc21=yes @@ -1393,8 +1387,8 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_OPTIMISE=no DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no - DEFAULT_wxUSE_NO_RTTI=no - DEFAULT_wxUSE_NO_EXCEPTIONS=no + DEFAULT_wxUSE_NO_RTTI=yes + DEFAULT_wxUSE_NO_EXCEPTIONS=yes DEFAULT_wxUSE_PERMISSIVE=no DEFAULT_wxUSE_DEBUG_FLAG=yes DEFAULT_wxUSE_DEBUG_INFO=yes @@ -1408,6 +1402,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_LOG=yes DEFAULT_wxUSE_LOGWINDOW=no DEFAULT_wxUSE_LOGGUI=no + DEFAULT_wxUSE_LOGDIALOG=no DEFAULT_wxUSE_GUI=yes DEFAULT_wxUSE_CONTROLS=no @@ -1431,6 +1426,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_STOPWATCH=no DEFAULT_wxUSE_FILE=no DEFAULT_wxUSE_FFILE=no + DEFAULT_wxUSE_TEXTBUFFER=no DEFAULT_wxUSE_TEXTFILE=no DEFAULT_wxUSE_WAVE=no DEFAULT_wxUSE_INTL=no @@ -1555,8 +1551,8 @@ else DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no - DEFAULT_wxUSE_NO_RTTI=no - DEFAULT_wxUSE_NO_EXCEPTIONS=no + DEFAULT_wxUSE_NO_RTTI=yes + DEFAULT_wxUSE_NO_EXCEPTIONS=yes DEFAULT_wxUSE_PERMISSIVE=no DEFAULT_wxUSE_DEBUG_FLAG=no DEFAULT_wxUSE_DEBUG_INFO=no @@ -1570,6 +1566,7 @@ else DEFAULT_wxUSE_LOG=yes DEFAULT_wxUSE_LOGWINDOW=yes DEFAULT_wxUSE_LOGGUI=yes + DEFAULT_wxUSE_LOGDIALOG=yes DEFAULT_wxUSE_GUI=yes @@ -1592,6 +1589,7 @@ else DEFAULT_wxUSE_STOPWATCH=yes DEFAULT_wxUSE_FILE=yes DEFAULT_wxUSE_FFILE=yes + DEFAULT_wxUSE_TEXTBUFFER=yes DEFAULT_wxUSE_TEXTFILE=yes DEFAULT_wxUSE_WAVE=no DEFAULT_wxUSE_INTL=yes @@ -1722,7 +1720,7 @@ done echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6 -echo "configure:1726: checking for --enable-gui" >&5 +echo "configure:1724: checking for --enable-gui" >&5 no_cache=0 # Check whether --enable-gui or --disable-gui was given. if test "${enable_gui+set}" = set; then @@ -1764,7 +1762,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6 -echo "configure:1768: checking for --enable-universal" >&5 +echo "configure:1766: checking for --enable-universal" >&5 no_cache=0 # Check whether --enable-universal or --disable-universal was given. if test "${enable_universal+set}" = set; then @@ -1825,16 +1823,10 @@ if test "${with_wine+set}" = set; then wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1 fi -# Check whether --with-cygwin or --without-cygwin was given. -if test "${with_cygwin+set}" = set; then - withval="$with_cygwin" - wxUSE_CYGWIN="$withval" CACHE_CYGWIN=1 TOOLKIT_GIVEN=1 -fi - -# Check whether --with-mingw or --without-mingw was given. -if test "${with_mingw+set}" = set; then - withval="$with_mingw" - wxUSE_MINGW="$withval" CACHE_MINGW=1 TOOLKIT_GIVEN=1 +# Check whether --with-msw or --without-msw was given. +if test "${with_msw+set}" = set; then + withval="$with_msw" + wxUSE_MSW="$withval" CACHE_MSW TOOLKIT_GIVEN=1 fi # Check whether --with-pm or --without-pm was given. @@ -1861,7 +1853,7 @@ fi echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6 -echo "configure:1865: checking for --with-libpng" >&5 +echo "configure:1857: checking for --with-libpng" >&5 no_cache=0 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then @@ -1873,8 +1865,10 @@ if test "${with_libpng+set}" = set; then ac_cv_use_libpng='wxUSE_LIBPNG=no' elif test "$withval" = sys; then ac_cv_use_libpng='wxUSE_LIBPNG=sys' + elif test "$withval" = builtin; then + ac_cv_use_libpng='wxUSE_LIBPNG=builtin' else - { echo "configure: error: Invalid value for --with-libpng: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi else @@ -1902,13 +1896,15 @@ fi echo "$ac_t""no" 1>&6 elif test "$wxUSE_LIBPNG" = sys; then echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_LIBPNG" = builtin; then + echo "$ac_t""builtin version" 1>&6 else - { echo "configure: error: Invalid value for --with-libpng: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6 -echo "configure:1912: checking for --with-libjpeg" >&5 +echo "configure:1908: checking for --with-libjpeg" >&5 no_cache=0 # Check whether --with-libjpeg or --without-libjpeg was given. if test "${with_libjpeg+set}" = set; then @@ -1920,8 +1916,10 @@ if test "${with_libjpeg+set}" = set; then ac_cv_use_libjpeg='wxUSE_LIBJPEG=no' elif test "$withval" = sys; then ac_cv_use_libjpeg='wxUSE_LIBJPEG=sys' + elif test "$withval" = builtin; then + ac_cv_use_libjpeg='wxUSE_LIBJPEG=builtin' else - { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi else @@ -1949,8 +1947,10 @@ fi echo "$ac_t""no" 1>&6 elif test "$wxUSE_LIBJPEG" = sys; then echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_LIBJPEG" = builtin; then + echo "$ac_t""builtin version" 1>&6 else - { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi @@ -1967,8 +1967,10 @@ if test "${with_libtiff+set}" = set; then ac_cv_use_libtiff='wxUSE_LIBTIFF=no' elif test "$withval" = sys; then ac_cv_use_libtiff='wxUSE_LIBTIFF=sys' + elif test "$withval" = builtin; then + ac_cv_use_libtiff='wxUSE_LIBTIFF=builtin' else - { echo "configure: error: Invalid value for --with-libtiff: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi else @@ -1996,13 +1998,15 @@ fi echo "$ac_t""no" 1>&6 elif test "$wxUSE_LIBTIFF" = sys; then echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_LIBTIFF" = builtin; then + echo "$ac_t""builtin version" 1>&6 else - { echo "configure: error: Invalid value for --with-libtiff: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6 -echo "configure:2006: checking for --with-freetype" >&5 +echo "configure:2010: checking for --with-freetype" >&5 no_cache=0 # Check whether --with-freetype or --without-freetype was given. if test "${with_freetype+set}" = set; then @@ -2014,8 +2018,10 @@ if test "${with_freetype+set}" = set; then ac_cv_use_freetype='wxUSE_FREETYPE=no' elif test "$withval" = sys; then ac_cv_use_freetype='wxUSE_FREETYPE=sys' + elif test "$withval" = builtin; then + ac_cv_use_freetype='wxUSE_FREETYPE=builtin' else - { echo "configure: error: Invalid value for --with-freetype: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-freetype: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi else @@ -2043,13 +2049,15 @@ fi echo "$ac_t""no" 1>&6 elif test "$wxUSE_FREETYPE" = sys; then echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_FREETYPE" = builtin; then + echo "$ac_t""builtin version" 1>&6 else - { echo "configure: error: Invalid value for --with-freetype: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-freetype: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6 -echo "configure:2053: checking for --with-opengl" >&5 +echo "configure:2061: checking for --with-opengl" >&5 no_cache=0 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then @@ -2091,7 +2099,7 @@ fi echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6 -echo "configure:2095: checking for --with-dmalloc" >&5 +echo "configure:2103: checking for --with-dmalloc" >&5 no_cache=0 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -2130,7 +2138,7 @@ fi echo $ac_n "checking for --with-regex""... $ac_c" 1>&6 -echo "configure:2134: checking for --with-regex" >&5 +echo "configure:2142: checking for --with-regex" >&5 no_cache=0 # Check whether --with-regex or --without-regex was given. if test "${with_regex+set}" = set; then @@ -2142,8 +2150,10 @@ if test "${with_regex+set}" = set; then ac_cv_use_regex='wxUSE_REGEX=no' elif test "$withval" = sys; then ac_cv_use_regex='wxUSE_REGEX=sys' + elif test "$withval" = builtin; then + ac_cv_use_regex='wxUSE_REGEX=builtin' else - { echo "configure: error: Invalid value for --with-regex: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi else @@ -2171,13 +2181,15 @@ fi echo "$ac_t""no" 1>&6 elif test "$wxUSE_REGEX" = sys; then echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_REGEX" = builtin; then + echo "$ac_t""builtin version" 1>&6 else - { echo "configure: error: Invalid value for --with-regex: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6 -echo "configure:2181: checking for --with-zlib" >&5 +echo "configure:2193: checking for --with-zlib" >&5 no_cache=0 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -2189,8 +2201,10 @@ if test "${with_zlib+set}" = set; then ac_cv_use_zlib='wxUSE_ZLIB=no' elif test "$withval" = sys; then ac_cv_use_zlib='wxUSE_ZLIB=sys' + elif test "$withval" = builtin; then + ac_cv_use_zlib='wxUSE_ZLIB=builtin' else - { echo "configure: error: Invalid value for --with-zlib: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi else @@ -2218,13 +2232,15 @@ fi echo "$ac_t""no" 1>&6 elif test "$wxUSE_ZLIB" = sys; then echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_ZLIB" = builtin; then + echo "$ac_t""builtin version" 1>&6 else - { echo "configure: error: Invalid value for --with-zlib: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6 -echo "configure:2228: checking for --with-odbc" >&5 +echo "configure:2244: checking for --with-odbc" >&5 no_cache=0 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then @@ -2265,7 +2281,7 @@ fi echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6 -echo "configure:2269: checking for --enable-shared" >&5 +echo "configure:2285: checking for --enable-shared" >&5 no_cache=0 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then @@ -2304,7 +2320,7 @@ fi echo $ac_n "checking for --enable-soname""... $ac_c" 1>&6 -echo "configure:2308: checking for --enable-soname" >&5 +echo "configure:2324: checking for --enable-soname" >&5 no_cache=0 # Check whether --enable-soname or --disable-soname was given. if test "${enable_soname+set}" = set; then @@ -2343,7 +2359,7 @@ fi echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6 -echo "configure:2347: checking for --enable-optimise" >&5 +echo "configure:2363: checking for --enable-optimise" >&5 no_cache=0 # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then @@ -2382,7 +2398,7 @@ fi echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6 -echo "configure:2386: checking for --enable-debug" >&5 +echo "configure:2402: checking for --enable-debug" >&5 no_cache=0 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -2422,7 +2438,7 @@ fi echo $ac_n "checking for --enable-precomp""... $ac_c" 1>&6 -echo "configure:2426: checking for --enable-precomp" >&5 +echo "configure:2442: checking for --enable-precomp" >&5 no_cache=0 # Check whether --enable-precomp or --disable-precomp was given. if test "${enable_precomp+set}" = set; then @@ -2470,7 +2486,7 @@ fi echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6 -echo "configure:2474: checking for --enable-debug_flag" >&5 +echo "configure:2490: 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 @@ -2509,7 +2525,7 @@ fi echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6 -echo "configure:2513: checking for --enable-debug_info" >&5 +echo "configure:2529: 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 @@ -2548,7 +2564,7 @@ fi echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6 -echo "configure:2552: checking for --enable-debug_gdb" >&5 +echo "configure:2568: 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 @@ -2587,7 +2603,7 @@ fi echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6 -echo "configure:2591: checking for --enable-debug_cntxt" >&5 +echo "configure:2607: 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 @@ -2626,7 +2642,7 @@ fi echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6 -echo "configure:2630: checking for --enable-mem_tracing" >&5 +echo "configure:2646: 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 @@ -2665,7 +2681,7 @@ fi echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6 -echo "configure:2669: checking for --enable-profile" >&5 +echo "configure:2685: checking for --enable-profile" >&5 no_cache=0 # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then @@ -2704,7 +2720,7 @@ fi echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6 -echo "configure:2708: checking for --enable-no_rtti" >&5 +echo "configure:2724: 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 @@ -2743,7 +2759,7 @@ fi echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6 -echo "configure:2747: checking for --enable-no_exceptions" >&5 +echo "configure:2763: 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 @@ -2782,7 +2798,7 @@ fi echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6 -echo "configure:2786: checking for --enable-permissive" >&5 +echo "configure:2802: checking for --enable-permissive" >&5 no_cache=0 # Check whether --enable-permissive or --disable-permissive was given. if test "${enable_permissive+set}" = set; then @@ -2821,7 +2837,7 @@ fi echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6 -echo "configure:2825: checking for --enable-no_deps" >&5 +echo "configure:2841: 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 @@ -2861,7 +2877,7 @@ fi echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6 -echo "configure:2865: checking for --enable-compat20" >&5 +echo "configure:2881: checking for --enable-compat20" >&5 no_cache=0 # Check whether --enable-compat20 or --disable-compat20 was given. if test "${enable_compat20+set}" = set; then @@ -2900,7 +2916,7 @@ fi echo $ac_n "checking for --enable-compat22""... $ac_c" 1>&6 -echo "configure:2904: checking for --enable-compat22" >&5 +echo "configure:2920: checking for --enable-compat22" >&5 no_cache=0 # Check whether --enable-compat22 or --disable-compat22 was given. if test "${enable_compat22+set}" = set; then @@ -2941,7 +2957,7 @@ fi echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6 -echo "configure:2945: checking for --enable-intl" >&5 +echo "configure:2961: checking for --enable-intl" >&5 no_cache=0 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then @@ -2980,7 +2996,7 @@ fi echo $ac_n "checking for --enable-config""... $ac_c" 1>&6 -echo "configure:2984: checking for --enable-config" >&5 +echo "configure:3000: checking for --enable-config" >&5 no_cache=0 # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -3020,7 +3036,7 @@ fi echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6 -echo "configure:3024: checking for --enable-sockets" >&5 +echo "configure:3040: checking for --enable-sockets" >&5 no_cache=0 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then @@ -3060,7 +3076,7 @@ fi echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6 -echo "configure:3064: checking for --enable-ipc" >&5 +echo "configure:3080: checking for --enable-ipc" >&5 no_cache=0 # Check whether --enable-ipc or --disable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -3100,7 +3116,7 @@ fi echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6 -echo "configure:3104: checking for --enable-cmdline" >&5 +echo "configure:3120: checking for --enable-cmdline" >&5 no_cache=0 # Check whether --enable-cmdline or --disable-cmdline was given. if test "${enable_cmdline+set}" = set; then @@ -3139,7 +3155,7 @@ fi echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6 -echo "configure:3143: checking for --enable-datetime" >&5 +echo "configure:3159: checking for --enable-datetime" >&5 no_cache=0 # Check whether --enable-datetime or --disable-datetime was given. if test "${enable_datetime+set}" = set; then @@ -3178,7 +3194,7 @@ fi echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6 -echo "configure:3182: checking for --enable-timedate" >&5 +echo "configure:3198: checking for --enable-timedate" >&5 no_cache=0 # Check whether --enable-timedate or --disable-timedate was given. if test "${enable_timedate+set}" = set; then @@ -3217,7 +3233,7 @@ fi echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6 -echo "configure:3221: checking for --enable-stopwatch" >&5 +echo "configure:3237: checking for --enable-stopwatch" >&5 no_cache=0 # Check whether --enable-stopwatch or --disable-stopwatch was given. if test "${enable_stopwatch+set}" = set; then @@ -3256,7 +3272,7 @@ fi echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6 -echo "configure:3260: checking for --enable-dialupman" >&5 +echo "configure:3276: checking for --enable-dialupman" >&5 no_cache=0 # Check whether --enable-dialupman or --disable-dialupman was given. if test "${enable_dialupman+set}" = set; then @@ -3295,7 +3311,7 @@ fi echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6 -echo "configure:3299: checking for --enable-apple_ieee" >&5 +echo "configure:3315: 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 @@ -3334,7 +3350,7 @@ fi echo $ac_n "checking for --enable-timer""... $ac_c" 1>&6 -echo "configure:3338: checking for --enable-timer" >&5 +echo "configure:3354: checking for --enable-timer" >&5 no_cache=0 # Check whether --enable-timer or --disable-timer was given. if test "${enable_timer+set}" = set; then @@ -3373,7 +3389,7 @@ fi echo $ac_n "checking for --enable-wave""... $ac_c" 1>&6 -echo "configure:3377: checking for --enable-wave" >&5 +echo "configure:3393: checking for --enable-wave" >&5 no_cache=0 # Check whether --enable-wave or --disable-wave was given. if test "${enable_wave+set}" = set; then @@ -3412,7 +3428,7 @@ fi echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6 -echo "configure:3416: checking for --enable-fraction" >&5 +echo "configure:3432: checking for --enable-fraction" >&5 no_cache=0 # Check whether --enable-fraction or --disable-fraction was given. if test "${enable_fraction+set}" = set; then @@ -3451,7 +3467,7 @@ fi echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6 -echo "configure:3455: checking for --enable-dynlib" >&5 +echo "configure:3471: checking for --enable-dynlib" >&5 no_cache=0 # Check whether --enable-dynlib or --disable-dynlib was given. if test "${enable_dynlib+set}" = set; then @@ -3490,7 +3506,7 @@ fi echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6 -echo "configure:3494: checking for --enable-longlong" >&5 +echo "configure:3510: checking for --enable-longlong" >&5 no_cache=0 # Check whether --enable-longlong or --disable-longlong was given. if test "${enable_longlong+set}" = set; then @@ -3529,7 +3545,7 @@ fi echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6 -echo "configure:3533: checking for --enable-geometry" >&5 +echo "configure:3549: checking for --enable-geometry" >&5 no_cache=0 # Check whether --enable-geometry or --disable-geometry was given. if test "${enable_geometry+set}" = set; then @@ -3568,7 +3584,7 @@ fi echo $ac_n "checking for --enable-log""... $ac_c" 1>&6 -echo "configure:3572: checking for --enable-log" >&5 +echo "configure:3588: checking for --enable-log" >&5 no_cache=0 # Check whether --enable-log or --disable-log was given. if test "${enable_log+set}" = set; then @@ -3607,7 +3623,7 @@ fi echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6 -echo "configure:3611: checking for --enable-streams" >&5 +echo "configure:3627: checking for --enable-streams" >&5 no_cache=0 # Check whether --enable-streams or --disable-streams was given. if test "${enable_streams+set}" = set; then @@ -3646,7 +3662,7 @@ fi echo $ac_n "checking for --enable-file""... $ac_c" 1>&6 -echo "configure:3650: checking for --enable-file" >&5 +echo "configure:3666: checking for --enable-file" >&5 no_cache=0 # Check whether --enable-file or --disable-file was given. if test "${enable_file+set}" = set; then @@ -3685,7 +3701,7 @@ fi echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6 -echo "configure:3689: checking for --enable-ffile" >&5 +echo "configure:3705: checking for --enable-ffile" >&5 no_cache=0 # Check whether --enable-ffile or --disable-ffile was given. if test "${enable_ffile+set}" = set; then @@ -3723,8 +3739,47 @@ fi fi + echo $ac_n "checking for --enable-textbuf""... $ac_c" 1>&6 +echo "configure:3744: checking for --enable-textbuf" >&5 + no_cache=0 + # Check whether --enable-textbuf or --disable-textbuf was given. +if test "${enable_textbuf+set}" = set; then + enableval="$enable_textbuf" + + if test "$enableval" = yes; then + ac_cv_use_textbuf='wxUSE_TEXTBUFFER=yes' + else + ac_cv_use_textbuf='wxUSE_TEXTBUFFER=no' + fi + +else + + LINE=`grep "wxUSE_TEXTBUFFER" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_textbuf='wxUSE_TEXTBUFFER='$DEFAULT_wxUSE_TEXTBUFFER + +fi + + + eval "$ac_cv_use_textbuf" + if test "$no_cache" != 1; then + echo $ac_cv_use_textbuf >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_TEXTBUFFER" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking for --enable-textfile""... $ac_c" 1>&6 -echo "configure:3728: checking for --enable-textfile" >&5 +echo "configure:3783: checking for --enable-textfile" >&5 no_cache=0 # Check whether --enable-textfile or --disable-textfile was given. if test "${enable_textfile+set}" = set; then @@ -3763,7 +3818,7 @@ fi echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6 -echo "configure:3767: checking for --enable-fontmap" >&5 +echo "configure:3822: checking for --enable-fontmap" >&5 no_cache=0 # Check whether --enable-fontmap or --disable-fontmap was given. if test "${enable_fontmap+set}" = set; then @@ -3802,7 +3857,7 @@ fi echo $ac_n "checking for --enable-unicode""... $ac_c" 1>&6 -echo "configure:3806: checking for --enable-unicode" >&5 +echo "configure:3861: checking for --enable-unicode" >&5 no_cache=0 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then @@ -3841,7 +3896,7 @@ fi echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6 -echo "configure:3845: checking for --enable-wxprintfv" >&5 +echo "configure:3900: checking for --enable-wxprintfv" >&5 no_cache=0 # Check whether --enable-wxprintfv or --disable-wxprintfv was given. if test "${enable_wxprintfv+set}" = set; then @@ -3880,7 +3935,7 @@ fi echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6 -echo "configure:3884: checking for --enable-std_iostreams" >&5 +echo "configure:3939: 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 @@ -3919,7 +3974,7 @@ fi echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6 -echo "configure:3923: checking for --enable-filesystem" >&5 +echo "configure:3978: checking for --enable-filesystem" >&5 no_cache=0 # Check whether --enable-filesystem or --disable-filesystem was given. if test "${enable_filesystem+set}" = set; then @@ -3958,7 +4013,7 @@ fi echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6 -echo "configure:3962: checking for --enable-fs_inet" >&5 +echo "configure:4017: 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 @@ -3997,7 +4052,7 @@ fi echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6 -echo "configure:4001: checking for --enable-fs_zip" >&5 +echo "configure:4056: 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 @@ -4036,7 +4091,7 @@ fi echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6 -echo "configure:4040: checking for --enable-zipstream" >&5 +echo "configure:4095: checking for --enable-zipstream" >&5 no_cache=0 # Check whether --enable-zipstream or --disable-zipstream was given. if test "${enable_zipstream+set}" = set; then @@ -4076,7 +4131,7 @@ fi echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6 -echo "configure:4080: checking for --enable-catch_segvs" >&5 +echo "configure:4135: checking for --enable-catch_segvs" >&5 no_cache=0 # Check whether --enable-catch_segvs or --disable-catch_segvs was given. if test "${enable_catch_segvs+set}" = set; then @@ -4115,7 +4170,7 @@ fi echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6 -echo "configure:4119: checking for --enable-snglinst" >&5 +echo "configure:4174: checking for --enable-snglinst" >&5 no_cache=0 # Check whether --enable-snglinst or --disable-snglinst was given. if test "${enable_snglinst+set}" = set; then @@ -4155,7 +4210,7 @@ fi echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6 -echo "configure:4159: checking for --enable-mimetype" >&5 +echo "configure:4214: checking for --enable-mimetype" >&5 no_cache=0 # Check whether --enable-mimetype or --disable-mimetype was given. if test "${enable_mimetype+set}" = set; then @@ -4194,7 +4249,7 @@ fi echo $ac_n "checking for --enable-system_options""... $ac_c" 1>&6 -echo "configure:4198: checking for --enable-system_options" >&5 +echo "configure:4253: checking for --enable-system_options" >&5 no_cache=0 # Check whether --enable-system_options or --disable-system_options was given. if test "${enable_system_options+set}" = set; then @@ -4235,7 +4290,7 @@ fi echo $ac_n "checking for --enable-threads""... $ac_c" 1>&6 -echo "configure:4239: checking for --enable-threads" >&5 +echo "configure:4294: checking for --enable-threads" >&5 no_cache=0 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then @@ -4274,7 +4329,7 @@ fi echo $ac_n "checking for --enable-serial""... $ac_c" 1>&6 -echo "configure:4278: checking for --enable-serial" >&5 +echo "configure:4333: checking for --enable-serial" >&5 no_cache=0 # Check whether --enable-serial or --disable-serial was given. if test "${enable_serial+set}" = set; then @@ -4317,7 +4372,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6 -echo "configure:4321: checking for --enable-docview" >&5 +echo "configure:4376: checking for --enable-docview" >&5 no_cache=0 # Check whether --enable-docview or --disable-docview was given. if test "${enable_docview+set}" = set; then @@ -4356,7 +4411,7 @@ fi echo $ac_n "checking for --enable-help""... $ac_c" 1>&6 -echo "configure:4360: checking for --enable-help" >&5 +echo "configure:4415: checking for --enable-help" >&5 no_cache=0 # Check whether --enable-help or --disable-help was given. if test "${enable_help+set}" = set; then @@ -4395,7 +4450,7 @@ fi echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6 -echo "configure:4399: checking for --enable-mshtmlhelp" >&5 +echo "configure:4454: checking for --enable-mshtmlhelp" >&5 no_cache=0 # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given. if test "${enable_mshtmlhelp+set}" = set; then @@ -4434,7 +4489,7 @@ fi echo $ac_n "checking for --enable-html""... $ac_c" 1>&6 -echo "configure:4438: checking for --enable-html" >&5 +echo "configure:4493: checking for --enable-html" >&5 no_cache=0 # Check whether --enable-html or --disable-html was given. if test "${enable_html+set}" = set; then @@ -4473,7 +4528,7 @@ fi echo $ac_n "checking for --enable-htmlhelp""... $ac_c" 1>&6 -echo "configure:4477: checking for --enable-htmlhelp" >&5 +echo "configure:4532: checking for --enable-htmlhelp" >&5 no_cache=0 # Check whether --enable-htmlhelp or --disable-htmlhelp was given. if test "${enable_htmlhelp+set}" = set; then @@ -4512,7 +4567,7 @@ fi echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6 -echo "configure:4516: checking for --enable-constraints" >&5 +echo "configure:4571: checking for --enable-constraints" >&5 no_cache=0 # Check whether --enable-constraints or --disable-constraints was given. if test "${enable_constraints+set}" = set; then @@ -4551,7 +4606,7 @@ fi echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6 -echo "configure:4555: checking for --enable-printarch" >&5 +echo "configure:4610: checking for --enable-printarch" >&5 no_cache=0 # Check whether --enable-printarch or --disable-printarch was given. if test "${enable_printarch+set}" = set; then @@ -4590,7 +4645,7 @@ fi echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6 -echo "configure:4594: checking for --enable-mdi" >&5 +echo "configure:4649: checking for --enable-mdi" >&5 no_cache=0 # Check whether --enable-mdi or --disable-mdi was given. if test "${enable_mdi+set}" = set; then @@ -4629,7 +4684,7 @@ fi echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6 -echo "configure:4633: checking for --enable-loggui" >&5 +echo "configure:4688: checking for --enable-loggui" >&5 no_cache=0 # Check whether --enable-loggui or --disable-loggui was given. if test "${enable_loggui+set}" = set; then @@ -4668,7 +4723,7 @@ fi echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6 -echo "configure:4672: checking for --enable-logwin" >&5 +echo "configure:4727: checking for --enable-logwin" >&5 no_cache=0 # Check whether --enable-logwin or --disable-logwin was given. if test "${enable_logwin+set}" = set; then @@ -4706,9 +4761,48 @@ fi fi + echo $ac_n "checking for --enable-logdialog""... $ac_c" 1>&6 +echo "configure:4766: checking for --enable-logdialog" >&5 + no_cache=0 + # Check whether --enable-logdialog or --disable-logdialog was given. +if test "${enable_logdialog+set}" = set; then + enableval="$enable_logdialog" + + if test "$enableval" = yes; then + ac_cv_use_logdialog='wxUSE_LOGDIALOG=yes' + else + ac_cv_use_logdialog='wxUSE_LOGDIALOG=no' + fi + +else + + LINE=`grep "wxUSE_LOGDIALOG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_logdialog='wxUSE_LOGDIALOG='$DEFAULT_wxUSE_LOGDIALOG + +fi + + + eval "$ac_cv_use_logdialog" + if test "$no_cache" != 1; then + echo $ac_cv_use_logdialog >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_LOGDIALOG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking for --enable-postscript""... $ac_c" 1>&6 -echo "configure:4712: checking for --enable-postscript" >&5 +echo "configure:4806: checking for --enable-postscript" >&5 no_cache=0 # Check whether --enable-postscript or --disable-postscript was given. if test "${enable_postscript+set}" = set; then @@ -4750,7 +4844,7 @@ fi echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6 -echo "configure:4754: checking for --enable-prologio" >&5 +echo "configure:4848: checking for --enable-prologio" >&5 no_cache=0 # Check whether --enable-prologio or --disable-prologio was given. if test "${enable_prologio+set}" = set; then @@ -4789,7 +4883,7 @@ fi echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6 -echo "configure:4793: checking for --enable-resources" >&5 +echo "configure:4887: checking for --enable-resources" >&5 no_cache=0 # Check whether --enable-resources or --disable-resources was given. if test "${enable_resources+set}" = set; then @@ -4829,7 +4923,7 @@ fi echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6 -echo "configure:4833: checking for --enable-xresources" >&5 +echo "configure:4927: checking for --enable-xresources" >&5 no_cache=0 # Check whether --enable-xresources or --disable-xresources was given. if test "${enable_xresources+set}" = set; then @@ -4870,7 +4964,7 @@ fi echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6 -echo "configure:4874: checking for --enable-clipboard" >&5 +echo "configure:4968: checking for --enable-clipboard" >&5 no_cache=0 # Check whether --enable-clipboard or --disable-clipboard was given. if test "${enable_clipboard+set}" = set; then @@ -4909,7 +5003,7 @@ fi echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6 -echo "configure:4913: checking for --enable-dnd" >&5 +echo "configure:5007: checking for --enable-dnd" >&5 no_cache=0 # Check whether --enable-dnd or --disable-dnd was given. if test "${enable_dnd+set}" = set; then @@ -4948,7 +5042,7 @@ fi echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6 -echo "configure:4952: checking for --enable-metafile" >&5 +echo "configure:5046: checking for --enable-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -4988,7 +5082,7 @@ fi echo $ac_n "checking for --enable-treelayout""... $ac_c" 1>&6 -echo "configure:4992: checking for --enable-treelayout" >&5 +echo "configure:5086: checking for --enable-treelayout" >&5 no_cache=0 # Check whether --enable-treelayout or --disable-treelayout was given. if test "${enable_treelayout+set}" = set; then @@ -5029,7 +5123,7 @@ fi echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6 -echo "configure:5033: checking for --enable-controls" >&5 +echo "configure:5127: checking for --enable-controls" >&5 no_cache=0 # Check whether --enable-controls or --disable-controls was given. if test "${enable_controls+set}" = set; then @@ -5147,7 +5241,7 @@ fi echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6 -echo "configure:5151: checking for --enable-accel" >&5 +echo "configure:5245: checking for --enable-accel" >&5 no_cache=0 # Check whether --enable-accel or --disable-accel was given. if test "${enable_accel+set}" = set; then @@ -5186,7 +5280,7 @@ fi echo $ac_n "checking for --enable-button""... $ac_c" 1>&6 -echo "configure:5190: checking for --enable-button" >&5 +echo "configure:5284: checking for --enable-button" >&5 no_cache=0 # Check whether --enable-button or --disable-button was given. if test "${enable_button+set}" = set; then @@ -5225,7 +5319,7 @@ fi echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6 -echo "configure:5229: checking for --enable-bmpbutton" >&5 +echo "configure:5323: checking for --enable-bmpbutton" >&5 no_cache=0 # Check whether --enable-bmpbutton or --disable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then @@ -5264,7 +5358,7 @@ fi echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6 -echo "configure:5268: checking for --enable-calendar" >&5 +echo "configure:5362: checking for --enable-calendar" >&5 no_cache=0 # Check whether --enable-calendar or --disable-calendar was given. if test "${enable_calendar+set}" = set; then @@ -5303,7 +5397,7 @@ fi echo $ac_n "checking for --enable-caret""... $ac_c" 1>&6 -echo "configure:5307: checking for --enable-caret" >&5 +echo "configure:5401: checking for --enable-caret" >&5 no_cache=0 # Check whether --enable-caret or --disable-caret was given. if test "${enable_caret+set}" = set; then @@ -5342,7 +5436,7 @@ fi echo $ac_n "checking for --enable-checkbox""... $ac_c" 1>&6 -echo "configure:5346: checking for --enable-checkbox" >&5 +echo "configure:5440: checking for --enable-checkbox" >&5 no_cache=0 # Check whether --enable-checkbox or --disable-checkbox was given. if test "${enable_checkbox+set}" = set; then @@ -5381,7 +5475,7 @@ fi echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6 -echo "configure:5385: checking for --enable-checklst" >&5 +echo "configure:5479: checking for --enable-checklst" >&5 no_cache=0 # Check whether --enable-checklst or --disable-checklst was given. if test "${enable_checklst+set}" = set; then @@ -5420,7 +5514,7 @@ fi echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6 -echo "configure:5424: checking for --enable-choice" >&5 +echo "configure:5518: checking for --enable-choice" >&5 no_cache=0 # Check whether --enable-choice or --disable-choice was given. if test "${enable_choice+set}" = set; then @@ -5459,7 +5553,7 @@ fi echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6 -echo "configure:5463: checking for --enable-combobox" >&5 +echo "configure:5557: checking for --enable-combobox" >&5 no_cache=0 # Check whether --enable-combobox or --disable-combobox was given. if test "${enable_combobox+set}" = set; then @@ -5498,7 +5592,7 @@ fi echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6 -echo "configure:5502: checking for --enable-gauge" >&5 +echo "configure:5596: checking for --enable-gauge" >&5 no_cache=0 # Check whether --enable-gauge or --disable-gauge was given. if test "${enable_gauge+set}" = set; then @@ -5537,7 +5631,7 @@ fi echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6 -echo "configure:5541: checking for --enable-grid" >&5 +echo "configure:5635: checking for --enable-grid" >&5 no_cache=0 # Check whether --enable-grid or --disable-grid was given. if test "${enable_grid+set}" = set; then @@ -5576,7 +5670,7 @@ fi echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6 -echo "configure:5580: checking for --enable-newgrid" >&5 +echo "configure:5674: checking for --enable-newgrid" >&5 no_cache=0 # Check whether --enable-newgrid or --disable-newgrid was given. if test "${enable_newgrid+set}" = set; then @@ -5615,7 +5709,7 @@ fi echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6 -echo "configure:5619: checking for --enable-imaglist" >&5 +echo "configure:5713: checking for --enable-imaglist" >&5 no_cache=0 # Check whether --enable-imaglist or --disable-imaglist was given. if test "${enable_imaglist+set}" = set; then @@ -5654,7 +5748,7 @@ fi echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6 -echo "configure:5658: checking for --enable-listbox" >&5 +echo "configure:5752: checking for --enable-listbox" >&5 no_cache=0 # Check whether --enable-listbox or --disable-listbox was given. if test "${enable_listbox+set}" = set; then @@ -5693,7 +5787,7 @@ fi echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6 -echo "configure:5697: checking for --enable-listctrl" >&5 +echo "configure:5791: checking for --enable-listctrl" >&5 no_cache=0 # Check whether --enable-listctrl or --disable-listctrl was given. if test "${enable_listctrl+set}" = set; then @@ -5732,7 +5826,7 @@ fi echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6 -echo "configure:5736: checking for --enable-notebook" >&5 +echo "configure:5830: checking for --enable-notebook" >&5 no_cache=0 # Check whether --enable-notebook or --disable-notebook was given. if test "${enable_notebook+set}" = set; then @@ -5771,7 +5865,7 @@ fi echo $ac_n "checking for --enable-propsheet""... $ac_c" 1>&6 -echo "configure:5775: checking for --enable-propsheet" >&5 +echo "configure:5869: checking for --enable-propsheet" >&5 no_cache=0 # Check whether --enable-propsheet or --disable-propsheet was given. if test "${enable_propsheet+set}" = set; then @@ -5810,7 +5904,7 @@ fi echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6 -echo "configure:5814: checking for --enable-radiobox" >&5 +echo "configure:5908: checking for --enable-radiobox" >&5 no_cache=0 # Check whether --enable-radiobox or --disable-radiobox was given. if test "${enable_radiobox+set}" = set; then @@ -5849,7 +5943,7 @@ fi echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6 -echo "configure:5853: checking for --enable-radiobtn" >&5 +echo "configure:5947: checking for --enable-radiobtn" >&5 no_cache=0 # Check whether --enable-radiobtn or --disable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then @@ -5888,7 +5982,7 @@ fi echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6 -echo "configure:5892: checking for --enable-sash" >&5 +echo "configure:5986: checking for --enable-sash" >&5 no_cache=0 # Check whether --enable-sash or --disable-sash was given. if test "${enable_sash+set}" = set; then @@ -5927,7 +6021,7 @@ fi echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6 -echo "configure:5931: checking for --enable-scrollbar" >&5 +echo "configure:6025: checking for --enable-scrollbar" >&5 no_cache=0 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -5966,7 +6060,7 @@ fi echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6 -echo "configure:5970: checking for --enable-slider" >&5 +echo "configure:6064: checking for --enable-slider" >&5 no_cache=0 # Check whether --enable-slider or --disable-slider was given. if test "${enable_slider+set}" = set; then @@ -6005,7 +6099,7 @@ fi echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6 -echo "configure:6009: checking for --enable-spinbtn" >&5 +echo "configure:6103: checking for --enable-spinbtn" >&5 no_cache=0 # Check whether --enable-spinbtn or --disable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then @@ -6044,7 +6138,7 @@ fi echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6 -echo "configure:6048: checking for --enable-spinctrl" >&5 +echo "configure:6142: checking for --enable-spinctrl" >&5 no_cache=0 # Check whether --enable-spinctrl or --disable-spinctrl was given. if test "${enable_spinctrl+set}" = set; then @@ -6083,7 +6177,7 @@ fi echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6 -echo "configure:6087: checking for --enable-splitter" >&5 +echo "configure:6181: checking for --enable-splitter" >&5 no_cache=0 # Check whether --enable-splitter or --disable-splitter was given. if test "${enable_splitter+set}" = set; then @@ -6122,7 +6216,7 @@ fi echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6 -echo "configure:6126: checking for --enable-statbmp" >&5 +echo "configure:6220: checking for --enable-statbmp" >&5 no_cache=0 # Check whether --enable-statbmp or --disable-statbmp was given. if test "${enable_statbmp+set}" = set; then @@ -6161,7 +6255,7 @@ fi echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6 -echo "configure:6165: checking for --enable-statbox" >&5 +echo "configure:6259: checking for --enable-statbox" >&5 no_cache=0 # Check whether --enable-statbox or --disable-statbox was given. if test "${enable_statbox+set}" = set; then @@ -6200,7 +6294,7 @@ fi echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6 -echo "configure:6204: checking for --enable-statline" >&5 +echo "configure:6298: checking for --enable-statline" >&5 no_cache=0 # Check whether --enable-statline or --disable-statline was given. if test "${enable_statline+set}" = set; then @@ -6239,7 +6333,7 @@ fi echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6 -echo "configure:6243: checking for --enable-stattext" >&5 +echo "configure:6337: checking for --enable-stattext" >&5 no_cache=0 # Check whether --enable-stattext or --disable-stattext was given. if test "${enable_stattext+set}" = set; then @@ -6278,7 +6372,7 @@ fi echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6 -echo "configure:6282: checking for --enable-statusbar" >&5 +echo "configure:6376: checking for --enable-statusbar" >&5 no_cache=0 # Check whether --enable-statusbar or --disable-statusbar was given. if test "${enable_statusbar+set}" = set; then @@ -6317,7 +6411,7 @@ fi echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6 -echo "configure:6321: checking for --enable-tabdialog" >&5 +echo "configure:6415: checking for --enable-tabdialog" >&5 no_cache=0 # Check whether --enable-tabdialog or --disable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then @@ -6356,7 +6450,7 @@ fi echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6 -echo "configure:6360: checking for --enable-textctrl" >&5 +echo "configure:6454: checking for --enable-textctrl" >&5 no_cache=0 # Check whether --enable-textctrl or --disable-textctrl was given. if test "${enable_textctrl+set}" = set; then @@ -6395,7 +6489,7 @@ fi echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6 -echo "configure:6399: checking for --enable-togglebtn" >&5 +echo "configure:6493: checking for --enable-togglebtn" >&5 no_cache=0 # Check whether --enable-togglebtn or --disable-togglebtn was given. if test "${enable_togglebtn+set}" = set; then @@ -6434,7 +6528,7 @@ fi echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6 -echo "configure:6438: checking for --enable-toolbar" >&5 +echo "configure:6532: checking for --enable-toolbar" >&5 no_cache=0 # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then @@ -6473,7 +6567,7 @@ fi echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6 -echo "configure:6477: checking for --enable-tbarnative" >&5 +echo "configure:6571: checking for --enable-tbarnative" >&5 no_cache=0 # Check whether --enable-tbarnative or --disable-tbarnative was given. if test "${enable_tbarnative+set}" = set; then @@ -6512,7 +6606,7 @@ fi echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6 -echo "configure:6516: checking for --enable-tbarsmpl" >&5 +echo "configure:6610: checking for --enable-tbarsmpl" >&5 no_cache=0 # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given. if test "${enable_tbarsmpl+set}" = set; then @@ -6551,7 +6645,7 @@ fi echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6 -echo "configure:6555: checking for --enable-treectrl" >&5 +echo "configure:6649: checking for --enable-treectrl" >&5 no_cache=0 # Check whether --enable-treectrl or --disable-treectrl was given. if test "${enable_treectrl+set}" = set; then @@ -6590,7 +6684,7 @@ fi echo $ac_n "checking for --enable-popupwin""... $ac_c" 1>&6 -echo "configure:6594: checking for --enable-popupwin" >&5 +echo "configure:6688: checking for --enable-popupwin" >&5 no_cache=0 # Check whether --enable-popupwin or --disable-popupwin was given. if test "${enable_popupwin+set}" = set; then @@ -6631,7 +6725,7 @@ fi echo $ac_n "checking for --enable-commondlg""... $ac_c" 1>&6 -echo "configure:6635: checking for --enable-commondlg" >&5 +echo "configure:6729: checking for --enable-commondlg" >&5 no_cache=0 # Check whether --enable-commondlg or --disable-commondlg was given. if test "${enable_commondlg+set}" = set; then @@ -6670,7 +6764,7 @@ fi echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6 -echo "configure:6674: checking for --enable-choicedlg" >&5 +echo "configure:6768: checking for --enable-choicedlg" >&5 no_cache=0 # Check whether --enable-choicedlg or --disable-choicedlg was given. if test "${enable_choicedlg+set}" = set; then @@ -6709,7 +6803,7 @@ fi echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6 -echo "configure:6713: checking for --enable-coldlg" >&5 +echo "configure:6807: checking for --enable-coldlg" >&5 no_cache=0 # Check whether --enable-coldlg or --disable-coldlg was given. if test "${enable_coldlg+set}" = set; then @@ -6748,7 +6842,7 @@ fi echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6 -echo "configure:6752: checking for --enable-filedlg" >&5 +echo "configure:6846: checking for --enable-filedlg" >&5 no_cache=0 # Check whether --enable-filedlg or --disable-filedlg was given. if test "${enable_filedlg+set}" = set; then @@ -6786,17 +6880,17 @@ fi fi - echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6 -echo "configure:6791: checking for --enable-filedlg" >&5 + echo $ac_n "checking for --enable-finddlg""... $ac_c" 1>&6 +echo "configure:6885: checking for --enable-finddlg" >&5 no_cache=0 - # Check whether --enable-filedlg or --disable-filedlg was given. -if test "${enable_filedlg+set}" = set; then - enableval="$enable_filedlg" + # Check whether --enable-finddlg or --disable-finddlg was given. +if test "${enable_finddlg+set}" = set; then + enableval="$enable_finddlg" if test "$enableval" = yes; then - ac_cv_use_filedlg='wxUSE_FINDREPLDLG=yes' + ac_cv_use_finddlg='wxUSE_FINDREPLDLG=yes' else - ac_cv_use_filedlg='wxUSE_FINDREPLDLG=no' + ac_cv_use_finddlg='wxUSE_FINDREPLDLG=no' fi else @@ -6808,14 +6902,14 @@ else no_cache=1 fi - ac_cv_use_filedlg='wxUSE_FINDREPLDLG='$DEFAULT_wxUSE_FINDREPLDLG + ac_cv_use_finddlg='wxUSE_FINDREPLDLG='$DEFAULT_wxUSE_FINDREPLDLG fi - eval "$ac_cv_use_filedlg" + eval "$ac_cv_use_finddlg" if test "$no_cache" != 1; then - echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_finddlg >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_FINDREPLDLG" = yes; then @@ -6826,7 +6920,7 @@ fi echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6 -echo "configure:6830: checking for --enable-fontdlg" >&5 +echo "configure:6924: checking for --enable-fontdlg" >&5 no_cache=0 # Check whether --enable-fontdlg or --disable-fontdlg was given. if test "${enable_fontdlg+set}" = set; then @@ -6865,7 +6959,7 @@ fi echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6 -echo "configure:6869: checking for --enable-dirdlg" >&5 +echo "configure:6963: checking for --enable-dirdlg" >&5 no_cache=0 # Check whether --enable-dirdlg or --disable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then @@ -6904,7 +6998,7 @@ fi echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6 -echo "configure:6908: checking for --enable-msgdlg" >&5 +echo "configure:7002: checking for --enable-msgdlg" >&5 no_cache=0 # Check whether --enable-msgdlg or --disable-msgdlg was given. if test "${enable_msgdlg+set}" = set; then @@ -6943,7 +7037,7 @@ fi echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6 -echo "configure:6947: checking for --enable-numberdlg" >&5 +echo "configure:7041: checking for --enable-numberdlg" >&5 no_cache=0 # Check whether --enable-numberdlg or --disable-numberdlg was given. if test "${enable_numberdlg+set}" = set; then @@ -6982,7 +7076,7 @@ fi echo $ac_n "checking for --enable-splash""... $ac_c" 1>&6 -echo "configure:6986: checking for --enable-splash" >&5 +echo "configure:7080: checking for --enable-splash" >&5 no_cache=0 # Check whether --enable-splash or --disable-splash was given. if test "${enable_splash+set}" = set; then @@ -7021,7 +7115,7 @@ fi echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6 -echo "configure:7025: checking for --enable-textdlg" >&5 +echo "configure:7119: checking for --enable-textdlg" >&5 no_cache=0 # Check whether --enable-textdlg or --disable-textdlg was given. if test "${enable_textdlg+set}" = set; then @@ -7060,7 +7154,7 @@ fi echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6 -echo "configure:7064: checking for --enable-tipdlg" >&5 +echo "configure:7158: checking for --enable-tipdlg" >&5 no_cache=0 # Check whether --enable-tipdlg or --disable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then @@ -7099,7 +7193,7 @@ fi echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6 -echo "configure:7103: checking for --enable-progressdlg" >&5 +echo "configure:7197: checking for --enable-progressdlg" >&5 no_cache=0 # Check whether --enable-progressdlg or --disable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then @@ -7138,7 +7232,7 @@ fi echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6 -echo "configure:7142: checking for --enable-wizarddlg" >&5 +echo "configure:7236: checking for --enable-wizarddlg" >&5 no_cache=0 # Check whether --enable-wizarddlg or --disable-wizarddlg was given. if test "${enable_wizarddlg+set}" = set; then @@ -7179,7 +7273,7 @@ fi echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6 -echo "configure:7183: checking for --enable-menus" >&5 +echo "configure:7277: checking for --enable-menus" >&5 no_cache=0 # Check whether --enable-menus or --disable-menus was given. if test "${enable_menus+set}" = set; then @@ -7218,7 +7312,7 @@ fi echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6 -echo "configure:7222: checking for --enable-miniframe" >&5 +echo "configure:7316: checking for --enable-miniframe" >&5 no_cache=0 # Check whether --enable-miniframe or --disable-miniframe was given. if test "${enable_miniframe+set}" = set; then @@ -7257,7 +7351,7 @@ fi echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6 -echo "configure:7261: checking for --enable-tooltips" >&5 +echo "configure:7355: checking for --enable-tooltips" >&5 no_cache=0 # Check whether --enable-tooltips or --disable-tooltips was given. if test "${enable_tooltips+set}" = set; then @@ -7296,7 +7390,7 @@ fi echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6 -echo "configure:7300: checking for --enable-splines" >&5 +echo "configure:7394: checking for --enable-splines" >&5 no_cache=0 # Check whether --enable-splines or --disable-splines was given. if test "${enable_splines+set}" = set; then @@ -7335,7 +7429,7 @@ fi echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6 -echo "configure:7339: checking for --enable-validators" >&5 +echo "configure:7433: checking for --enable-validators" >&5 no_cache=0 # Check whether --enable-validators or --disable-validators was given. if test "${enable_validators+set}" = set; then @@ -7374,7 +7468,7 @@ fi echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6 -echo "configure:7378: checking for --enable-busyinfo" >&5 +echo "configure:7472: checking for --enable-busyinfo" >&5 no_cache=0 # Check whether --enable-busyinfo or --disable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then @@ -7413,7 +7507,7 @@ fi echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6 -echo "configure:7417: checking for --enable-joystick" >&5 +echo "configure:7511: checking for --enable-joystick" >&5 no_cache=0 # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then @@ -7452,7 +7546,7 @@ fi echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6 -echo "configure:7456: checking for --enable-metafile" >&5 +echo "configure:7550: checking for --enable-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -7491,7 +7585,7 @@ fi echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6 -echo "configure:7495: checking for --enable-dragimage" >&5 +echo "configure:7589: checking for --enable-dragimage" >&5 no_cache=0 # Check whether --enable-dragimage or --disable-dragimage was given. if test "${enable_dragimage+set}" = set; then @@ -7532,7 +7626,7 @@ fi echo $ac_n "checking for --enable-palette""... $ac_c" 1>&6 -echo "configure:7536: checking for --enable-palette" >&5 +echo "configure:7630: checking for --enable-palette" >&5 no_cache=0 # Check whether --enable-palette or --disable-palette was given. if test "${enable_palette+set}" = set; then @@ -7571,7 +7665,7 @@ fi echo $ac_n "checking for --enable-image""... $ac_c" 1>&6 -echo "configure:7575: checking for --enable-image" >&5 +echo "configure:7669: checking for --enable-image" >&5 no_cache=0 # Check whether --enable-image or --disable-image was given. if test "${enable_image+set}" = set; then @@ -7610,7 +7704,7 @@ fi echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6 -echo "configure:7614: checking for --enable-gif" >&5 +echo "configure:7708: checking for --enable-gif" >&5 no_cache=0 # Check whether --enable-gif or --disable-gif was given. if test "${enable_gif+set}" = set; then @@ -7649,7 +7743,7 @@ fi echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6 -echo "configure:7653: checking for --enable-pcx" >&5 +echo "configure:7747: checking for --enable-pcx" >&5 no_cache=0 # Check whether --enable-pcx or --disable-pcx was given. if test "${enable_pcx+set}" = set; then @@ -7688,7 +7782,7 @@ fi echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6 -echo "configure:7692: checking for --enable-pnm" >&5 +echo "configure:7786: checking for --enable-pnm" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -7726,17 +7820,17 @@ fi fi - echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6 -echo "configure:7731: checking for --enable-pnm" >&5 + echo $ac_n "checking for --enable-xpm""... $ac_c" 1>&6 +echo "configure:7825: checking for --enable-xpm" >&5 no_cache=0 - # Check whether --enable-pnm or --disable-pnm was given. -if test "${enable_pnm+set}" = set; then - enableval="$enable_pnm" + # Check whether --enable-xpm or --disable-xpm was given. +if test "${enable_xpm+set}" = set; then + enableval="$enable_xpm" if test "$enableval" = yes; then - ac_cv_use_pnm='wxUSE_XPM=yes' + ac_cv_use_xpm='wxUSE_XPM=yes' else - ac_cv_use_pnm='wxUSE_XPM=no' + ac_cv_use_xpm='wxUSE_XPM=no' fi else @@ -7748,14 +7842,14 @@ else no_cache=1 fi - ac_cv_use_pnm='wxUSE_XPM='$DEFAULT_wxUSE_XPM + ac_cv_use_xpm='wxUSE_XPM='$DEFAULT_wxUSE_XPM fi - eval "$ac_cv_use_pnm" + eval "$ac_cv_use_xpm" if test "$no_cache" != 1; then - echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_xpm >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_XPM" = yes; then @@ -7774,7 +7868,7 @@ fi echo $ac_n "checking for toolkit""... $ac_c" 1>&6 -echo "configure:7778: checking for toolkit" >&5 +echo "configure:7872: checking for toolkit" >&5 if test "$wxUSE_GUI" = "yes"; then @@ -7800,11 +7894,10 @@ if test "$wxUSE_GUI" = "yes"; then fi NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} \ - + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} \ - + ${wxUSE_MGL:-0}` + + ${wxUSE_WINE:-0} + ${wxUSE_MSW:-0} + ${wxUSE_MGL:-0}` case "${host}" in - *-pc-os2_emx ) + *-pc-os2_emx | *-pc-os2-emx ) # PATH_IFS is autodetected by OS/2's configure (usually ';') NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` LEX_STEM="lexyy" @@ -7913,7 +8006,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7917: checking for $ac_word" >&5 +echo "configure:8010: 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 @@ -7943,7 +8036,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:7947: checking for $ac_word" >&5 +echo "configure:8040: 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 @@ -7994,7 +8087,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:7998: checking for $ac_word" >&5 +echo "configure:8091: 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 @@ -8026,7 +8119,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:8030: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:8123: 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. @@ -8037,12 +8130,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 8041 "configure" +#line 8134 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:8046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8139: \"$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 @@ -8068,12 +8161,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:8072: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:8165: 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:8077: checking whether we are using GNU C" >&5 +echo "configure:8170: 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 @@ -8082,7 +8175,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:8086: \"$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:8179: \"$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 @@ -8101,7 +8194,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:8105: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:8198: 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 @@ -8136,7 +8229,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:8140: checking how to run the C preprocessor" >&5 +echo "configure:8233: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -8151,13 +8244,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:8161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8254: \"$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 : @@ -8168,13 +8261,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:8178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8271: \"$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 : @@ -8185,13 +8278,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:8195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8288: \"$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 : @@ -8217,13 +8310,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:8221: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:8314: 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 @@ -8241,7 +8334,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -8277,7 +8370,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:8281: checking for $ac_word" >&5 +echo "configure:8374: 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 @@ -8309,7 +8402,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:8313: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:8406: 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. @@ -8320,12 +8413,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 8324 "configure" +#line 8417 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:8329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8422: \"$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 @@ -8351,12 +8444,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:8355: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:8448: 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:8360: checking whether we are using GNU C++" >&5 +echo "configure:8453: 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 @@ -8365,7 +8458,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:8369: \"$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:8462: \"$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 @@ -8384,7 +8477,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:8388: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:8481: 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 @@ -8429,7 +8522,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:8433: checking for $ac_word" >&5 +echo "configure:8526: 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 @@ -8460,7 +8553,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:8464: checking for $ac_word" >&5 +echo "configure:8557: 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 @@ -8500,7 +8593,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:8504: checking for a BSD compatible install" >&5 +echo "configure:8597: 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 @@ -8552,11 +8645,20 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +case "${host}" in + + powerpc-*-darwin* ) + INSTALL_PROGRAM="cp -fp" + INSTALL_DATA="cp -fp" + ;; + *) + ;; +esac # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8560: checking for $ac_word" >&5 +echo "configure:8662: 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 @@ -8585,7 +8687,7 @@ fi echo $ac_n "checking make for VPATH support""... $ac_c" 1>&6 -echo "configure:8589: checking make for VPATH support" >&5 +echo "configure:8691: checking make for VPATH support" >&5 cat - << EOF > confMake check : file cp \$? \$@ @@ -8622,7 +8724,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:8626: checking for $ac_word" >&5 +echo "configure:8728: 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 @@ -8656,7 +8758,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:8660: checking for $ac_word" >&5 +echo "configure:8762: 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 @@ -8690,7 +8792,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:8694: checking for yywrap in -l$ac_lib" >&5 +echo "configure:8796: 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 @@ -8698,7 +8800,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:8815: \"$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 @@ -8733,7 +8835,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:8737: checking whether ln -s works" >&5 +echo "configure:8839: 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 @@ -8874,21 +8976,28 @@ rm -f confcache + REGEX_INCLUDE= if test "$wxUSE_REGEX" != "no"; then - ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'` + cat >> confdefs.h <<\EOF +#define wxUSE_REGEX 1 +EOF + + + if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then + ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for regex.h""... $ac_c" 1>&6 -echo "configure:8882: checking for regex.h" >&5 +echo "configure:8991: checking for regex.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9001: \"$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* @@ -8907,12 +9016,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then for ac_func in regcomp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8911: checking for $ac_func" >&5 +echo "configure:9020: 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:9048: \"$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 @@ -8964,43 +9073,46 @@ else fi - if test "x$ac_cv_func_regcomp" != "xyes"; then - if test "$wxUSE_REGEX" = "sys"; then - { echo "configure: error: system regex library not found! Use --with-regex to use the built-in regex library." 1>&2; exit 1; } + if test "x$ac_cv_func_regcomp" != "xyes"; then + if test "$wxUSE_REGEX" = "sys" ; then + { echo "configure: error: system regex library not found! Use --with-regex to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system regex library not found, will use built-in instead" 1>&2 + wxUSE_REGEX=builtin + fi + else + wxUSE_REGEX=sys fi - - REGEX_INCLUDE="-I\${top_srcdir}/src/regex" fi - cat >> confdefs.h <<\EOF -#define wxUSE_REGEX 1 -EOF - + if test "$wxUSE_REGEX" = "builtin" ; then + REGEX_INCLUDE="-I\${top_srcdir}/src/regex" + fi fi -AFMINSTALL= +ZLIB_INCLUDE= +ZLIB_LINK= +if test "$wxUSE_ZLIB" != "no" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_ZLIB 1 +EOF -TOOLKIT= -TOOLKIT_INCLUDE= -WIDGET_SET= -if test "$USE_WIN32" = 1 ; then - for ac_hdr in w32api.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8994: checking for $ac_hdr" >&5 + if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then + ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 +echo "configure:9106: 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 < +#include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9004: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9116: \"$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* @@ -9016,29 +9128,96 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 +echo "configure:9133: 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 <&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 + ZLIB_LINK=" -lz" else echo "$ac_t""no" 1>&6 fi -done - ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for windows.h""... $ac_c" 1>&6 -echo "configure:9032: checking for windows.h" >&5 +else + echo "$ac_t""no" 1>&6 +fi + + + if test "x$ZLIB_LINK" = "x" ; then + if test "$wxUSE_ZLIB" = "sys" ; then + { echo "configure: error: system zlib compression library not found! Use --with-zlib=builtin to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system zlib compression library not found, will use built-in instead" 1>&2 + wxUSE_ZLIB=builtin + fi + else + wxUSE_ZLIB=sys + fi + fi + + if test "$wxUSE_ZLIB" = "builtin" ; then + ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib" + fi +fi + + +PNG_INCLUDE= +PNG_LINK= +if test "$wxUSE_LIBPNG" != "no" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_LIBPNG 1 +EOF + + + if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then + echo "configure: warning: system png library doesn't work without system zlib, will use built-in instead" 1>&2 + wxUSE_LIBPNG=builtin + fi + + if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then + ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for png.h""... $ac_c" 1>&6 +echo "configure:9211: 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:9042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9221: \"$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* @@ -9054,93 +9233,545 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 - - { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; } - -fi - - - echo $ac_n "checking if w32api has good enough MSIE support""... $ac_c" 1>&6 -echo "configure:9068: checking if w32api has good enough MSIE support" >&5 -if eval "test \"`echo '$''{'wx_cv_w32api_win_ie'+set}'`\" = set"; then + echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6 +echo "configure:9238: 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 - - cat > conftest.$ac_ext < conftest.$ac_ext < -int main() { - - #define wxCHECK_W32API_VERSION( major, minor ) \ - ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \ - && ( ( __W32API_MAJOR_VERSION > (major) ) \ - || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor)))) +/* 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 png_check_sig(); - #if !wxCHECK_W32API_VERSION(1,1) - #error You need w32api 1.1 or newer - #endif - +int main() { +png_check_sig() ; return 0; } EOF -if { (eval echo configure:9090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - - wx_cv_w32api_win_ie=yes - CPPFLAGS="$CPPFLAGS -D_WIN_IE=0x400" - + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - - wx_cv_w32api_win_ie=no - + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* - -fi +LIBS="$ac_save_LIBS" -echo "$ac_t""$wx_cv_w32api_win_ie" 1>&6 +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + PNG_LINK=" -lpng" +else + echo "$ac_t""no" 1>&6 +fi - LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32" + +else + echo "$ac_t""no" 1>&6 +fi - if test "$wxUSE_CYGWIN" = 1; then - LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32" - fi - if test "$wxUSE_ODBC" = "yes" ; then - LIBS="$LIBS -lodbc32 -lole32 -loleaut32" + if test "x$PNG_LINK" = "x" ; then + if test "$wxUSE_LIBPNG" = "sys" ; then + { echo "configure: error: system png library not found! Use --with-libpng=builtin to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system png library not found, will use built-in instead" 1>&2 + wxUSE_LIBPNG=builtin + fi + else + wxUSE_LIBPNG=yes + fi fi - if test "$wxUSE_MINGW" = 1; then - LDFLAGS="$LDFLAGS -mwindows" + if test "$wxUSE_LIBPNG" = "builtin" ; then + PNG_INCLUDE="-I\${top_srcdir}/src/png" fi - RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__" - RESPROGRAMOBJ="\$(PROGRAM)_resources.o" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png" fi -if test "$wxUSE_GUI" = "yes"; then - USE_GUI=1 - GUI_TK_LIBRARY= +JPEG_INCLUDE= +JPEG_LINK= +if test "$wxUSE_LIBJPEG" != "no" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_LIBJPEG 1 +EOF - WXGTK12= - WXGTK127= - WXGTK20= - if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then - TOOLKIT=MSW - GUIDIST=MSW_DIST - fi + if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then + echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 +echo "configure:9313: checking for jpeglib.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_jpeglib_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < + #include + +int main() { + + +; return 0; } +EOF +if { (eval echo configure:9330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_jpeglib_h=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_header_jpeglib_h=no + +fi +rm -f conftest* + +fi + + echo "$ac_t""$ac_cv_header_jpeglib_h" 1>&6 + + if test "$ac_cv_header_jpeglib_h" = "yes"; then + echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 +echo "configure:9348: 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="-ljpeg $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 + JPEG_LINK=" -ljpeg" +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "x$JPEG_LINK" = "x" ; then + if test "$wxUSE_LIBJPEG" = "sys" ; then + { echo "configure: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system jpeg library not found, will use built-in instead" 1>&2 + wxUSE_LIBJPEG=builtin + fi + else + wxUSE_LIBJPEG=sys + fi + fi + + if test "$wxUSE_LIBJPEG" = "builtin" ; then + JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg" + fi +fi + + +TIFF_INCLUDE= +TIFF_LINK= +if test "$wxUSE_LIBTIFF" != "no" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_LIBTIFF 1 +EOF + + + if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then + ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 +echo "configure:9418: 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:9428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6 +echo "configure:9445: checking for TIFFError in -ltiff" >&5 +ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ltiff -lm $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + TIFF_LINK=" -ltiff" +else + echo "$ac_t""no" 1>&6 +fi + + +else + echo "$ac_t""no" 1>&6 +fi + + + if test "x$TIFF_LINK" = "x" ; then + if test "$wxUSE_LIBTIFF" = "sys" ; then + { echo "configure: error: system tiff library not found! Use --with-libtiff=builtin to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system tiff library not found, will use built-in instead" 1>&2 + wxUSE_LIBTIFF=builtin + fi + else + wxUSE_LIBTIFF=sys + fi + fi + + if test "$wxUSE_LIBTIFF" = "builtin" ; then + TIFF_INCLUDE="-I\${top_srcdir}/src/tiff" + fi +fi + + +FREETYPE_INCLUDE= +FREETYPE_LINK= +if test "$wxUSE_FREETYPE" != "no" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_FREETYPE 1 +EOF + + + if test "$wxUSE_FREETYPE" = "sys" -o "$wxUSE_FREETYPE" = "yes" ; then + ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for freetype.h""... $ac_c" 1>&6 +echo "configure:9519: checking for freetype.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:9529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6 +echo "configure:9546: checking for FT_Render_Glyph in -lfreetype" >&5 +ac_lib_var=`echo freetype'_'FT_Render_Glyph | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lfreetype -lm $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + FREETYPE_LINK=" -lfreetype" +else + echo "$ac_t""no" 1>&6 +fi + + +else + echo "$ac_t""no" 1>&6 +fi + + + if test "x$FREETYPE_LINK" = "x" ; then + if test "$wxUSE_FREETYPE" = "sys" ; then + { echo "configure: error: system freetype library not found! Use --with-freetype=builtin to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system freetype library not found, will use built-in instead" 1>&2 + wxUSE_FREETYPE=builtin + fi + else + wxUSE_FREETYPE=sys + fi + fi + + if test "$wxUSE_FREETYPE" = "builtin" ; then + FREETYPE_INCLUDE="-I\${top_srcdir}/src/freetype" + fi +fi + + +AFMINSTALL= + +TOOLKIT= +TOOLKIT_INCLUDE= +WIDGET_SET= + +if test "$USE_WIN32" = 1 ; then + for ac_hdr in w32api.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:9620: 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:9630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for windows.h""... $ac_c" 1>&6 +echo "configure:9658: checking for windows.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:9668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 + + { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; } + +fi + + + echo $ac_n "checking if w32api has good enough MSIE support""... $ac_c" 1>&6 +echo "configure:9694: checking if w32api has good enough MSIE support" >&5 +if eval "test \"`echo '$''{'wx_cv_w32api_win32_ie'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < +int main() { + + #define wxCHECK_W32API_VERSION( major, minor ) \ + ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \ + && ( ( __W32API_MAJOR_VERSION > (major) ) \ + || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor)))) + + #if !wxCHECK_W32API_VERSION(1,1) + #error You need w32api 1.1 or newer + #endif + +; return 0; } +EOF +if { (eval echo configure:9716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_w32api_win32_ie=yes + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + wx_cv_w32api_win32_ie=no + +fi +rm -f conftest* + +fi + +echo "$ac_t""$wx_cv_w32api_win32_ie" 1>&6 + if test "$wx_cv_w32api_win32_ie" = "yes" ; then + CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x400" + fi + + LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32" + + case "${host}" in + *-*-cygwin* ) + LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__" + esac + + if test "$wxUSE_ODBC" = "yes" ; then + LIBS=" -lodbc32 -lole32 -loleaut32$LIBS" + fi + + RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__" + RESPROGRAMOBJ="\$(PROGRAM)_resources.o" +fi + +if test "$wxUSE_GUI" = "yes"; then + USE_GUI=1 + + GUI_TK_LIBRARY= + + WXGTK12= + WXGTK127= + WXGTK20= + + if test "$wxUSE_MSW" = 1 ; then + TOOLKIT=MSW + GUIDIST=MSW_DIST + + case "${host}" in + *-*-mingw32* ) + LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows" + esac + fi if test "$wxUSE_GTK" = 1; then echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6 -echo "configure:9144: checking for GTK+ version" >&5 +echo "configure:9775: checking for GTK+ version" >&5 gtk_version_cached=1 if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then @@ -9148,7 +9779,7 @@ echo "configure:9144: checking for GTK+ version" >&5 else gtk_version_cached=0 - echo "$ac_t""""" 1>&6 + echo "$ac_t""" 1>&6 wx_cv_lib_gtk= if test "x$wxUSE_GTK2" = "xyes"; then @@ -9202,7 +9833,7 @@ fi # Extract the first word of "gtk-config-2.0", so it can be a program name with args. set dummy gtk-config-2.0; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9206: checking for $ac_word" >&5 +echo "configure:9837: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG_2_0'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9237,7 +9868,7 @@ fi min_gtk_version=1.3.1 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:9241: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:9872: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG_2_0" = "no" ; then no_gtk=yes @@ -9260,7 +9891,7 @@ echo "configure:9241: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -9338,7 +9969,7 @@ main () } EOF -if { (eval echo configure:9342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -9372,7 +10003,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -9382,7 +10013,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:9386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -9440,7 +10071,7 @@ rm -f conftest* # 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:9444: checking for $ac_word" >&5 +echo "configure:10075: 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 @@ -9475,7 +10106,7 @@ fi min_gtk_version=1.2.7 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:9479: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:10110: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -9488,7 +10119,7 @@ echo "configure:9479: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -9521,7 +10152,7 @@ main () } EOF -if { (eval echo configure:9525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -9570,7 +10201,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9574: checking for $ac_word" >&5 +echo "configure:10205: 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 @@ -9605,7 +10236,7 @@ fi min_gtk_version=1.2.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:9609: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:10240: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -9618,7 +10249,7 @@ echo "configure:9609: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -9651,7 +10282,7 @@ main () } EOF -if { (eval echo configure:9655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -9722,7 +10353,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. GUIDIST=GTK_DIST echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 -echo "configure:9726: checking for gdk_im_open in -lgdk" >&5 +echo "configure:10357: 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 @@ -9730,7 +10361,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:10376: \"$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 @@ -9769,7 +10400,7 @@ fi if test "$wxUSE_MGL" = 1; then echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6 -echo "configure:9773: checking for SciTech MGL library" >&5 +echo "configure:10404: checking for SciTech MGL library" >&5 if test "x$MGL_ROOT" = x ; then echo "$ac_t""not found" 1>&6 { echo "configure: error: Cannot find MGL library. Make sure MGL_ROOT is set." 1>&2; exit 1; } @@ -9781,12 +10412,14 @@ echo "configure:9773: checking for SciTech MGL library" >&5 mgl_lib_type="" if test "$wxUSE_DEBUG_FLAG" = yes ; then - if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a ; then + if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a -o \ + -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.so; then mgl_lib_type=debug fi fi if test "x$mgl_lib_type" = x ; then - if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a ; then + if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a -o \ + -f $MGL_ROOT/lib/release/$mgl_os/libmgl.so; then mgl_lib_type=release else { echo "configure: error: Cannot find MGL libraries, make sure they are compiled." 1>&2; exit 1; } @@ -9804,17 +10437,17 @@ echo "configure:9773: checking for SciTech MGL library" >&5 if test "$wxUSE_WINE" = 1; then ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for windows.h""... $ac_c" 1>&6 -echo "configure:9808: checking for windows.h" >&5 +echo "configure:10441: checking for windows.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10451: \"$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* @@ -9839,9 +10472,9 @@ else fi - xpm_link="" + xpm_link= echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:9845: checking for Xpm library" >&5 +echo "configure:10478: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -9856,7 +10489,7 @@ for ac_dir in $SEARCH_LIB; if test "$ac_find_libraries" != "" ; then GUI_TK_LIBRARY="-L$ac_find_libraries" - xpm_link="-lXpm" + xpm_link=" -lXpm" cat >> confdefs.h <<\EOF #define wxHAVE_LIB_XPM 1 EOF @@ -9867,9 +10500,9 @@ EOF echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2 fi - mesa_link="" + mesa_link= echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 -echo "configure:9873: checking for Mesa library" >&5 +echo "configure:10506: checking for Mesa library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -9884,13 +10517,13 @@ for ac_dir in $SEARCH_LIB; if test "$ac_find_libraries" != "" ; then GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries" - mesa_link="-lMesaGL" + mesa_link=" -lMesaGL" echo "$ac_t""found at $ac_find_libraries" 1>&6 else { echo "configure: error: no" 1>&2; exit 1; } fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine $mesa_link $xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine$mesa_link$xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses" TOOLKIT=MSW GUIDIST=MSW_DIST TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXWINE__" @@ -9902,7 +10535,7 @@ for ac_dir in $SEARCH_LIB; # 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:9906: checking for X" >&5 +echo "configure:10539: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -9964,12 +10597,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:9973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10606: \"$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* @@ -10038,14 +10671,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:10682: \"$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. @@ -10151,17 +10784,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:10155: checking whether -R must be followed by a space" >&5 +echo "configure:10788: 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:10798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -10177,14 +10810,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:10821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -10216,7 +10849,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:10220: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:10853: 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 @@ -10224,7 +10857,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:10872: \"$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 @@ -10257,7 +10890,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:10261: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:10894: 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 @@ -10265,7 +10898,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:10913: \"$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 @@ -10305,12 +10938,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:10309: checking for gethostbyname" >&5 +echo "configure:10942: 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:10970: \"$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 @@ -10354,7 +10987,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:10358: checking for gethostbyname in -lnsl" >&5 +echo "configure:10991: 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 @@ -10362,7 +10995,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:11010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10403,12 +11036,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:10407: checking for connect" >&5 +echo "configure:11040: 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:11068: \"$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 @@ -10452,7 +11085,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:10456: checking for connect in -lsocket" >&5 +echo "configure:11089: 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 @@ -10460,7 +11093,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:11108: \"$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 @@ -10495,12 +11128,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:10499: checking for remove" >&5 +echo "configure:11132: 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:11160: \"$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 @@ -10544,7 +11177,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:10548: checking for remove in -lposix" >&5 +echo "configure:11181: 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 @@ -10552,7 +11185,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:11200: \"$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 @@ -10587,12 +11220,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:10591: checking for shmat" >&5 +echo "configure:11224: 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:11252: \"$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 @@ -10636,7 +11269,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:10640: checking for shmat in -lipc" >&5 +echo "configure:11273: 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 @@ -10644,7 +11277,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:11292: \"$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 @@ -10688,7 +11321,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:10692: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:11325: 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 @@ -10696,7 +11329,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:11344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10742,7 +11375,7 @@ fi COMPILED_X_PROGRAM=0 echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 -echo "configure:10746: checking for Motif/Lesstif headers" >&5 +echo "configure:11379: checking for Motif/Lesstif headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -10757,7 +11390,7 @@ for ac_dir in $SEARCH_INCLUDE; echo "$ac_t""found $ac_find_includes" 1>&6 else cat > conftest.$ac_ext < @@ -10769,7 +11402,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -10790,7 +11423,7 @@ rm -f conftest* if test "$COMPILED_X_PROGRAM" = 0; then echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 -echo "configure:10794: checking for Motif/Lesstif library" >&5 +echo "configure:11427: checking for Motif/Lesstif library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -10811,7 +11444,7 @@ for ac_dir in $SEARCH_LIB; if test $result = 0; then ac_path_to_include="" else - ac_path_to_include="-I$ac_find_includes" + ac_path_to_include=" -I$ac_find_includes" fi @@ -10820,16 +11453,16 @@ for ac_dir in $SEARCH_LIB; if test $result = 0; then ac_path_to_link="" else - ac_path_to_link="-L$ac_find_libraries" + ac_path_to_link=" -L$ac_find_libraries" fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" + 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 < @@ -10841,7 +11474,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -10861,9 +11494,9 @@ rm -f conftest* fi fi - xpm_link="" + xpm_link= echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:10867: checking for Xpm library" >&5 +echo "configure:11500: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -10883,11 +11516,11 @@ for ac_dir in $SEARCH_LIB; if test $result = 0; then ac_path_to_link="" else - ac_path_to_link="-L$ac_find_libraries" + ac_path_to_link=" -L$ac_find_libraries" fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - xpm_link="-lXpm " + GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link" + xpm_link=" -lXpm" cat >> confdefs.h <<\EOF #define wxHAVE_LIB_XPM 1 EOF @@ -10895,7 +11528,7 @@ EOF echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -10907,10 +11540,10 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - xpm_link="-lXpm " + xpm_link=" -lXpm" cat >> confdefs.h <<\EOF #define wxHAVE_LIB_XPM 1 EOF @@ -10931,7 +11564,7 @@ fi rm -f conftest* fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm $xpm_link -lXmu -lXext -lXt -lX11" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link -lXmu -lXext -lXt -lX11" TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo" TOOLKIT=MOTIF GUIDIST=MOTIF_DIST @@ -10939,12 +11572,12 @@ rm -f conftest* if test "$wxUSE_MAC" = 1; then if test "$wxUSE_PRECOMP" = "yes"; then - CPPFLAGS="${CPPFLAGS} -cpp-precomp" + CPPFLAGS="$CPPFLAGS -cpp-precomp" fi - CPPFLAGS="${CPPFLAGS} -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile" - CFLAGS="${CFLAGS} -fpascal-strings" - CXXFLAGS="${CXXFLAGS} -fpascal-strings" - TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DTARGET_CARBON" + CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile" + CFLAGS="$CFLAGS -fpascal-strings" + CXXFLAGS="$CXXFLAGS -fpascal-strings" + TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -DTARGET_CARBON" TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile" TOOLKIT=MAC @@ -10987,22 +11620,19 @@ rm -f conftest* if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)" fi - if test "$wxUSE_LIBJPEG" = "yes" ; then + if test "$wxUSE_LIBJPEG" = "builtin" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)" fi - if test "$wxUSE_LIBTIFF" = "yes" ; then + if test "$wxUSE_LIBTIFF" = "builtin" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)" fi - if test "$wxUSE_LIBPNG" = "yes" ; then + if test "$wxUSE_LIBPNG" = "builtin" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)" fi - if test "$wxUSE_FREETYPE" = "yes" ; then + if test "$wxUSE_FREETYPE" = "builtin" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)" fi - 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 @@ -11021,46 +11651,36 @@ else fi PORT_FILES="\${top_srcdir}/src/files.lst" - RPM_FILES="src/rpmfiles.lst" - RPM_SPEC="wxBase.spec" GUIDIST="BASE_DIST" DISTDIR="wxBase" fi -if test "x$REGEX_INCLUDE" != "x" ; then +if test "$wxUSE_REGEX" = "builtin" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)" fi -if test "$wxUSE_ZLIB" = "yes" ; then +if test "$wxUSE_ZLIB" = "builtin" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" fi if test "$wxUSE_OPENGL" = "yes"; then - if test "$wxUSE_MAC" = 1; then - cat >> confdefs.h <<\EOF -#define wxUSE_OPENGL 1 -EOF - - cat >> confdefs.h <<\EOF -#define wxUSE_GLCANVAS 1 -EOF + if test "$wxUSE_MAC" = 1; then + OPENGL_LIBS="-framework OpenGL -framework AGL" + else - OPENGL_LIBS="-framework OpenGL -framework AGL" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl" - else - ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` + ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6 -echo "configure:11054: checking for GL/gl.h" >&5 +echo "configure:11674: 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:11064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11684: \"$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* @@ -11077,108 +11697,106 @@ 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 + echo $ac_n "checking for -lGL""... $ac_c" 1>&6 +echo "configure:11702: checking for -lGL" >&5 + +ac_find_libraries= +for ac_dir in $SEARCH_LIB; + do + for ac_extension in a so sl dylib; do + if test -f "$ac_dir/libGL.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done - cat >> confdefs.h <<\EOF -#define wxUSE_GLCANVAS 1 -EOF + if test "$ac_find_libraries" != "" ; then + + echo "$LDFLAGS" | 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 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl" - echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6 -echo "configure:11091: 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 <&6 + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for -lMesaGL""... $ac_c" 1>&6 +echo "configure:11731: checking for -lMesaGL" >&5 + +ac_find_libraries= +for ac_dir in $SEARCH_LIB; + do + for ac_extension in a so sl dylib; do + if test -f "$ac_dir/libMesaGL.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done -int main() { -glFlush() -; return 0; } -EOF -if { (eval echo configure:11110: \"$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 "$ac_find_libraries" != "" ; then + + echo "$LDFLAGS" | 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 -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - OPENGL_LIBS="-lGL -lGLU" - + LDFLAGS_GL="$LDFLAGS$ac_path_to_link" + OPENGL_LIBS="-lMesaGL -lMesaGLU" + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + fi + else echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6 -echo "configure:11132: 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_LIBS="-lMesaGL -lMesaGLU" + -else - echo "$ac_t""no" 1>&6 -fi +# AC_CHECK_HEADER(GL/gl.h, +# [ +# AC_CHECK_LIB(GL, glFlush, +# [ +# OPENGL_LIBS="-lGL -lGLU" +# ], +# [ +# AC_CHECK_LIB(MesaGL, glFlush, +# [ +# OPENGL_LIBS="-lMesaGL -lMesaGLU" +# ], +# [], +# [-lm]) +# ], +# [-lm]) +# ]) + + if test "x$OPENGL_LIBS" = "x"; then + { echo "configure: error: OpenGL libraries not available" 1>&2; exit 1; } + fi + fi - -fi + if test "$wxUSE_OPENGL" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_OPENGL 1 +EOF - -else - echo "$ac_t""no" 1>&6 -wxUSE_OPENGL=0 -fi + cat >> confdefs.h <<\EOF +#define wxUSE_GLCANVAS 1 +EOF - fi + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl" + fi fi if test -z "$TOOLKIT_VPATH" ; then @@ -11189,18 +11807,18 @@ if test -n "$TOOLKIT" ; then TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WX${TOOLKIT}__" fi -if test "$wxUSE_CYGWIN" = 1 ; then - TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__" +lib_unicode_suffix= +if test "$wxUSE_UNICODE" = "yes"; then + lib_unicode_suffix=u fi lib_debug_suffix= if test "$wxUSE_DEBUG_FLAG" = "yes"; then lib_debug_suffix=d - TOOLCHAIN_NAME="${TOOLCHAIN_NAME}d" fi -TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_debug_suffix}-${WX_RELEASE}" -TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_debug_suffix}_gl-${WX_RELEASE}" +TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}" +TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}" if test "$cross_compiling" = "yes"; then TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}" @@ -11210,15 +11828,6 @@ fi WX_LIBRARY="wx_${TOOLCHAIN_NAME}" WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}" -WXCONFIG_LIBS="-l${WX_LIBRARY}" - -if test "$wxUSE_OPENGL" = "yes"; then - WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} $OPENGL_LIBS" -fi - -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}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" @@ -11230,6 +11839,35 @@ WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc" WX_RESOURCES_MACOSX_COMPILED="lib${WX_LIBRARY}.r" +case "${host}" in + *-*-cygwin* | *-*-mingw32* ) + + + + if test "$cross_compiling" != "yes"; then + WX_LIBRARY="wxmsw${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}" + WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}" + WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}" + WX_LIBRARY_NAME_SHARED_GL="${WX_LIBRARY_GL}.${SO_SUFFIX}" + else + WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}" + WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" + fi + +esac + +WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" +WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a" + +WXCONFIG_LIBS="-l${WX_LIBRARY}" +WXCONFIG_LIBS_STATIC="lib${WX_LIBRARY}.a" + +if test "$wxUSE_OPENGL" = "yes"; then + WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} ${OPENGL_LIBS}" + WXCONFIG_LIBS_STATIC_GL="lib${WX_LIBRARY_GL}.a ${OPENGL_LIBS}" +fi + + if test "$wxUSE_SHARED" = "yes"; then @@ -11250,7 +11888,7 @@ if test "$wxUSE_SHARED" = "yes"; then case "${host}" in *-hp-hpux* ) if test "$GCC" != "yes"; then - LDFLAGS="-L/usr/lib" + LDFLAGS="$LDFLAGS -L/usr/lib" SHARED_LD="${CXX} -b -o" PIC_FLAG="+Z" @@ -11267,13 +11905,13 @@ if test "$wxUSE_SHARED" = "yes"; then *-*-linux* ) if test "$GCC" != "yes"; then echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6 -echo "configure:11271: checking for Intel compiler" >&5 +echo "configure:11909: checking for Intel compiler" >&5 if eval "test \"`echo '$''{'wx_cv_prog_icc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_prog_icc=yes else @@ -11323,9 +11961,9 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6 ;; *-*-darwin* ) - CFLAGS="${CFLAGS} -fno-common" - CXXFLAGS="${CXXFLAGS} -fno-common" - SHARED_LD="${CXX} -dynamiclib -o" + CFLAGS="$CFLAGS -fno-common" + CXXFLAGS="$CXXFLAGS -fno-common" + SHARED_LD="$CXX -dynamiclib -o" PIC_FLAG="-dynamic -fPIC" ;; @@ -11334,9 +11972,13 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6 ;; *-*-cygwin* | *-*-mingw32* ) - SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_NAME_STATIC} -o" - TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1" - WXMSW_DLL_DEFINES="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1" + + WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a" + + SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o" + TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1" + + PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1" if test "$wxUSE_OPENGL" = "yes"; then WX_ALL_INSTALLED="preinstall_gl" @@ -11344,10 +11986,9 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6 else WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}" fi - PIC_FLAG= ;; - *-pc-os2_emx ) + *-pc-os2_emx | *-pc-os2-emx ) wxUSE_SHARED=no ;; @@ -11373,6 +12014,7 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6 fi WX_TARGET_LIBRARY_TYPE="so" + INSTALL_LIBRARY='$(INSTALL_PROGRAM)' fi if test "$wxUSE_SHARED" = "no"; then @@ -11381,6 +12023,10 @@ if test "$wxUSE_SHARED" = "no"; then WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall" fi + if test "$wxUSE_MAC" = 1; then + WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall" + fi + if test "$wxUSE_OPENGL" = "yes"; then WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_gl" WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC} \$(build_libdir)/${WX_LIBRARY_NAME_STATIC_GL}" @@ -11392,6 +12038,7 @@ if test "$wxUSE_SHARED" = "no"; then WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" WX_TARGET_LIBRARY_TYPE="a" + INSTALL_LIBRARY='$(INSTALL_DATA)' fi if test "$wxUSE_MAC" = 1; then @@ -11400,7 +12047,7 @@ if test "$wxUSE_MAC" = 1; then # Extract the first word of "Rez", so it can be a program name with args. set dummy Rez; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:11404: checking for $ac_word" >&5 +echo "configure:12051: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RESCOMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11430,7 +12077,7 @@ fi # Extract the first word of "Derez", so it can be a program name with args. set dummy Derez; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:11434: checking for $ac_word" >&5 +echo "configure:12081: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11450,35 +12097,77 @@ else test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/Derez" fi fi -DEREZ="$ac_cv_prog_DEREZ" -if test -n "$DEREZ"; then - echo "$ac_t""$DEREZ" 1>&6 +DEREZ="$ac_cv_prog_DEREZ" +if test -n "$DEREZ"; then + echo "$ac_t""$DEREZ" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r" + LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)" + LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL \${prefix}/lib/${WX_RESOURCES_MACOSX_COMPILED} -o" +fi + + +if test "$wxUSE_MAC" != 1; then + 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:12119: 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:12129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi +done - LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r" - LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)" - LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL \${prefix}/lib/${WX_RESOURCES_MACOSX_COMPILED} -o" fi - -if test "$wxUSE_MAC" != 1; then - for ac_hdr in strings.h +for ac_hdr in stdlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11472: checking for $ac_hdr" >&5 +echo "configure:12161: 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:11482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12171: \"$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* @@ -11504,23 +12193,21 @@ else fi done -fi - -for ac_hdr in stdlib.h +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:11514: checking for $ac_hdr" >&5 +echo "configure:12201: 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:11524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12211: \"$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* @@ -11546,21 +12233,21 @@ else fi done -for ac_hdr in unistd.h +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:11554: checking for $ac_hdr" >&5 +echo "configure:12241: 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:11564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12251: \"$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* @@ -11586,21 +12273,21 @@ else fi done -for ac_hdr in wchar.h +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:11594: checking for $ac_hdr" >&5 +echo "configure:12281: 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:11604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12291: \"$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* @@ -11626,21 +12313,21 @@ else fi done -for ac_hdr in wcstr.h +for ac_hdr in wctype.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11634: checking for $ac_hdr" >&5 +echo "configure:12321: 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:11644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12331: \"$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* @@ -11670,17 +12357,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:11674: checking for $ac_hdr" >&5 +echo "configure:12361: 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:11684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12371: \"$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* @@ -11710,17 +12397,17 @@ for ac_hdr in iconv.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11714: checking for $ac_hdr" >&5 +echo "configure:12401: 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:11724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12411: \"$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* @@ -11750,17 +12437,17 @@ for ac_hdr in langinfo.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11754: checking for $ac_hdr" >&5 +echo "configure:12441: 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:11764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12451: \"$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* @@ -11793,17 +12480,17 @@ if test "$wxUSE_GUI" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11797: checking for $ac_hdr" >&5 +echo "configure:12484: 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:11807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12494: \"$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* @@ -11834,12 +12521,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:11838: checking for ANSI C header files" >&5 +echo "configure:12525: 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 @@ -11847,7 +12534,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12538: \"$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* @@ -11864,7 +12551,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 @@ -11882,7 +12569,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 @@ -11903,7 +12590,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -11914,7 +12601,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:11918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -11938,12 +12625,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:11942: checking for mode_t" >&5 +echo "configure:12629: 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 @@ -11971,12 +12658,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:11975: checking for off_t" >&5 +echo "configure:12662: 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 @@ -12004,12 +12691,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:12008: checking for pid_t" >&5 +echo "configure:12695: 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 @@ -12037,12 +12724,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:12041: checking for size_t" >&5 +echo "configure:12728: 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 @@ -12070,12 +12757,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:12074: checking for uid_t in sys/types.h" >&5 +echo "configure:12761: 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 @@ -12105,15 +12792,25 @@ fi echo $ac_n "checking for wchar_t""... $ac_c" 1>&6 -echo "configure:12109: checking for wchar_t" >&5 +echo "configure:12796: checking for wchar_t" >&5 if eval "test \"`echo '$''{'wx_cv_type_wchar_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < + + #ifdef HAVE_WCHAR_H + # ifdef __CYGWIN__ + # include + # endif + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + int main() { wchar_t wc, *ws; @@ -12122,7 +12819,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_wchar_t=yes else @@ -12154,12 +12851,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6 -echo "configure:12158: checking if size_t is unsigned int" >&5 +echo "configure:12855: checking if size_t is unsigned int" >&5 if eval "test \"`echo '$''{'wx_cv_size_t_is_uint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -12172,7 +12869,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_uint=no else @@ -12195,12 +12892,12 @@ EOF else echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6 -echo "configure:12199: checking if size_t is unsigned long" >&5 +echo "configure:12896: checking if size_t is unsigned long" >&5 if eval "test \"`echo '$''{'wx_cv_size_t_is_ulong'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -12213,7 +12910,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_ulong=no else @@ -12247,13 +12944,13 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6 -echo "configure:12251: checking for pw_gecos in struct passwd" >&5 +echo "configure:12948: 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() { @@ -12264,7 +12961,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_pw_gecos=yes @@ -12294,18 +12991,18 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:12298: checking for working const" >&5 +echo "configure:12995: 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:13049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -12369,21 +13066,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:12373: checking for inline" >&5 +echo "configure:13070: 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:13084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -12410,7 +13107,7 @@ esac echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:12414: checking size of char" >&5 +echo "configure:13111: 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 @@ -12418,7 +13115,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < main() @@ -12429,7 +13126,7 @@ main() exit(0); } EOF -if { (eval echo configure:12433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13130: \"$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 @@ -12449,7 +13146,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:12453: checking size of short" >&5 +echo "configure:13150: 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 @@ -12457,7 +13154,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < main() @@ -12468,7 +13165,7 @@ main() exit(0); } EOF -if { (eval echo configure:12472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13169: \"$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 @@ -12488,7 +13185,7 @@ EOF echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:12492: checking size of int *" >&5 +echo "configure:13189: 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 @@ -12496,7 +13193,7 @@ else ac_cv_sizeof_int_p=4 else cat > conftest.$ac_ext < main() @@ -12507,7 +13204,7 @@ main() exit(0); } EOF -if { (eval echo configure:12511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13208: \"$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 @@ -12527,7 +13224,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:12531: checking size of int" >&5 +echo "configure:13228: 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 @@ -12535,7 +13232,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -12546,7 +13243,7 @@ main() exit(0); } EOF -if { (eval echo configure:12550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13247: \"$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 @@ -12566,7 +13263,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:12570: checking size of long" >&5 +echo "configure:13267: 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 @@ -12574,7 +13271,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -12585,7 +13282,7 @@ main() exit(0); } EOF -if { (eval echo configure:12589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13286: \"$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 @@ -12605,7 +13302,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:12609: checking size of long long" >&5 +echo "configure:13306: 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 @@ -12613,7 +13310,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -12624,7 +13321,7 @@ main() exit(0); } EOF -if { (eval echo configure:12628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13325: \"$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 @@ -12645,7 +13342,7 @@ EOF echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6 -echo "configure:12649: checking size of wchar_t" >&5 +echo "configure:13346: checking size of wchar_t" >&5 if eval "test \"`echo '$''{'wx_cv_sizeof_wchar_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12655,10 +13352,13 @@ else else cat > conftest.$ac_ext < + # endif # include #endif #ifdef HAVE_STDLIB_H @@ -12674,7 +13374,7 @@ else } EOF -if { (eval echo configure:12678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wx_cv_sizeof_wchar_t=`cat conftestval` else @@ -12697,14 +13397,14 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:12701: checking whether byte ordering is bigendian" >&5 +echo "configure:13401: 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 @@ -12715,11 +13415,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:12719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13419: \"$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 @@ -12730,7 +13430,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:12734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -12750,7 +13450,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:13467: \"$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 @@ -12791,7 +13491,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:12795: checking how to run the C++ preprocessor" >&5 +echo "configure:13495: 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 @@ -12804,12 +13504,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:12813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13513: \"$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 : @@ -12853,17 +13553,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:12857: checking for $ac_hdr" >&5 +echo "configure:13557: 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:12867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13567: \"$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* @@ -12911,7 +13611,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:12915: checking if C++ compiler supports bool" >&5 +echo "configure:13615: 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 @@ -12926,7 +13626,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_cpp_bool=yes @@ -12976,7 +13676,7 @@ EOF echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6 -echo "configure:12980: checking for wcslen in -lc" >&5 +echo "configure:13680: 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 @@ -12984,7 +13684,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:13699: \"$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 @@ -13015,785 +13715,499 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then #define HAVE_WCSLEN 1 EOF - WCHAR_LINK="" + WCHAR_LINK= else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:13025: checking for wcslen in -lw" >&5 +echo "configure:13725: 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 else ac_save_LIBS="$LIBS" -LIBS="-lw $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 - - cat >> confdefs.h <<\EOF -#define HAVE_WCSLEN 1 -EOF - - WCHAR_LINK="-lw" - -else - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6 -echo "configure:13070: checking for wcslen in -lmsvcrt" >&5 -ac_lib_var=`echo msvcrt'_'wcslen | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lmsvcrt $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 - - cat >> confdefs.h <<\EOF -#define HAVE_WCSLEN 1 -EOF - - WCHAR_LINK="" - -else - echo "$ac_t""no" 1>&6 -fi - - -fi - - -fi - - -for ac_func in wcsrtombs -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13125: 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:13153: \"$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 - - -echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:13179: 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 < -/* 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 vprintf(); - -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_vprintf) || defined (__stub___vprintf) -choke me -#else -vprintf(); -#endif - -; return 0; } -EOF -if { (eval echo configure:13207: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_vprintf=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_VPRINTF 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi - -if test "$ac_cv_func_vprintf" != yes; then -echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:13231: 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 < -/* 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 _doprnt(); - -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__doprnt) || defined (__stub____doprnt) -choke me -#else -_doprnt(); -#endif +LIBS="-lw $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_func__doprnt=yes" + 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_func__doprnt=no" + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* -fi +LIBS="$ac_save_LIBS" -if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_DOPRNT 1 + + cat >> confdefs.h <<\EOF +#define HAVE_WCSLEN 1 EOF + WCHAR_LINK=" -lw" + else echo "$ac_t""no" 1>&6 -fi - -fi - - - - - -echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:13289: checking for vsnprintf" >&5 -if eval "test \"`echo '$''{'wx_cv_func_vsnprintf'+set}'`\" = set"; then + echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6 +echo "configure:13770: checking for wcslen in -lmsvcrt" >&5 +ac_lib_var=`echo msvcrt'_'wcslen | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - - cat > conftest.$ac_ext < - #include - -int main() { - - int wx_test_vsnprintf(const char *, ...); - - wx_test_vsnprintf("%s"); - return 0; - } - - int wx_test_vsnprintf(const char *fmt, ...) - { - char *s; - - va_list argp; - va_start(argp, fmt); - vsnprintf(s, 42, fmt, argp); - va_end(argp); - -; return 0; } -EOF -if { (eval echo configure:13320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - wx_cv_func_vsnprintf=yes - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - cat > conftest.$ac_ext < conftest.$ac_ext < - #include - int main() { - - int wx_test_vsnprintf(const char *, ...); - - wx_test_vsnprintf("%s"); - return 0; - } - - int wx_test_vsnprintf(const char *fmt, ...) - { - char *s; - - va_list argp; - va_start(argp, fmt); - _vsnprintf(s, 42, fmt, argp); - va_end(argp); - +wcslen() ; return 0; } EOF -if { (eval echo configure:13356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - - wx_cv_func_vsnprintf=yes - + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - - wx_cv_func_vsnprintf=no - -fi -rm -f conftest* - + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* +LIBS="$ac_save_LIBS" fi - -echo "$ac_t""$wx_cv_func_vsnprintf" 1>&6 - -if test "$wx_cv_func_vsnprintf" = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_VSNPRINTF 1 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + cat >> confdefs.h <<\EOF +#define HAVE_WCSLEN 1 EOF + WCHAR_LINK= + else - echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2 + echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 -echo "configure:13388: checking for vsscanf" >&5 -if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then + +fi + + +fi + + +for ac_func in wcsrtombs +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:13825: 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(); - #include - #include - int main() { - int wx_test_vsscanf(const char *, ...); - - wx_test_vsscanf("%d"); - return 0; - } +/* 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 - int wx_test_vsscanf(const char *fmt, ...) - { - va_list argp; - va_start(argp, fmt); - vsscanf("42", fmt, argp); - va_end(argp); - ; return 0; } EOF -if { (eval echo configure:13417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - - wx_cv_func_vsscanf=yes - + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - - wx_cv_func_vsscanf=no - + eval "ac_cv_func_$ac_func=no" fi rm -f conftest* - fi -echo "$ac_t""$wx_cv_func_vsscanf" 1>&6 - -if test "$wx_cv_func_vsscanf" = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_VSSCANF 1 +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 "$TOOLKIT" != "MSW"; then - - - -ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cxx_cross -echo $ac_n "checking if iconv() takes char**""... $ac_c" 1>&6 -echo "configure:13455: checking if iconv() takes char**" >&5 -if eval "test \"`echo '$''{'wx_cv_iconv_takes_char'+set}'`\" = set"; then +echo $ac_n "checking for vprintf""... $ac_c" 1>&6 +echo "configure:13879: 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 < conftest.$ac_ext < +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char vprintf(); below. */ +#include +/* 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 vprintf(); + int main() { - char **inbuf, **outbuf; - iconv_t cd; - size_t insz, outsz; - iconv(cd, inbuf, &insz, outbuf, &outsz); - +/* 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_vprintf) || defined (__stub___vprintf) +choke me +#else +vprintf(); +#endif + ; return 0; } EOF -if { (eval echo configure:13473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - wx_cv_iconv_takes_char=yes + eval "ac_cv_func_vprintf=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - wx_cv_iconv_takes_char=no + eval "ac_cv_func_vprintf=no" fi rm -f conftest* - fi -echo "$ac_t""$wx_cv_iconv_takes_char" 1>&6 -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -if test "$wx_cv_iconv_takes_char" = yes ; then - cat >> confdefs.h <<\EOF -#define WX_ICONV_TAKES_CHAR 1 +if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_VPRINTF 1 EOF +else + echo "$ac_t""no" 1>&6 fi - -if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then - for ac_func in sigaction -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13506: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +if test "$ac_cv_func_vprintf" != yes; then +echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 +echo "configure:13931: 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 < /* 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(); +char _doprnt(); 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) +#if defined (__stub__doprnt) || defined (__stub____doprnt) choke me #else -$ac_func(); +_doprnt(); #endif ; return 0; } EOF -if { (eval echo configure:13534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13959: \"$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" + eval "ac_cv_func__doprnt=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + eval "ac_cv_func__doprnt=no" fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <> confdefs.h <<\EOF +#define HAVE_DOPRNT 1 EOF - + else echo "$ac_t""no" 1>&6 fi -done + +fi - if test "$ac_cv_func_sigaction" = "no"; then - echo "configure: warning: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" 1>&2 - wxUSE_ON_FATAL_EXCEPTION=no - fi - if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then - - ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cxx_cross - echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6 -echo "configure:13575: checking for sa_handler type" >&5 -if eval "test \"`echo '$''{'wx_cv_type_sa_handler'+set}'`\" = set"; then + +echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 +echo "configure:13989: checking for vsnprintf" >&5 +if eval "test \"`echo '$''{'wx_cv_func_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < conftest.$ac_ext < + + #include + #include + int main() { - extern void testSigHandler(int); + int wx_test_vsnprintf(const char *, ...); - struct sigaction sa; - sa.sa_handler = testSigHandler; - + wx_test_vsnprintf("%s"); + return 0; + } + + int wx_test_vsnprintf(const char *fmt, ...) + { + char *s; + + va_list argp; + va_start(argp, fmt); + vsnprintf(s, 42, fmt, argp); + va_end(argp); + ; return 0; } EOF -if { (eval echo configure:13593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - wx_cv_type_sa_handler=int - + wx_cv_func_vsnprintf=yes + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - wx_cv_type_sa_handler=void - -fi -rm -f conftest* - -fi - -echo "$ac_t""$wx_cv_type_sa_handler" 1>&6 - - ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - - - cat >> confdefs.h <&6 -echo "configure:13630: 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 < 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(); + #include + #include + 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 + int wx_test_vsnprintf(const char *, ...); + + wx_test_vsnprintf("%s"); + return 0; + } + + int wx_test_vsnprintf(const char *fmt, ...) + { + char *s; + va_list argp; + va_start(argp, fmt); + _vsnprintf(s, 42, fmt, argp); + va_end(argp); + ; return 0; } EOF -if { (eval echo configure:13658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" + + wx_cv_func_vsnprintf=yes + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + + wx_cv_func_vsnprintf=no + +fi +rm -f conftest* + 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 + +if test "$wx_cv_func_vsnprintf" = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_VSNPRINTF 1 EOF - + else - echo "$ac_t""no" 1>&6 + echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2 fi -done - -echo $ac_n "checking for statfs""... $ac_c" 1>&6 -echo "configure:13684: checking for statfs" >&5 -if eval "test \"`echo '$''{'wx_cv_func_statfs'+set}'`\" = set"; then +echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 +echo "configure:14088: checking for vsscanf" >&5 +if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else + cat > conftest.$ac_ext < - #include - #else - #include - #endif - + #include + #include + int main() { - long l; - struct statfs fs; - statfs("/", &fs); - l = fs.f_bsize; - l += fs.f_blocks; - l += fs.f_bavail; - + int wx_test_vsscanf(const char *, ...); + + wx_test_vsscanf("%d"); + return 0; + } + + int wx_test_vsscanf(const char *fmt, ...) + { + va_list argp; + va_start(argp, fmt); + vsscanf("42", fmt, argp); + va_end(argp); + ; return 0; } EOF -if { (eval echo configure:13710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - wx_cv_func_statfs=yes - + wx_cv_func_vsscanf=yes + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - wx_cv_func_statfs=no - - + wx_cv_func_vsscanf=no + fi rm -f conftest* fi -echo "$ac_t""$wx_cv_func_statfs" 1>&6 +echo "$ac_t""$wx_cv_func_vsscanf" 1>&6 -if test "$wx_cv_func_statfs" = "yes"; then +if test "$wx_cv_func_vsscanf" = yes; then cat >> confdefs.h <<\EOF -#define HAVE_STATFS 1 +#define HAVE_VSSCANF 1 EOF -else - echo $ac_n "checking for statvfs""... $ac_c" 1>&6 -echo "configure:13737: checking for statvfs" >&5 -if eval "test \"`echo '$''{'wx_cv_func_statvfs'+set}'`\" = set"; then +fi + +if test "$TOOLKIT" != "MSW"; then + + + +ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + +echo $ac_n "checking if iconv() takes char**""... $ac_c" 1>&6 +echo "configure:14155: checking if iconv() takes char**" >&5 +if eval "test \"`echo '$''{'wx_cv_iconv_takes_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < conftest.$ac_ext < - -int main() { - - long l; - struct statvfs fs; - statvfs("/", &fs); - l = fs.f_bsize; - l += fs.f_blocks; - l += fs.f_bavail; - +#include +int main() { + + char **inbuf, **outbuf; + iconv_t cd; + size_t insz, outsz; + iconv(cd, inbuf, &insz, outbuf, &outsz); + ; return 0; } EOF -if { (eval echo configure:13758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - - wx_cv_func_statvfs=yes - + wx_cv_iconv_takes_char=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - - wx_cv_func_statvfs=no - - + wx_cv_iconv_takes_char=no fi rm -f conftest* - + fi -echo "$ac_t""$wx_cv_func_statvfs" 1>&6 +echo "$ac_t""$wx_cv_iconv_takes_char" 1>&6 +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross - if test "$wx_cv_func_statvfs" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_STATVFS 1 +if test "$wx_cv_iconv_takes_char" = yes ; then + cat >> confdefs.h <<\EOF +#define WX_ICONV_TAKES_CHAR 1 EOF - else - echo "configure: warning: wxGetDiskSpace() function won't work without statfs()" 1>&2 - fi fi -if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then - for ac_func in fcntl flock + +if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then + for ac_func in sigaction do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13792: checking for $ac_func" >&5 +echo "configure:14206: 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:14234: \"$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 @@ -13834,84 +14248,90 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then cat >> confdefs.h <&6 fi done - if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then - echo "configure: warning: wxSingleInstanceChecker not available" 1>&2 - wxUSE_SNGLINST_CHECKER=no + if test "$ac_cv_func_sigaction" = "no"; then + echo "configure: warning: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" 1>&2 + wxUSE_ON_FATAL_EXCEPTION=no fi -fi -for ac_func in timegm -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13854: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then + + ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + + + echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6 +echo "configure:14275: checking for sa_handler type" >&5 +if eval "test \"`echo '$''{'wx_cv_type_sa_handler'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < 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(); - +#include 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 + extern void testSigHandler(int); + struct sigaction sa; + sa.sa_handler = testSigHandler; + ; return 0; } EOF -if { (eval echo configure:13882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" + + wx_cv_type_sa_handler=int + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + + wx_cv_type_sa_handler=void + 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 + + 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 + + + cat >> confdefs.h <&6 -fi -done + fi +fi -for ac_func in putenv setenv +for ac_func in vfork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13910: checking for $ac_func" >&5 +echo "configure:14330: 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:14358: \"$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 @@ -13952,141 +14372,128 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then cat >> confdefs.h <&6 fi done -HAVE_SOME_SLEEP_FUNC=0 -if test "$USE_BEOS" = 1; then - cat >> confdefs.h <<\EOF -#define HAVE_SLEEP 1 -EOF - - HAVE_SOME_SLEEP_FUNC=1 -fi - -if test "$USE_DARWIN" = 1; then - cat >> confdefs.h <<\EOF -#define HAVE_USLEEP 1 -EOF - - HAVE_SOME_SLEEP_FUNC=1 -fi - -if test "$HAVE_SOME_SLEEP_FUNC" != 1; then - POSIX4_LINK= - for ac_func in nanosleep -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13985: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo $ac_n "checking for statfs""... $ac_c" 1>&6 +echo "configure:14384: checking for statfs" >&5 +if eval "test \"`echo '$''{'wx_cv_func_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -/* 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(); + #if defined(__BSD__) + #include + #include + #else + #include + #endif + 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 - + long l; + struct statfs fs; + statfs("/", &fs); + l = fs.f_bsize; + l += fs.f_blocks; + l += fs.f_bavail; + ; return 0; } EOF -if { (eval echo configure:14013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" + + wx_cv_func_statfs=yes + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + + wx_cv_func_statfs=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 <> confdefs.h <<\EOF -#define HAVE_NANOSLEEP 1 +echo "$ac_t""$wx_cv_func_statfs" 1>&6 + +if test "$wx_cv_func_statfs" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_STATFS 1 EOF else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:14038: 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 "checking for statvfs""... $ac_c" 1>&6 +echo "configure:14437: checking for statvfs" >&5 +if eval "test \"`echo '$''{'wx_cv_func_statvfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-lposix4 $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < + int main() { -nanosleep() + + long l; + struct statvfs fs; + statvfs("/", &fs); + l = fs.f_bsize; + l += fs.f_blocks; + l += fs.f_bavail; + ; return 0; } EOF -if { (eval echo configure:14057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + + wx_cv_func_statvfs=yes + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + + wx_cv_func_statvfs=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 - - cat >> confdefs.h <<\EOF -#define HAVE_NANOSLEEP 1 -EOF - POSIX4_LINK="-lposix4" - -else - echo "$ac_t""no" 1>&6 +echo "$ac_t""$wx_cv_func_statvfs" 1>&6 + + if test "$wx_cv_func_statvfs" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_STATVFS 1 +EOF - for ac_func in usleep + else + echo "configure: warning: wxGetDiskSpace() function won't work without statfs()" 1>&2 + fi +fi + +if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then + for ac_func in fcntl flock do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14085: checking for $ac_func" >&5 +echo "configure:14492: 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:14520: \"$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 @@ -14127,37 +14534,28 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then cat >> confdefs.h <> confdefs.h <<\EOF -#define HAVE_USLEEP 1 -EOF - + break else echo "$ac_t""no" 1>&6 -echo "configure: warning: wxSleep() function will not work" 1>&2 - fi done - - -fi - - - -fi -done + if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then + echo "configure: warning: wxSingleInstanceChecker not available" 1>&2 + wxUSE_SNGLINST_CHECKER=no + fi fi -for ac_func in uname gethostname +for ac_func in timegm do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14156: checking for $ac_func" >&5 +echo "configure:14554: 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:14582: \"$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 @@ -14198,39 +14596,27 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then cat >> confdefs.h <&6 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 +for ac_func in putenv setenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14221: checking for $ac_func" >&5 +echo "configure:14610: 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(); @@ -14248,7 +14634,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:14252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14638: \"$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 @@ -14266,31 +14652,41 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then cat >> confdefs.h <&6 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 +HAVE_SOME_SLEEP_FUNC=0 +if test "$USE_BEOS" = 1; then + cat >> confdefs.h <<\EOF +#define HAVE_SLEEP 1 +EOF + HAVE_SOME_SLEEP_FUNC=1 +fi -INET_LINK= -for ac_func in inet_addr +if test "$USE_DARWIN" = 1; then + cat >> confdefs.h <<\EOF +#define HAVE_USLEEP 1 +EOF + + HAVE_SOME_SLEEP_FUNC=1 +fi + +if test "$HAVE_SOME_SLEEP_FUNC" != 1; then + POSIX4_LINK= + for ac_func in nanosleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14289: checking for $ac_func" >&5 +echo "configure:14685: 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:14713: \"$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 @@ -14332,32 +14728,32 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat >> confdefs.h <<\EOF -#define HAVE_INET_ADDR 1 +#define HAVE_NANOSLEEP 1 EOF else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 -echo "configure:14342: checking for inet_addr in -lnsl" >&5 -ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'` +echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 +echo "configure:14738: 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 else ac_save_LIBS="$LIBS" -LIBS="-lnsl $LIBS" +LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14757: \"$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 @@ -14372,68 +14768,25 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - INET_LINK="nsl" -else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6 -echo "configure:14380: 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 -else - ac_save_LIBS="$LIBS" -LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <> confdefs.h <<\EOF +#define HAVE_NANOSLEEP 1 EOF -if { (eval echo configure:14399: \"$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" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - INET_LINK="resolv" - + POSIX4_LINK=" -lposix4" + else echo "$ac_t""no" 1>&6 -fi - - -fi - - - -fi -done - -for ac_func in inet_aton + for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14432: checking for $ac_func" >&5 +echo "configure:14785: 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:14813: \"$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 @@ -14475,287 +14828,169 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat >> confdefs.h <<\EOF -#define HAVE_INET_ATON 1 +#define HAVE_USLEEP 1 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:14485: 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 -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 - 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" - +echo "configure: warning: wxSleep() function will not work" 1>&2 + fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_INET_ATON 1 -EOF +done -else - echo "$ac_t""no" 1>&6 + + fi + fi done - -if test "x$INET_LINK" != "x"; then - cat >> confdefs.h <<\EOF -#define HAVE_INET_ADDR 1 -EOF - - INET_LINK="-l$INET_LINK" -fi - -fi - - -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - - - -if test "$TOOLKIT" != "MSW"; then - - -THREADS_LINK= -THREADS_OBJ= -CODE_GEN_FLAGS= -CODE_GEN_FLAGS_CXX= - -if test "$wxUSE_THREADS" = "yes" ; then - if test "$wxUSE_WINE" = 1 ; then - echo "configure: warning: Threads are not supported under WINE" 1>&2 - wxUSE_THREADS="no" - elif test "$USE_BEOS" = 1; then - echo "configure: warning: BeOS threads are not yet supported" 1>&2 - wxUSE_THREADS="no" - fi fi -if test "$wxUSE_THREADS" = "yes" ; then - - if test "$USE_AIX" = 1; then - THREADS_LIB=pthreads - else - THREADS_LIB=pthread - fi - - echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6 -echo "configure:14619: checking for pthread_create in -l$THREADS_LIB" >&5 -ac_lib_var=`echo $THREADS_LIB'_'pthread_create | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +for ac_func in uname gethostname +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:14856: 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 - ac_save_LIBS="$LIBS" -LIBS="-l$THREADS_LIB $LIBS" -cat > conftest.$ac_ext < 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 pthread_create(); +char $ac_func(); int main() { -pthread_create() + +/* 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:14638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14884: \"$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" + 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_lib_$ac_lib_var=no" + eval "ac_cv_func_$ac_func=no" fi rm -f conftest* -LIBS="$ac_save_LIBS" - fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - - THREADS_OBJ="threadpsx.lo" - THREADS_LINK=$THREADS_LIB - + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done - echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:14661: 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 + + +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:14921: 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 - ac_save_LIBS="$LIBS" -LIBS="-lc_r $LIBS" -cat > conftest.$ac_ext < 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 pthread_create(); +char $ac_func(); int main() { -pthread_create() -; return 0; } -EOF -if { (eval echo configure:14680: \"$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" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - THREADS_OBJ="threadpsx.lo" - THREADS_LINK="c_r" - -else - echo "$ac_t""no" 1>&6 +/* 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 - ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 -echo "configure:14704: 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 < +; return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14714: \"$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 +if { (eval echo configure:14952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + eval "ac_cv_func_$ac_func=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" + eval "ac_cv_func_$ac_func=no" fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - - THREADS_OBJ="threadsgi.lo" - + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 fi +done - -fi - - -fi +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross - if test -z "$THREADS_OBJ" ; then - wxUSE_THREADS=no - echo "configure: warning: No thread support on this system" 1>&2 - fi -fi -if test "$wxUSE_THREADS" = "yes" ; then - for ac_func in thr_setconcurrency +INET_LINK= +for ac_func in inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14754: checking for $ac_func" >&5 +echo "configure:14989: 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:15017: \"$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 @@ -14796,76 +15031,71 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then cat >> confdefs.h <> confdefs.h <<\EOF +#define HAVE_INET_ADDR 1 +EOF + else echo "$ac_t""no" 1>&6 -fi -done - - - - for ac_hdr in sched.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:14812: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 +echo "configure:15042: 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 else - cat > conftest.$ac_ext < 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 inet_addr(); + +int main() { +inet_addr() +; return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14822: \"$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 +if { (eval echo configure:15061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + eval "ac_cv_lib_$ac_lib_var=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" + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* +LIBS="$ac_save_LIBS" + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -fi -done - - - echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:14850: checking for sched_yield in -l$THREADS_LINK" >&5 -ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'` +echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6 +echo "configure:15080: 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 else ac_save_LIBS="$LIBS" -LIBS="-l$THREADS_LINK $LIBS" +LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15099: \"$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 @@ -14878,35 +15108,99 @@ rm -f conftest* LIBS="$ac_save_LIBS" fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + INET_LINK="resolv" + +else + echo "$ac_t""no" 1>&6 +fi + + +fi + + + +fi +done + + +for ac_func in inet_aton +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:15132: 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:15160: \"$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 - cat >> confdefs.h <<\EOF -#define HAVE_SCHED_YIELD 1 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <> confdefs.h <<\EOF +#define HAVE_INET_ATON 1 EOF else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6 -echo "configure:14891: checking for sched_yield in -lposix4" >&5 -ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'` + echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6 +echo "configure:15185: 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 else ac_save_LIBS="$LIBS" -LIBS="-lposix4 $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:15204: \"$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 @@ -14922,76 +15216,125 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF -#define HAVE_SCHED_YIELD 1 +#define HAVE_INET_ATON 1 EOF - POSIX4_LINK="-lposix4" + else echo "$ac_t""no" 1>&6 -echo "configure: warning: wxThread::Yield will not work properly" 1>&2 - fi - + fi +done - HAVE_PRIOR_FUNCS=0 - echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:14941: 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 -else - ac_save_LIBS="$LIBS" -LIBS="-l$THREADS_LINK $LIBS" -cat > conftest.$ac_ext <> confdefs.h <<\EOF +#define HAVE_INET_ADDR 1 +EOF -int main() { -pthread_attr_getschedpolicy() -; return 0; } + INET_LINK=" -l$INET_LINK" +fi + +fi + + +cat > confcache <<\EOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. +# +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. +# EOF -if { (eval echo configure:14960: \"$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" +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +(set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache +if cmp -s $cache_file confcache; then + : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + if test -w $cache_file; then + echo "updating cache $cache_file" + cat confcache > $cache_file + else + echo "not updating unwritable cache $cache_file" + fi fi -rm -f conftest* -LIBS="$ac_save_LIBS" +rm -f confcache -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for pthread_attr_setschedparam in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:14976: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5 -ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_setschedparam | sed 'y%./+-%__p_%'` + + +if test "$TOOLKIT" != "MSW"; then + + + THREADS_LINK= + THREADS_OBJ= + CODE_GEN_FLAGS= + CODE_GEN_FLAGS_CXX= + + if test "$wxUSE_THREADS" = "yes" ; then + if test "$wxUSE_WINE" = 1 ; then + echo "configure: warning: Threads are not supported under WINE" 1>&2 + wxUSE_THREADS="no" + elif test "$USE_BEOS" = 1; then + echo "configure: warning: BeOS threads are not yet supported" 1>&2 + wxUSE_THREADS="no" + fi + fi + + if test "$wxUSE_THREADS" = "yes" ; then + + if test "$USE_AIX" = 1; then + THREADS_LIB=pthreads + else + THREADS_LIB=pthread + fi + + echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6 +echo "configure:15319: checking for pthread_create in -l$THREADS_LIB" >&5 +ac_lib_var=`echo $THREADS_LIB'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-l$THREADS_LINK $LIBS" +LIBS="-l$THREADS_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15338: \"$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 @@ -15006,27 +15349,34 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for sched_get_priority_max in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:15011: checking for sched_get_priority_max in -l$THREADS_LINK" >&5 -ac_lib_var=`echo $THREADS_LINK'_'sched_get_priority_max | sed 'y%./+-%__p_%'` + + THREADS_OBJ="threadpsx.lo" + THREADS_LINK=$THREADS_LIB + +else + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +echo "configure:15361: 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 else ac_save_LIBS="$LIBS" -LIBS="-l$THREADS_LINK $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:15380: \"$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 @@ -15041,478 +15391,307 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - HAVE_PRIOR_FUNCS=1 + + THREADS_OBJ="threadpsx.lo" + THREADS_LINK="c_r" + else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6 -echo "configure:15049: checking for sched_get_priority_max in -lposix4" >&5 -ac_lib_var=`echo posix4'_'sched_get_priority_max | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + + ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 +echo "configure:15404: 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 - ac_save_LIBS="$LIBS" -LIBS="-lposix4 $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < EOF -if { (eval echo configure:15068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:15414: \"$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_lib_$ac_lib_var=yes" + 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_lib_$ac_lib_var=no" + eval "ac_cv_header_$ac_safe=no" fi rm -f conftest* -LIBS="$ac_save_LIBS" - fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - HAVE_PRIOR_FUNCS=1 - POSIX4_LINK="-lposix4" - + THREADS_OBJ="threadsgi.lo" + else echo "$ac_t""no" 1>&6 fi - -fi - - -else - echo "$ac_t""no" 1>&6 + fi - -else - echo "$ac_t""no" 1>&6 + fi - if test "$HAVE_PRIOR_FUNCS" = 1; then - cat >> confdefs.h <<\EOF -#define HAVE_THREAD_PRIORITY_FUNCTIONS 1 -EOF - - else - echo "configure: warning: Setting thread priority will not work" 1>&2 - fi + if test -z "$THREADS_OBJ" ; then + wxUSE_THREADS=no + echo "configure: warning: No thread support on this system" 1>&2 + fi + fi - echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:15115: 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 + 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:15454: 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 - ac_save_LIBS="$LIBS" -LIBS="-l$THREADS_LINK $LIBS" -cat > conftest.$ac_ext < 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 pthread_cancel(); +char $ac_func(); int main() { -pthread_cancel() -; return 0; } -EOF -if { (eval echo configure:15134: \"$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" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PTHREAD_CANCEL 1 -EOF - -else - echo "$ac_t""no" 1>&6 -echo "configure: warning: wxThread::Kill() will not work properly" 1>&2 -fi - - echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 -echo "configure:15160: 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() { +/* 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 - pthread_cleanup_push(NULL, NULL); - pthread_cleanup_pop(0); - ; return 0; } EOF -if { (eval echo configure:15176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - - wx_cv_func_pthread_cleanup_push=yes - + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - - wx_cv_func_pthread_cleanup_push=no - + eval "ac_cv_func_$ac_func=no" fi rm -f conftest* - fi -echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6 - - if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_THREAD_CLEANUP_FUNCTIONS 1 +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 - fi - - - if test "x$wx_lib_glibc21" = "xyes"; then - CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - fi - echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6 -echo "configure:15208: checking for pthread_mutexattr_t" >&5 -if eval "test \"`echo '$''{'wx_cv_type_pthread_mutexattr_t'+set}'`\" = set"; then + + for ac_hdr in sched.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:15512: 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 < conftest.$ac_ext < -int main() { - - pthread_mutexattr_t attr; - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); - -; return 0; } +#include <$ac_hdr> EOF -if { (eval echo configure:15224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:15522: \"$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* - - wx_cv_type_pthread_mutexattr_t=yes - + 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* - - wx_cv_type_pthread_mutexattr_t=no - - + eval "ac_cv_header_$ac_safe=no" fi rm -f conftest* - fi - -echo "$ac_t""$wx_cv_type_pthread_mutexattr_t" 1>&6 - - if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_PTHREAD_MUTEXATTR_T 1 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done - else - echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6 -echo "configure:15251: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 -if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then + + echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:15550: 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 else - - cat > conftest.$ac_ext < conftest.$ac_ext < -int main() { +/* 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 sched_yield(); - pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; - +int main() { +sched_yield() ; return 0; } EOF -if { (eval echo configure:15266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - - wx_cv_type_pthread_rec_mutex_init=yes - + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - - wx_cv_type_pthread_rec_mutex_init=no - - + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* - -fi - -echo "$ac_t""$wx_cv_type_pthread_rec_mutex_init" 1>&6 - if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1 -EOF - - else - echo "configure: warning: wxMutex won't be recursive on this platform" 1>&2 - fi - fi - - THREADS_LINK="-l$THREADS_LINK" - - if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then - CPPFLAGS="${CFLAGS} -mt" - CXXFLAGS="${CXXFLAGS} -mt" - LDFLAGS="${LDFLAGS} -mt" - fi -fi +LIBS="$ac_save_LIBS" fi - -if test "$wxUSE_THREADS" = "yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF -#define wxUSE_THREADS 1 +#define HAVE_SCHED_YIELD 1 EOF - - if test "$USE_DARWIN" != 1; then - TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT" - fi - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread" 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:15320: checking if -D_REENTRANT is needed" >&5 - if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then - TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT" - echo "$ac_t""yes" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - fi -fi - -if test "$WXGTK20" = 1 ; then - cat >> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <<\EOF -#define WXDEBUG 1 -EOF - - WXDEBUG_DEFINE="-D__WXDEBUG__" + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6 +echo "configure:15591: checking for sched_yield in -lposix4" >&5 +ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$wxUSE_GTK" = 1 ; then - WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS" - fi -fi - -if test "$wxUSE_MEM_TRACING" = "yes" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_MEMORY_TRACING 1 -EOF - - cat >> confdefs.h <<\EOF -#define wxUSE_GLOBAL_MEMORY_OPERATORS 1 -EOF + ac_save_LIBS="$LIBS" +LIBS="-lposix4 $LIBS" +cat > conftest.$ac_ext <> confdefs.h <<\EOF -#define wxUSE_DEBUG_NEW_ALWAYS 1 +int main() { +sched_yield() +; return 0; } EOF - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck" -fi - -if test "$wxUSE_DMALLOC" = "yes" ; then - DMALLOC_LINK="-ldmalloc" -fi - -PROFILE= -if test "$wxUSE_PROFILE" = "yes" ; then - PROFILE="-pg" -fi - -if test "$GCC" = yes ; then - if test "$wxUSE_NO_RTTI" = "yes" ; then - CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-rtti" - fi - if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then - CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-exceptions" - fi - if test "$wxUSE_PERMISSIVE" = "yes" ; then - CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive" - fi - if test "$wxUSE_NO_DEPS" = "no" ; then - CFLAGS="-MMD ${CFLAGS}" - CXXFLAGS="-MMD ${CXXFLAGS}" - fi - if test "$USE_WIN32" = 1 ; then - # I'm not even really sure what this was ever added to solve, - # but someone added it for mingw native builds, so I guess - # they had a reason, right?? - CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return" - fi -fi - - -CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" ` -CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" ` -if test "$wxUSE_OPTIMISE" = "no" ; then - OPTIMISE= +if { (eval echo configure:15610: \"$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 - if test "$GCC" = yes ; then - OPTIMISE="-O2" - case "${host}" in - i586-*-*|i686-*-* ) - OPTIMISE="${OPTIMISE} " - ;; - esac - else - OPTIMISE="-O" - fi -fi - -if test "$WXWIN_COMPATIBILITY_2" = "yes"; then - cat >> confdefs.h <<\EOF -#define WXWIN_COMPATIBILITY_2 1 -EOF - - - WXWIN_COMPATIBILITY_2_2="yes" + 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 "$WXWIN_COMPATIBILITY_2_2" = "yes"; then - cat >> confdefs.h <<\EOF -#define WXWIN_COMPATIBILITY_2_2 1 +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_SCHED_YIELD 1 EOF - + POSIX4_LINK=" -lposix4" +else + echo "$ac_t""no" 1>&6 +echo "configure: warning: wxThread::Yield will not work properly" 1>&2 + fi + +fi -ZLIB_INCLUDE= -if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_ZLIB 1 -EOF - 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:15470: checking for zlib.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + HAVE_PRIOR_FUNCS=0 + echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:15641: 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 else - cat > conftest.$ac_ext < 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 pthread_attr_getschedpolicy(); + +int main() { +pthread_attr_getschedpolicy() +; return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15480: \"$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 +if { (eval echo configure:15660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + eval "ac_cv_lib_$ac_lib_var=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" + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* +LIBS="$ac_save_LIBS" + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:15497: checking for deflate in -lz" >&5 -ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` + echo $ac_n "checking for pthread_attr_setschedparam in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:15676: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5 +ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_setschedparam | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lz $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:15695: \"$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 @@ -15527,85 +15706,65 @@ LIBS="$ac_save_LIBS" 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 - -else - echo "$ac_t""no" 1>&6 -fi - - 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 - -PNG_INCLUDE= -if test "$wxUSE_LIBPNG" = "yes" -o "$wxUSE_LIBPNG" = "sys" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_LIBPNG 1 -EOF - - 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_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:15563: checking for png.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "checking for sched_get_priority_max in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:15711: checking for sched_get_priority_max in -l$THREADS_LINK" >&5 +ac_lib_var=`echo $THREADS_LINK'_'sched_get_priority_max | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < 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 sched_get_priority_max(); + +int main() { +sched_get_priority_max() +; return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15573: \"$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 +if { (eval echo configure:15730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + eval "ac_cv_lib_$ac_lib_var=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" + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* +LIBS="$ac_save_LIBS" + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6 -echo "configure:15590: checking for png_check_sig in -lpng" >&5 -ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'` + HAVE_PRIOR_FUNCS=1 +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6 +echo "configure:15749: checking for sched_get_priority_max in -lposix4" >&5 +ac_lib_var=`echo posix4'_'sched_get_priority_max | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lpng -lz -lm $LIBS" +LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15768: \"$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 @@ -15620,90 +15779,58 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - PNG_LINK="-lpng" + + HAVE_PRIOR_FUNCS=1 + POSIX4_LINK=" -lposix4" + else echo "$ac_t""no" 1>&6 fi - -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" + +else + echo "$ac_t""no" 1>&6 fi -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= - echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:15653: checking for jpeglib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_jpeglib_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + else - cat > conftest.$ac_ext <&6 +fi - #undef HAVE_STDLIB_H - #include - #include - -int main() { - -; return 0; } + if test "$HAVE_PRIOR_FUNCS" = 1; then + cat >> confdefs.h <<\EOF +#define HAVE_THREAD_PRIORITY_FUNCTIONS 1 EOF -if { (eval echo configure:15670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_jpeglib_h=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_jpeglib_h=no - -fi -rm -f conftest* - -fi - echo "$ac_t""$ac_cv_header_jpeglib_h" 1>&6 + else + echo "configure: warning: Setting thread priority will not work" 1>&2 + fi - if test "$ac_cv_header_jpeglib_h" = "yes"; then - echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:15688: checking for jpeg_read_header in -ljpeg" >&5 -ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` + echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:15815: 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 else ac_save_LIBS="$LIBS" -LIBS="-ljpeg $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:15834: \"$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 @@ -15718,194 +15845,308 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - JPEG_LINK="-ljpeg" + cat >> confdefs.h <<\EOF +#define HAVE_PTHREAD_CANCEL 1 +EOF + else echo "$ac_t""no" 1>&6 +echo "configure: warning: wxThread::Kill() will not work properly" 1>&2 fi - 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 + echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 +echo "configure:15860: 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() { + + pthread_cleanup_push(NULL, NULL); + pthread_cleanup_pop(0); + +; return 0; } +EOF +if { (eval echo configure:15876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_func_pthread_cleanup_push=yes + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + wx_cv_func_pthread_cleanup_push=no + +fi +rm -f conftest* + fi -TIFF_INCLUDE= -if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_LIBTIFF 1 +echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6 + + if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_THREAD_CLEANUP_FUNCTIONS 1 EOF - 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:15747: checking for tiffio.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + fi + + + if test "x$wx_lib_glibc21" = "xyes"; then + CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + fi + + echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6 +echo "configure:15908: checking for pthread_mutexattr_t" >&5 +if eval "test \"`echo '$''{'wx_cv_type_pthread_mutexattr_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < conftest.$ac_ext < +#include +int main() { + + pthread_mutexattr_t attr; + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); + +; return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15757: \"$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 +if { (eval echo configure:15924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + + wx_cv_type_pthread_mutexattr_t=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" + + wx_cv_type_pthread_mutexattr_t=no + + fi rm -f conftest* + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6 -echo "configure:15774: 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_t""$wx_cv_type_pthread_mutexattr_t" 1>&6 + + if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_PTHREAD_MUTEXATTR_T 1 +EOF + + else + echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6 +echo "configure:15951: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 +if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-ltiff -lm $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < int main() { -TIFFError() + + pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; + ; return 0; } EOF -if { (eval echo configure:15793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + + wx_cv_type_pthread_rec_mutex_init=yes + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + + wx_cv_type_pthread_rec_mutex_init=no + + fi rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - TIFF_LINK="-ltiff" -else - echo "$ac_t""no" 1>&6 + fi -else - echo "$ac_t""no" 1>&6 -fi +echo "$ac_t""$wx_cv_type_pthread_rec_mutex_init" 1>&6 + if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1 +EOF + + else + echo "configure: warning: wxMutex won't be recursive on this platform" 1>&2 + fi + fi + + THREADS_LINK=" -l$THREADS_LINK" - 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; } + if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then + CPPFLAGS="$CFLAGS -mt" + CXXFLAGS="$CXXFLAGS -mt" + LDFLAGS="$LDFLAGS -mt" + fi fi - fi + fi -FREETYPE_INCLUDE= -if test "$wxUSE_FREETYPE" = "yes" -o "$wxUSE_FREETYPE" = "sys" ; then +if test "$wxUSE_THREADS" = "yes"; then cat >> confdefs.h <<\EOF -#define wxUSE_FREETYPE 1 +#define wxUSE_THREADS 1 EOF - if test "$wxUSE_FREETYPE" = "yes" ; then - FREETYPE_INCLUDE="-I\${top_srcdir}/src/freetype" - else - FREETYPE_LINK= - ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for freetype.h""... $ac_c" 1>&6 -echo "configure:15835: checking for freetype.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + + if test "$USE_DARWIN" != 1; then + TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -D_REENTRANT" + fi + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread" else - cat > conftest.$ac_ext < + if test "$ac_cv_func_strtok_r" = "yes"; then + echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6 +echo "configure:16020: checking if -D_REENTRANT is needed" >&5 + if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT" + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + fi +fi + +if test "$WXGTK20" = 1 ; then + cat >> confdefs.h <&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" + + WXGTK12=1 fi -rm -f conftest* + +if test "$WXGTK12" = 1 ; then + cat >> confdefs.h <&6 - echo $ac_n "checking for FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6 -echo "configure:15862: checking for FT_Render_Glyph in -lfreetype" >&5 -ac_lib_var=`echo freetype'_'FT_Render_Glyph | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lfreetype -lm $LIBS" -cat > conftest.$ac_ext <> confdefs.h <&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 + +WXDEBUG= + +if test "$wxUSE_DEBUG_INFO" = "yes" ; then + WXDEBUG="-g" + wxUSE_OPTIMISE=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" +if test "$wxUSE_DEBUG_GDB" = "yes" ; then + wxUSE_DEBUG_INFO=yes + WXDEBUG="-ggdb" fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - FREETYPE_LINK="-lfreetype" + +if test "$wxUSE_DEBUG_FLAG" = "yes" ; then + cat >> confdefs.h <<\EOF +#define WXDEBUG 1 +EOF + + WXDEBUG_DEFINE="-D__WXDEBUG__" else - echo "$ac_t""no" 1>&6 + if test "$wxUSE_GTK" = 1 ; then + WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS" + fi fi - -else - echo "$ac_t""no" 1>&6 +if test "$wxUSE_MEM_TRACING" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_MEMORY_TRACING 1 +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" +fi + +if test "$wxUSE_DMALLOC" = "yes" ; then + DMALLOC_LIBS="-ldmalloc" +fi + +PROFILE= +if test "$wxUSE_PROFILE" = "yes" ; then + PROFILE=" -pg" fi - if test "x$FREETYPE_LINK" = "x" ; then - { echo "configure: error: system freetype library not found! Use --with-freetype=yes to use the built-in freetype" 1>&2; exit 1; } +if test "$GCC" = "yes" ; then + if test "$wxUSE_NO_RTTI" = "yes" ; then + CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-rtti" fi - fi + if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then + CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-exceptions" + fi + if test "$wxUSE_PERMISSIVE" = "yes" ; then + CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive" + fi + if test "$USE_WIN32" = 1 ; then + # I'm not even really sure what this was ever added to solve, + # but someone added it for mingw native builds, so I guess + # they had a reason, right?? + CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return" + fi +fi + + +CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" ` +CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" ` +if test "$wxUSE_OPTIMISE" = "no" ; then + OPTIMISE= +else + if test "$GCC" = yes ; then + OPTIMISE="-O2" + case "${host}" in + i586-*-*|i686-*-* ) + OPTIMISE="${OPTIMISE} " + ;; + esac + else + OPTIMISE="-O" + fi +fi + +if test "$WXWIN_COMPATIBILITY_2" = "yes"; then + cat >> confdefs.h <<\EOF +#define WXWIN_COMPATIBILITY_2 1 +EOF + + + WXWIN_COMPATIBILITY_2_2="yes" +fi + +if test "$WXWIN_COMPATIBILITY_2_2" = "yes"; then + cat >> confdefs.h <<\EOF +#define WXWIN_COMPATIBILITY_2_2 1 +EOF + fi @@ -16050,9 +16291,16 @@ EOF fi +if test "$wxUSE_TEXTBUFFER" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_TEXTBUFFER 1 +EOF + +fi + if test "$wxUSE_TEXTFILE" = "yes"; then - if test "$wxUSE_FILE" != "yes"; then - echo "configure: warning: wxTextFile requires wxFile and it won't be compiled without it" 1>&2 + if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then + echo "configure: warning: wxTextFile requires wxFile and wxTextBuffer and won't be compiled without them" 1>&2 else cat >> confdefs.h <<\EOF #define wxUSE_TEXTFILE 1 @@ -16102,6 +16350,13 @@ EOF if test "$wxUSE_LOGWINDOW" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_LOGWINDOW 1 +EOF + + fi + + if test "$wxUSE_LOGDIALOG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_LOG_DIALOG 1 EOF fi @@ -16141,12 +16396,12 @@ if test "$wxUSE_DATETIME" = "yes"; then for ac_func in strptime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16145: checking for $ac_func" >&5 +echo "configure:16400: 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:16428: \"$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 @@ -16195,13 +16450,13 @@ done echo $ac_n "checking for timezone variable in ""... $ac_c" 1>&6 -echo "configure:16199: checking for timezone variable in " >&5 +echo "configure:16454: 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 < @@ -16213,7 +16468,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=timezone @@ -16224,7 +16479,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -16236,7 +16491,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=_timezone @@ -16247,7 +16502,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -16259,7 +16514,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=__timezone @@ -16294,12 +16549,12 @@ EOF for ac_func in localtime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16298: checking for $ac_func" >&5 +echo "configure:16553: 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:16581: \"$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 @@ -16349,13 +16604,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:16353: checking for tm_gmtoff in struct tm" >&5 +echo "configure:16608: 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 < @@ -16367,7 +16622,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_tm_has_gmtoff=yes @@ -16396,12 +16651,12 @@ EOF for ac_func in gettimeofday ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16400: checking for $ac_func" >&5 +echo "configure:16655: 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:16683: \"$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 @@ -16451,7 +16706,7 @@ done if test "$ac_cv_func_gettimeofday" = "yes"; then echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6 -echo "configure:16455: checking whether gettimeofday takes two arguments" >&5 +echo "configure:16710: 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 @@ -16466,7 +16721,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -16479,7 +16734,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=yes else @@ -16487,7 +16742,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -16500,7 +16755,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=no else @@ -16549,12 +16804,12 @@ if test "$TOOLKIT" != "MSW"; then if test "$wxUSE_SOCKETS" = "yes"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:16553: checking for socket" >&5 +echo "configure:16808: 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:16836: \"$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 @@ -16595,7 +16850,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:16599: checking for socket in -lsocket" >&5 +echo "configure:16854: 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 @@ -16603,7 +16858,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:16873: \"$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 @@ -16647,7 +16902,7 @@ fi if test "$wxUSE_SOCKETS" = "yes" ; then echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6 -echo "configure:16651: checking what is the type of the third argument of getsockname" >&5 +echo "configure:16906: 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 @@ -16662,7 +16917,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -16675,7 +16930,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=socklen_t else @@ -16683,7 +16938,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -16696,7 +16951,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=size_t else @@ -16704,7 +16959,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -16717,7 +16972,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=int else @@ -16776,17 +17031,17 @@ if test "$wxUSE_GUI" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:16780: checking for $ac_hdr" >&5 +echo "configure:17035: 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:16790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:17045: \"$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* @@ -16840,12 +17095,12 @@ if test "$TOOLKIT" != "MSW"; then for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16844: checking for $ac_func" >&5 +echo "configure:17099: 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:17127: \"$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 @@ -16896,7 +17151,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:16900: checking for dlopen in -ldl" >&5 +echo "configure:17155: 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 @@ -16904,7 +17159,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:17174: \"$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 @@ -16936,7 +17191,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then EOF HAVE_DL_FUNCS=1 - LIBS="$LIBS -ldl" + DL_LINK=" -ldl$DL_LINK" else echo "$ac_t""no" 1>&6 @@ -16944,12 +17199,12 @@ else for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16948: checking for $ac_func" >&5 +echo "configure:17203: 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:17231: \"$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 @@ -17000,7 +17255,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6 -echo "configure:17004: checking for dld in -lshl_load" >&5 +echo "configure:17259: checking for dld in -lshl_load" >&5 ac_lib_var=`echo shl_load'_'dld | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17008,7 +17263,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lshl_load $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17278: \"$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 @@ -17036,7 +17291,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 HAVE_SHL_FUNCS=1 - LIBS="$LIBS -ldld" + DL_LINK=" -ldld$DL_LINK" else echo "$ac_t""no" 1>&6 @@ -17058,12 +17313,12 @@ done for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17062: checking for $ac_func" >&5 +echo "configure:17317: 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:17345: \"$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 @@ -17111,7 +17366,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6 -echo "configure:17115: checking for dlerror in -ldl" >&5 +echo "configure:17370: checking for dlerror in -ldl" >&5 ac_lib_var=`echo dl'_'dlerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17119,7 +17374,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:17389: \"$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 @@ -17283,21 +17538,21 @@ EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help" - if test "$USE_WIN32" = 1; then + if test "$wxUSE_MSW" = 1; then if test "$wxUSE_MS_HTML_HELP" = "yes"; then ac_safe=`echo "htmlhelp.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for htmlhelp.h""... $ac_c" 1>&6 -echo "configure:17291: checking for htmlhelp.h" >&5 +echo "configure:17546: checking for htmlhelp.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:17301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:17556: \"$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* @@ -17378,24 +17633,24 @@ EOF fi -if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ - -o "$wxUSE_CLIPBOARD" = "yes" \ - -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then +if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ + -o "$wxUSE_CLIPBOARD" = "yes" \ + -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then for ac_hdr in ole2.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:17389: checking for $ac_hdr" >&5 +echo "configure:17644: 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:17399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:17654: \"$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* @@ -17426,7 +17681,7 @@ done if test "$GCC" = yes ; then ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)" CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks" - LIBS="$LIBS -lrpcrt4 -loleaut32 -lole32 -luuid" + LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS" cat >> confdefs.h <<\EOF #define wxUSE_OLE 1 EOF @@ -17446,7 +17701,7 @@ EOF wxUSE_DATAOBJ=no fi - if test "$wxUSE_METAFILE" = "yes"; then + if test "$wxUSE_METAFILE" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_METAFILE 1 EOF @@ -17847,15 +18102,19 @@ fi if test "$wxUSE_TOOLTIPS" = "yes"; then if test "$wxUSE_MOTIF" = 1; then - echo "configure: warning: wxTooltip not supported yet under Motif" 1>&2 + echo "configure: warning: wxTooltip not supported yet under Motif ... disabled" 1>&2 else if test "$wxUSE_WINE" = 1; then - echo "configure: warning: wxTooltip not supported under WINE" 1>&2 + echo "configure: warning: wxTooltip not supported under WINE ... disabled" 1>&2 else - cat >> confdefs.h <<\EOF + if test "$wxUSE_UNIVERSAL" = "yes"; then + echo "configure: warning: wxTooltip not supported yet in wxUNIVERSAL ... disabled" 1>&2 + else + cat >> confdefs.h <<\EOF #define wxUSE_TOOLTIPS 1 EOF + fi fi fi fi @@ -18139,16 +18398,18 @@ EOF -GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK" -EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm" if test "$wxUSE_MAC" = 1 ; then - EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System" + LDFLAGS="$LDFLAGS -framework Carbon -framework System" fi + +LIBS="$ZLIB_LINK$POSIX4_LINK$INET_LINK$WCHAR_LINK$THREADS_LINK$DL_LINK -lm$LIBS" + if test "$wxUSE_GUI" = "yes"; then - EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS" + + LIBS=" $GUI_TK_LIBRARY$PNG_LINK$JPEG_LINK$TIFF_LINK$FREETYPE_LINK$LIBS" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \ @@ -18160,27 +18421,32 @@ else SAMPLES_SUBDIRS="console" fi -LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS" INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \ $REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \ $FREETYPE_INCLUDE $TOOLKIT_INCLUDE" if test "$wxUSE_GTK" = 1; then - WXCONFIG_INCLUDE="" + WXCONFIG_INCLUDE= else WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE" fi if test "$GXX" = yes ; then CXXWARNINGS="-Wall" - fi -EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES" + + if test "$wxUSE_NO_DEPS" = "no" ; then + CFLAGS="-MMD $CFLAGS" + CXXFLAGS="-MMD $CXXFLAGS" + fi +fi + +EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG$PROFILE $OPTIMISE $INCLUDES" CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'` CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'` -LDFLAGS="$LDFLAGS $PROFILE" +LDFLAGS="$LDFLAGS$PROFILE" SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`" @@ -18263,12 +18529,15 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq + + + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:18272: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:18541: 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 @@ -18499,6 +18768,7 @@ s%@WX_MINOR_VERSION_NUMBER@%$WX_MINOR_VERSION_NUMBER%g s%@WX_RELEASE_NUMBER@%$WX_RELEASE_NUMBER%g s%@WX_LIBRARY_NAME_STATIC@%$WX_LIBRARY_NAME_STATIC%g s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%g +s%@WX_LIBRARY_IMPORTLIB@%$WX_LIBRARY_IMPORTLIB%g s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g s%@WX_LIBRARY_LINK2@%$WX_LIBRARY_LINK2%g @@ -18526,22 +18796,22 @@ s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g s%@TOOLKIT_VPATH@%$TOOLKIT_VPATH%g s%@TOOLCHAIN_NAME@%$TOOLCHAIN_NAME%g s%@TOOLCHAIN_DEFS@%$TOOLCHAIN_DEFS%g +s%@TOOLCHAIN_DLL_DEFS@%$TOOLCHAIN_DLL_DEFS%g s%@cross_compiling@%$cross_compiling%g s%@WXCONFIG_LIBS@%$WXCONFIG_LIBS%g s%@WXCONFIG_LIBS_GL@%$WXCONFIG_LIBS_GL%g +s%@WXCONFIG_LIBS_STATIC@%$WXCONFIG_LIBS_STATIC%g +s%@WXCONFIG_LIBS_STATIC_GL@%$WXCONFIG_LIBS_STATIC_GL%g s%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g s%@ALL_OBJECTS@%$ALL_OBJECTS%g s%@GUIDIST@%$GUIDIST%g s%@PORT_FILES@%$PORT_FILES%g s%@DISTDIR@%$DISTDIR%g -s%@RPM_SPEC@%$RPM_SPEC%g -s%@RPM_FILES@%$RPM_FILES%g s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g -s%@EXTRA_LIBS@%$EXTRA_LIBS%g +s%@LDFLAGS_GL@%$LDFLAGS_GL%g s%@OPENGL_LIBS@%$OPENGL_LIBS%g +s%@DMALLOC_LIBS@%$DMALLOC_LIBS%g s%@EXTRADEFS@%$EXTRADEFS%g -s%@LD_LIBS@%$LD_LIBS%g -s%@WXMSW_DLL_DEFINES@%$WXMSW_DLL_DEFINES%g s%@RESFLAGS@%$RESFLAGS%g s%@RESPROGRAMOBJ@%$RESPROGRAMOBJ%g s%@WX_RESOURCES_MACOSX@%$WX_RESOURCES_MACOSX%g @@ -18554,6 +18824,7 @@ s%@AS@%$AS%g s%@NM@%$NM%g s%@LD@%$LD%g s%@MAKEINFO@%$MAKEINFO%g +s%@INSTALL_LIBRARY@%$INSTALL_LIBRARY%g s%@SET_MAKE@%$SET_MAKE%g s%@subdirs@%$subdirs%g