ac_help="$ac_help
--enable-metafile use win32 metafiles"
ac_help="$ac_help
- --enable-wxtree make wxTree library"
+ --enable-treelayout use wxTreeLayout classes"
ac_help="$ac_help
--enable-controls use all usual controls"
ac_help="$ac_help
--enable-listctrl use wxListCtrl class"
ac_help="$ac_help
--enable-notebook use wxNotebook class"
+ac_help="$ac_help
+ --enable-propsheet use wxPropertySheet class"
ac_help="$ac_help
--enable-radiobox use wxRadioBox class"
ac_help="$ac_help
--enable-coldlg use wxColourDialog"
ac_help="$ac_help
--enable-filedlg use wxFileDialog"
+ac_help="$ac_help
+ --enable-finddlg use wxFindReplaceDialog"
ac_help="$ac_help
--enable-fontdlg use wxFontDialog"
ac_help="$ac_help
--enable-msgdlg use wxMessageDialog"
ac_help="$ac_help
--enable-numberdlg use wxNumberEntryDialog"
+ac_help="$ac_help
+ --enable-splash use wxSplashScreen"
ac_help="$ac_help
--enable-textdlg use wxTextDialog"
ac_help="$ac_help
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:933: checking host system type" >&5
+echo "configure:939: checking host system type" >&5
host_alias=$host
case "$host_alias" in
echo "$ac_t""$host" 1>&6
echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:954: checking target system type" >&5
+echo "configure:960: checking target system type" >&5
target_alias=$target
case "$target_alias" in
echo "$ac_t""$target" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:972: checking build system type" >&5
+echo "configure:978: checking build system type" >&5
build_alias=$build
case "$build_alias" in
fi
if test "$USE_LINUX" = 1; then
- echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6
-echo "configure:1320: checking for gettext in -lc" >&5
-ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "checking for glibc 2.1 or later""... $ac_c" 1>&6
+echo "configure:1326: 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
- ac_save_LIBS="$LIBS"
-LIBS="-lc $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1328 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 1331 "configure"
#include "confdefs.h"
-/* 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 gettext();
-
+#include <features.h>
int main() {
-gettext()
+
+ #if !__GLIBC_PREREQ(2, 1)
+ #error not glibc2.1
+ #endif
+
; return 0; }
EOF
-if { (eval echo configure:1339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
+
+ wx_lib_glibc21=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_lib_glibc21=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
+
+echo "$ac_t""$wx_lib_glibc21" 1>&6
+
+ if test "$wx_lib_glibc21" = "yes"; then
+ cat >> confdefs.h <<\EOF
#define wxHAVE_GLIBC2 1
EOF
-else
- echo "$ac_t""no" 1>&6
-fi
-
+ fi
fi
DEFAULT_wxUSE_HELP=no
DEFAULT_wxUSE_MS_HTML_HELP=no
DEFAULT_wxUSE_WXHTML_HELP=no
- DEFAULT_wxUSE_WXTREE=no
+ DEFAULT_wxUSE_TREELAYOUT=no
DEFAULT_wxUSE_METAFILE=no
DEFAULT_wxUSE_MIMETYPE=no
DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
DEFAULT_wxUSE_COLOURDLG=no
DEFAULT_wxUSE_DIRDLG=no
DEFAULT_wxUSE_FILEDLG=no
+ DEFAULT_wxUSE_FINDREPLDLG=no
DEFAULT_wxUSE_FONTDLG=no
DEFAULT_wxUSE_MSGDLG=no
DEFAULT_wxUSE_NUMBERDLG=no
DEFAULT_wxUSE_TEXTDLG=no
+ DEFAULT_wxUSE_SPLASH=no
DEFAULT_wxUSE_STARTUP_TIPS=no
DEFAULT_wxUSE_PROGRESSDLG=no
DEFAULT_wxUSE_WIZARDDLG=no
DEFAULT_wxUSE_LISTBOX=no
DEFAULT_wxUSE_LISTCTRL=no
DEFAULT_wxUSE_NOTEBOOK=no
+ DEFAULT_wxUSE_PROPSHEET=no
DEFAULT_wxUSE_RADIOBOX=no
DEFAULT_wxUSE_RADIOBTN=no
DEFAULT_wxUSE_SASH=no
DEFAULT_wxUSE_HELP=yes
DEFAULT_wxUSE_MS_HTML_HELP=yes
DEFAULT_wxUSE_WXHTML_HELP=yes
- DEFAULT_wxUSE_WXTREE=yes
+ DEFAULT_wxUSE_TREELAYOUT=yes
DEFAULT_wxUSE_METAFILE=yes
DEFAULT_wxUSE_MIMETYPE=yes
DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
DEFAULT_wxUSE_COLOURDLG=yes
DEFAULT_wxUSE_DIRDLG=yes
DEFAULT_wxUSE_FILEDLG=yes
+ DEFAULT_wxUSE_FINDREPLDLG=yes
DEFAULT_wxUSE_FONTDLG=yes
DEFAULT_wxUSE_MSGDLG=yes
DEFAULT_wxUSE_NUMBERDLG=yes
DEFAULT_wxUSE_TEXTDLG=yes
+ DEFAULT_wxUSE_SPLASH=yes
DEFAULT_wxUSE_STARTUP_TIPS=yes
DEFAULT_wxUSE_PROGRESSDLG=yes
DEFAULT_wxUSE_WIZARDDLG=yes
DEFAULT_wxUSE_LISTBOX=yes
DEFAULT_wxUSE_LISTCTRL=yes
DEFAULT_wxUSE_NOTEBOOK=yes
+ DEFAULT_wxUSE_PROPSHEET=yes
DEFAULT_wxUSE_RADIOBOX=yes
DEFAULT_wxUSE_RADIOBTN=yes
DEFAULT_wxUSE_SASH=yes
echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6
-echo "configure:1704: checking for --enable-gui" >&5
+echo "configure:1716: checking for --enable-gui" >&5
no_cache=0
# Check whether --enable-gui or --disable-gui was given.
if test "${enable_gui+set}" = set; then
echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6
-echo "configure:1746: checking for --enable-universal" >&5
+echo "configure:1758: checking for --enable-universal" >&5
no_cache=0
# Check whether --enable-universal or --disable-universal was given.
if test "${enable_universal+set}" = set; then
echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6
-echo "configure:1843: checking for --with-libpng" >&5
+echo "configure:1855: checking for --with-libpng" >&5
no_cache=0
# Check whether --with-libpng or --without-libpng was given.
if test "${with_libpng+set}" = set; then
echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6
-echo "configure:1890: checking for --with-libjpeg" >&5
+echo "configure:1902: checking for --with-libjpeg" >&5
no_cache=0
# Check whether --with-libjpeg or --without-libjpeg was given.
if test "${with_libjpeg+set}" = set; then
echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6
-echo "configure:1937: checking for --with-libtiff" >&5
+echo "configure:1949: checking for --with-libtiff" >&5
no_cache=0
# Check whether --with-libtiff or --without-libtiff was given.
if test "${with_libtiff+set}" = set; then
echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6
-echo "configure:1984: checking for --with-freetype" >&5
+echo "configure:1996: checking for --with-freetype" >&5
no_cache=0
# Check whether --with-freetype or --without-freetype was given.
if test "${with_freetype+set}" = set; then
echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6
-echo "configure:2031: checking for --with-opengl" >&5
+echo "configure:2043: checking for --with-opengl" >&5
no_cache=0
# Check whether --with-opengl or --without-opengl was given.
if test "${with_opengl+set}" = set; then
echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6
-echo "configure:2073: checking for --with-dmalloc" >&5
+echo "configure:2085: checking for --with-dmalloc" >&5
no_cache=0
# Check whether --with-dmalloc or --without-dmalloc was given.
if test "${with_dmalloc+set}" = set; then
echo $ac_n "checking for --with-regex""... $ac_c" 1>&6
-echo "configure:2112: checking for --with-regex" >&5
+echo "configure:2124: checking for --with-regex" >&5
no_cache=0
# Check whether --with-regex or --without-regex was given.
if test "${with_regex+set}" = set; then
echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6
-echo "configure:2159: checking for --with-zlib" >&5
+echo "configure:2171: checking for --with-zlib" >&5
no_cache=0
# Check whether --with-zlib or --without-zlib was given.
if test "${with_zlib+set}" = set; then
echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6
-echo "configure:2206: checking for --with-odbc" >&5
+echo "configure:2218: checking for --with-odbc" >&5
no_cache=0
# Check whether --with-odbc or --without-odbc was given.
if test "${with_odbc+set}" = set; then
echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6
-echo "configure:2248: checking for --enable-shared" >&5
+echo "configure:2260: checking for --enable-shared" >&5
no_cache=0
# Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
echo $ac_n "checking for --enable-burnt_name""... $ac_c" 1>&6
-echo "configure:2287: checking for --enable-burnt_name" >&5
+echo "configure:2299: checking for --enable-burnt_name" >&5
no_cache=0
# Check whether --enable-burnt_name or --disable-burnt_name was given.
if test "${enable_burnt_name+set}" = set; then
echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6
-echo "configure:2326: checking for --enable-optimise" >&5
+echo "configure:2338: checking for --enable-optimise" >&5
no_cache=0
# Check whether --enable-optimise or --disable-optimise was given.
if test "${enable_optimise+set}" = set; then
echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6
-echo "configure:2365: checking for --enable-debug" >&5
+echo "configure:2377: checking for --enable-debug" >&5
no_cache=0
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6
-echo "configure:2413: checking for --enable-debug_flag" >&5
+echo "configure:2425: 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
echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6
-echo "configure:2452: checking for --enable-debug_info" >&5
+echo "configure:2464: 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
echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6
-echo "configure:2491: checking for --enable-debug_gdb" >&5
+echo "configure:2503: 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
echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6
-echo "configure:2530: checking for --enable-debug_cntxt" >&5
+echo "configure:2542: 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
echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6
-echo "configure:2569: checking for --enable-mem_tracing" >&5
+echo "configure:2581: 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
echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6
-echo "configure:2608: checking for --enable-profile" >&5
+echo "configure:2620: checking for --enable-profile" >&5
no_cache=0
# Check whether --enable-profile or --disable-profile was given.
if test "${enable_profile+set}" = set; then
echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6
-echo "configure:2647: checking for --enable-no_rtti" >&5
+echo "configure:2659: 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
echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6
-echo "configure:2686: checking for --enable-no_exceptions" >&5
+echo "configure:2698: 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
echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6
-echo "configure:2725: checking for --enable-permissive" >&5
+echo "configure:2737: checking for --enable-permissive" >&5
no_cache=0
# Check whether --enable-permissive or --disable-permissive was given.
if test "${enable_permissive+set}" = set; then
echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6
-echo "configure:2764: checking for --enable-no_deps" >&5
+echo "configure:2776: 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
echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6
-echo "configure:2804: checking for --enable-compat20" >&5
+echo "configure:2816: checking for --enable-compat20" >&5
no_cache=0
# Check whether --enable-compat20 or --disable-compat20 was given.
if test "${enable_compat20+set}" = set; then
echo $ac_n "checking for --enable-compat22""... $ac_c" 1>&6
-echo "configure:2843: checking for --enable-compat22" >&5
+echo "configure:2855: checking for --enable-compat22" >&5
no_cache=0
# Check whether --enable-compat22 or --disable-compat22 was given.
if test "${enable_compat22+set}" = set; then
echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6
-echo "configure:2884: checking for --enable-intl" >&5
+echo "configure:2896: checking for --enable-intl" >&5
no_cache=0
# Check whether --enable-intl or --disable-intl was given.
if test "${enable_intl+set}" = set; then
echo $ac_n "checking for --enable-config""... $ac_c" 1>&6
-echo "configure:2923: checking for --enable-config" >&5
+echo "configure:2935: checking for --enable-config" >&5
no_cache=0
# Check whether --enable-config or --disable-config was given.
if test "${enable_config+set}" = set; then
echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6
-echo "configure:2963: checking for --enable-sockets" >&5
+echo "configure:2975: checking for --enable-sockets" >&5
no_cache=0
# Check whether --enable-sockets or --disable-sockets was given.
if test "${enable_sockets+set}" = set; then
echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6
-echo "configure:3003: checking for --enable-ipc" >&5
+echo "configure:3015: checking for --enable-ipc" >&5
no_cache=0
# Check whether --enable-ipc or --disable-ipc was given.
if test "${enable_ipc+set}" = set; then
echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6
-echo "configure:3043: checking for --enable-cmdline" >&5
+echo "configure:3055: checking for --enable-cmdline" >&5
no_cache=0
# Check whether --enable-cmdline or --disable-cmdline was given.
if test "${enable_cmdline+set}" = set; then
echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6
-echo "configure:3082: checking for --enable-datetime" >&5
+echo "configure:3094: checking for --enable-datetime" >&5
no_cache=0
# Check whether --enable-datetime or --disable-datetime was given.
if test "${enable_datetime+set}" = set; then
echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6
-echo "configure:3121: checking for --enable-timedate" >&5
+echo "configure:3133: checking for --enable-timedate" >&5
no_cache=0
# Check whether --enable-timedate or --disable-timedate was given.
if test "${enable_timedate+set}" = set; then
echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6
-echo "configure:3160: checking for --enable-stopwatch" >&5
+echo "configure:3172: checking for --enable-stopwatch" >&5
no_cache=0
# Check whether --enable-stopwatch or --disable-stopwatch was given.
if test "${enable_stopwatch+set}" = set; then
echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6
-echo "configure:3199: checking for --enable-dialupman" >&5
+echo "configure:3211: checking for --enable-dialupman" >&5
no_cache=0
# Check whether --enable-dialupman or --disable-dialupman was given.
if test "${enable_dialupman+set}" = set; then
echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6
-echo "configure:3238: checking for --enable-apple_ieee" >&5
+echo "configure:3250: 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
echo $ac_n "checking for --enable-timer""... $ac_c" 1>&6
-echo "configure:3277: checking for --enable-timer" >&5
+echo "configure:3289: checking for --enable-timer" >&5
no_cache=0
# Check whether --enable-timer or --disable-timer was given.
if test "${enable_timer+set}" = set; then
echo $ac_n "checking for --enable-wave""... $ac_c" 1>&6
-echo "configure:3316: checking for --enable-wave" >&5
+echo "configure:3328: checking for --enable-wave" >&5
no_cache=0
# Check whether --enable-wave or --disable-wave was given.
if test "${enable_wave+set}" = set; then
echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6
-echo "configure:3355: checking for --enable-fraction" >&5
+echo "configure:3367: checking for --enable-fraction" >&5
no_cache=0
# Check whether --enable-fraction or --disable-fraction was given.
if test "${enable_fraction+set}" = set; then
echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6
-echo "configure:3394: checking for --enable-dynlib" >&5
+echo "configure:3406: checking for --enable-dynlib" >&5
no_cache=0
# Check whether --enable-dynlib or --disable-dynlib was given.
if test "${enable_dynlib+set}" = set; then
echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6
-echo "configure:3433: checking for --enable-longlong" >&5
+echo "configure:3445: checking for --enable-longlong" >&5
no_cache=0
# Check whether --enable-longlong or --disable-longlong was given.
if test "${enable_longlong+set}" = set; then
echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6
-echo "configure:3472: checking for --enable-geometry" >&5
+echo "configure:3484: checking for --enable-geometry" >&5
no_cache=0
# Check whether --enable-geometry or --disable-geometry was given.
if test "${enable_geometry+set}" = set; then
echo $ac_n "checking for --enable-log""... $ac_c" 1>&6
-echo "configure:3511: checking for --enable-log" >&5
+echo "configure:3523: checking for --enable-log" >&5
no_cache=0
# Check whether --enable-log or --disable-log was given.
if test "${enable_log+set}" = set; then
echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6
-echo "configure:3550: checking for --enable-streams" >&5
+echo "configure:3562: checking for --enable-streams" >&5
no_cache=0
# Check whether --enable-streams or --disable-streams was given.
if test "${enable_streams+set}" = set; then
echo $ac_n "checking for --enable-file""... $ac_c" 1>&6
-echo "configure:3589: checking for --enable-file" >&5
+echo "configure:3601: checking for --enable-file" >&5
no_cache=0
# Check whether --enable-file or --disable-file was given.
if test "${enable_file+set}" = set; then
echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6
-echo "configure:3628: checking for --enable-ffile" >&5
+echo "configure:3640: checking for --enable-ffile" >&5
no_cache=0
# Check whether --enable-ffile or --disable-ffile was given.
if test "${enable_ffile+set}" = set; then
echo $ac_n "checking for --enable-textfile""... $ac_c" 1>&6
-echo "configure:3667: checking for --enable-textfile" >&5
+echo "configure:3679: checking for --enable-textfile" >&5
no_cache=0
# Check whether --enable-textfile or --disable-textfile was given.
if test "${enable_textfile+set}" = set; then
echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6
-echo "configure:3706: checking for --enable-fontmap" >&5
+echo "configure:3718: checking for --enable-fontmap" >&5
no_cache=0
# Check whether --enable-fontmap or --disable-fontmap was given.
if test "${enable_fontmap+set}" = set; then
echo $ac_n "checking for --enable-unicode""... $ac_c" 1>&6
-echo "configure:3745: checking for --enable-unicode" >&5
+echo "configure:3757: checking for --enable-unicode" >&5
no_cache=0
# Check whether --enable-unicode or --disable-unicode was given.
if test "${enable_unicode+set}" = set; then
echo $ac_n "checking for --enable-wcsrtombs""... $ac_c" 1>&6
-echo "configure:3784: checking for --enable-wcsrtombs" >&5
+echo "configure:3796: checking for --enable-wcsrtombs" >&5
no_cache=0
# Check whether --enable-wcsrtombs or --disable-wcsrtombs was given.
if test "${enable_wcsrtombs+set}" = set; then
echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6
-echo "configure:3823: checking for --enable-wxprintfv" >&5
+echo "configure:3835: checking for --enable-wxprintfv" >&5
no_cache=0
# Check whether --enable-wxprintfv or --disable-wxprintfv was given.
if test "${enable_wxprintfv+set}" = set; then
echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6
-echo "configure:3862: checking for --enable-std_iostreams" >&5
+echo "configure:3874: 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
echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6
-echo "configure:3901: checking for --enable-filesystem" >&5
+echo "configure:3913: checking for --enable-filesystem" >&5
no_cache=0
# Check whether --enable-filesystem or --disable-filesystem was given.
if test "${enable_filesystem+set}" = set; then
echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6
-echo "configure:3940: checking for --enable-fs_inet" >&5
+echo "configure:3952: 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
echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6
-echo "configure:3979: checking for --enable-fs_zip" >&5
+echo "configure:3991: 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
echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6
-echo "configure:4018: checking for --enable-zipstream" >&5
+echo "configure:4030: checking for --enable-zipstream" >&5
no_cache=0
# Check whether --enable-zipstream or --disable-zipstream was given.
if test "${enable_zipstream+set}" = set; then
echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6
-echo "configure:4058: checking for --enable-catch_segvs" >&5
+echo "configure:4070: 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
echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6
-echo "configure:4097: checking for --enable-snglinst" >&5
+echo "configure:4109: checking for --enable-snglinst" >&5
no_cache=0
# Check whether --enable-snglinst or --disable-snglinst was given.
if test "${enable_snglinst+set}" = set; then
echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6
-echo "configure:4137: checking for --enable-mimetype" >&5
+echo "configure:4149: checking for --enable-mimetype" >&5
no_cache=0
# Check whether --enable-mimetype or --disable-mimetype was given.
if test "${enable_mimetype+set}" = set; then
echo $ac_n "checking for --enable-system_options""... $ac_c" 1>&6
-echo "configure:4176: checking for --enable-system_options" >&5
+echo "configure:4188: 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
echo $ac_n "checking for --enable-threads""... $ac_c" 1>&6
-echo "configure:4217: checking for --enable-threads" >&5
+echo "configure:4229: checking for --enable-threads" >&5
no_cache=0
# Check whether --enable-threads or --disable-threads was given.
if test "${enable_threads+set}" = set; then
echo $ac_n "checking for --enable-serial""... $ac_c" 1>&6
-echo "configure:4256: checking for --enable-serial" >&5
+echo "configure:4268: checking for --enable-serial" >&5
no_cache=0
# Check whether --enable-serial or --disable-serial was given.
if test "${enable_serial+set}" = set; then
echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6
-echo "configure:4299: checking for --enable-docview" >&5
+echo "configure:4311: checking for --enable-docview" >&5
no_cache=0
# Check whether --enable-docview or --disable-docview was given.
if test "${enable_docview+set}" = set; then
echo $ac_n "checking for --enable-help""... $ac_c" 1>&6
-echo "configure:4338: checking for --enable-help" >&5
+echo "configure:4350: checking for --enable-help" >&5
no_cache=0
# Check whether --enable-help or --disable-help was given.
if test "${enable_help+set}" = set; then
echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6
-echo "configure:4377: checking for --enable-mshtmlhelp" >&5
+echo "configure:4389: checking for --enable-mshtmlhelp" >&5
no_cache=0
# Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given.
if test "${enable_mshtmlhelp+set}" = set; then
echo $ac_n "checking for --enable-html""... $ac_c" 1>&6
-echo "configure:4416: checking for --enable-html" >&5
+echo "configure:4428: checking for --enable-html" >&5
no_cache=0
# Check whether --enable-html or --disable-html was given.
if test "${enable_html+set}" = set; then
echo $ac_n "checking for --enable-htmlhelp""... $ac_c" 1>&6
-echo "configure:4455: checking for --enable-htmlhelp" >&5
+echo "configure:4467: checking for --enable-htmlhelp" >&5
no_cache=0
# Check whether --enable-htmlhelp or --disable-htmlhelp was given.
if test "${enable_htmlhelp+set}" = set; then
echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6
-echo "configure:4494: checking for --enable-constraints" >&5
+echo "configure:4506: checking for --enable-constraints" >&5
no_cache=0
# Check whether --enable-constraints or --disable-constraints was given.
if test "${enable_constraints+set}" = set; then
echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6
-echo "configure:4533: checking for --enable-printarch" >&5
+echo "configure:4545: checking for --enable-printarch" >&5
no_cache=0
# Check whether --enable-printarch or --disable-printarch was given.
if test "${enable_printarch+set}" = set; then
echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6
-echo "configure:4572: checking for --enable-mdi" >&5
+echo "configure:4584: checking for --enable-mdi" >&5
no_cache=0
# Check whether --enable-mdi or --disable-mdi was given.
if test "${enable_mdi+set}" = set; then
echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6
-echo "configure:4611: checking for --enable-loggui" >&5
+echo "configure:4623: checking for --enable-loggui" >&5
no_cache=0
# Check whether --enable-loggui or --disable-loggui was given.
if test "${enable_loggui+set}" = set; then
echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6
-echo "configure:4650: checking for --enable-logwin" >&5
+echo "configure:4662: checking for --enable-logwin" >&5
no_cache=0
# Check whether --enable-logwin or --disable-logwin was given.
if test "${enable_logwin+set}" = set; then
echo $ac_n "checking for --enable-postscript""... $ac_c" 1>&6
-echo "configure:4690: checking for --enable-postscript" >&5
+echo "configure:4702: checking for --enable-postscript" >&5
no_cache=0
# Check whether --enable-postscript or --disable-postscript was given.
if test "${enable_postscript+set}" = set; then
echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6
-echo "configure:4732: checking for --enable-prologio" >&5
+echo "configure:4744: checking for --enable-prologio" >&5
no_cache=0
# Check whether --enable-prologio or --disable-prologio was given.
if test "${enable_prologio+set}" = set; then
echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6
-echo "configure:4771: checking for --enable-resources" >&5
+echo "configure:4783: checking for --enable-resources" >&5
no_cache=0
# Check whether --enable-resources or --disable-resources was given.
if test "${enable_resources+set}" = set; then
echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6
-echo "configure:4811: checking for --enable-xresources" >&5
+echo "configure:4823: checking for --enable-xresources" >&5
no_cache=0
# Check whether --enable-xresources or --disable-xresources was given.
if test "${enable_xresources+set}" = set; then
echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6
-echo "configure:4852: checking for --enable-clipboard" >&5
+echo "configure:4864: checking for --enable-clipboard" >&5
no_cache=0
# Check whether --enable-clipboard or --disable-clipboard was given.
if test "${enable_clipboard+set}" = set; then
echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6
-echo "configure:4891: checking for --enable-dnd" >&5
+echo "configure:4903: checking for --enable-dnd" >&5
no_cache=0
# Check whether --enable-dnd or --disable-dnd was given.
if test "${enable_dnd+set}" = set; then
echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
-echo "configure:4930: checking for --enable-metafile" >&5
+echo "configure:4942: checking for --enable-metafile" >&5
no_cache=0
# Check whether --enable-metafile or --disable-metafile was given.
if test "${enable_metafile+set}" = set; then
- echo $ac_n "checking for --enable-wxtree""... $ac_c" 1>&6
-echo "configure:4970: checking for --enable-wxtree" >&5
+ echo $ac_n "checking for --enable-treelayout""... $ac_c" 1>&6
+echo "configure:4982: checking for --enable-treelayout" >&5
no_cache=0
- # Check whether --enable-wxtree or --disable-wxtree was given.
-if test "${enable_wxtree+set}" = set; then
- enableval="$enable_wxtree"
+ # Check whether --enable-treelayout or --disable-treelayout was given.
+if test "${enable_treelayout+set}" = set; then
+ enableval="$enable_treelayout"
if test "$enableval" = yes; then
- ac_cv_use_wxtree='wxUSE_WXTREE=yes'
+ ac_cv_use_treelayout='wxUSE_TREELAYOUT=yes'
else
- ac_cv_use_wxtree='wxUSE_WXTREE=no'
+ ac_cv_use_treelayout='wxUSE_TREELAYOUT=no'
fi
else
- LINE=`grep "wxUSE_WXTREE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_TREELAYOUT" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_wxtree='wxUSE_WXTREE='$DEFAULT_wxUSE_WXTREE
+ ac_cv_use_treelayout='wxUSE_TREELAYOUT='$DEFAULT_wxUSE_TREELAYOUT
fi
- eval "$ac_cv_use_wxtree"
+ eval "$ac_cv_use_treelayout"
if test "$no_cache" != 1; then
- echo $ac_cv_use_wxtree >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_treelayout >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_WXTREE" = yes; then
+ if test "$wxUSE_TREELAYOUT" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6
-echo "configure:5011: checking for --enable-controls" >&5
+echo "configure:5023: checking for --enable-controls" >&5
no_cache=0
# Check whether --enable-controls or --disable-controls was given.
if test "${enable_controls+set}" = set; then
DEFAULT_wxUSE_LISTBOX=yes
DEFAULT_wxUSE_LISTCTRL=yes
DEFAULT_wxUSE_NOTEBOOK=yes
+ DEFAULT_wxUSE_PROPSHEET=yes
DEFAULT_wxUSE_RADIOBOX=yes
DEFAULT_wxUSE_RADIOBTN=yes
DEFAULT_wxUSE_SASH=yes
DEFAULT_wxUSE_LISTBOX=no
DEFAULT_wxUSE_LISTCTRL=no
DEFAULT_wxUSE_NOTEBOOK=no
+ DEFAULT_wxUSE_PROPSHEET=no
DEFAULT_wxUSE_RADIOBOX=no
DEFAULT_wxUSE_RADIOBTN=no
DEFAULT_wxUSE_SASH=no
echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6
-echo "configure:5127: checking for --enable-accel" >&5
+echo "configure:5141: checking for --enable-accel" >&5
no_cache=0
# Check whether --enable-accel or --disable-accel was given.
if test "${enable_accel+set}" = set; then
echo $ac_n "checking for --enable-button""... $ac_c" 1>&6
-echo "configure:5166: checking for --enable-button" >&5
+echo "configure:5180: checking for --enable-button" >&5
no_cache=0
# Check whether --enable-button or --disable-button was given.
if test "${enable_button+set}" = set; then
echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6
-echo "configure:5205: checking for --enable-bmpbutton" >&5
+echo "configure:5219: checking for --enable-bmpbutton" >&5
no_cache=0
# Check whether --enable-bmpbutton or --disable-bmpbutton was given.
if test "${enable_bmpbutton+set}" = set; then
echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6
-echo "configure:5244: checking for --enable-calendar" >&5
+echo "configure:5258: checking for --enable-calendar" >&5
no_cache=0
# Check whether --enable-calendar or --disable-calendar was given.
if test "${enable_calendar+set}" = set; then
echo $ac_n "checking for --enable-caret""... $ac_c" 1>&6
-echo "configure:5283: checking for --enable-caret" >&5
+echo "configure:5297: checking for --enable-caret" >&5
no_cache=0
# Check whether --enable-caret or --disable-caret was given.
if test "${enable_caret+set}" = set; then
echo $ac_n "checking for --enable-checkbox""... $ac_c" 1>&6
-echo "configure:5322: checking for --enable-checkbox" >&5
+echo "configure:5336: checking for --enable-checkbox" >&5
no_cache=0
# Check whether --enable-checkbox or --disable-checkbox was given.
if test "${enable_checkbox+set}" = set; then
echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6
-echo "configure:5361: checking for --enable-checklst" >&5
+echo "configure:5375: checking for --enable-checklst" >&5
no_cache=0
# Check whether --enable-checklst or --disable-checklst was given.
if test "${enable_checklst+set}" = set; then
echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6
-echo "configure:5400: checking for --enable-choice" >&5
+echo "configure:5414: checking for --enable-choice" >&5
no_cache=0
# Check whether --enable-choice or --disable-choice was given.
if test "${enable_choice+set}" = set; then
echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6
-echo "configure:5439: checking for --enable-combobox" >&5
+echo "configure:5453: checking for --enable-combobox" >&5
no_cache=0
# Check whether --enable-combobox or --disable-combobox was given.
if test "${enable_combobox+set}" = set; then
echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6
-echo "configure:5478: checking for --enable-gauge" >&5
+echo "configure:5492: checking for --enable-gauge" >&5
no_cache=0
# Check whether --enable-gauge or --disable-gauge was given.
if test "${enable_gauge+set}" = set; then
echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6
-echo "configure:5517: checking for --enable-grid" >&5
+echo "configure:5531: checking for --enable-grid" >&5
no_cache=0
# Check whether --enable-grid or --disable-grid was given.
if test "${enable_grid+set}" = set; then
echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6
-echo "configure:5556: checking for --enable-newgrid" >&5
+echo "configure:5570: checking for --enable-newgrid" >&5
no_cache=0
# Check whether --enable-newgrid or --disable-newgrid was given.
if test "${enable_newgrid+set}" = set; then
echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6
-echo "configure:5595: checking for --enable-imaglist" >&5
+echo "configure:5609: checking for --enable-imaglist" >&5
no_cache=0
# Check whether --enable-imaglist or --disable-imaglist was given.
if test "${enable_imaglist+set}" = set; then
echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6
-echo "configure:5634: checking for --enable-listbox" >&5
+echo "configure:5648: checking for --enable-listbox" >&5
no_cache=0
# Check whether --enable-listbox or --disable-listbox was given.
if test "${enable_listbox+set}" = set; then
echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6
-echo "configure:5673: checking for --enable-listctrl" >&5
+echo "configure:5687: checking for --enable-listctrl" >&5
no_cache=0
# Check whether --enable-listctrl or --disable-listctrl was given.
if test "${enable_listctrl+set}" = set; then
echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6
-echo "configure:5712: checking for --enable-notebook" >&5
+echo "configure:5726: checking for --enable-notebook" >&5
no_cache=0
# Check whether --enable-notebook or --disable-notebook was given.
if test "${enable_notebook+set}" = set; then
fi
+ echo $ac_n "checking for --enable-propsheet""... $ac_c" 1>&6
+echo "configure:5765: checking for --enable-propsheet" >&5
+ no_cache=0
+ # Check whether --enable-propsheet or --disable-propsheet was given.
+if test "${enable_propsheet+set}" = set; then
+ enableval="$enable_propsheet"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_propsheet='wxUSE_PROPSHEET=yes'
+ else
+ ac_cv_use_propsheet='wxUSE_PROPSHEET=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_PROPSHEET" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_propsheet='wxUSE_PROPSHEET='$DEFAULT_wxUSE_PROPSHEET
+
+fi
+
+
+ eval "$ac_cv_use_propsheet"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_propsheet >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_PROPSHEET" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6
-echo "configure:5751: checking for --enable-radiobox" >&5
+echo "configure:5804: checking for --enable-radiobox" >&5
no_cache=0
# Check whether --enable-radiobox or --disable-radiobox was given.
if test "${enable_radiobox+set}" = set; then
echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6
-echo "configure:5790: checking for --enable-radiobtn" >&5
+echo "configure:5843: checking for --enable-radiobtn" >&5
no_cache=0
# Check whether --enable-radiobtn or --disable-radiobtn was given.
if test "${enable_radiobtn+set}" = set; then
echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6
-echo "configure:5829: checking for --enable-sash" >&5
+echo "configure:5882: checking for --enable-sash" >&5
no_cache=0
# Check whether --enable-sash or --disable-sash was given.
if test "${enable_sash+set}" = set; then
echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6
-echo "configure:5868: checking for --enable-scrollbar" >&5
+echo "configure:5921: checking for --enable-scrollbar" >&5
no_cache=0
# Check whether --enable-scrollbar or --disable-scrollbar was given.
if test "${enable_scrollbar+set}" = set; then
echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6
-echo "configure:5907: checking for --enable-slider" >&5
+echo "configure:5960: checking for --enable-slider" >&5
no_cache=0
# Check whether --enable-slider or --disable-slider was given.
if test "${enable_slider+set}" = set; then
echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6
-echo "configure:5946: checking for --enable-spinbtn" >&5
+echo "configure:5999: checking for --enable-spinbtn" >&5
no_cache=0
# Check whether --enable-spinbtn or --disable-spinbtn was given.
if test "${enable_spinbtn+set}" = set; then
echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6
-echo "configure:5985: checking for --enable-spinctrl" >&5
+echo "configure:6038: checking for --enable-spinctrl" >&5
no_cache=0
# Check whether --enable-spinctrl or --disable-spinctrl was given.
if test "${enable_spinctrl+set}" = set; then
echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6
-echo "configure:6024: checking for --enable-splitter" >&5
+echo "configure:6077: checking for --enable-splitter" >&5
no_cache=0
# Check whether --enable-splitter or --disable-splitter was given.
if test "${enable_splitter+set}" = set; then
echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6
-echo "configure:6063: checking for --enable-statbmp" >&5
+echo "configure:6116: checking for --enable-statbmp" >&5
no_cache=0
# Check whether --enable-statbmp or --disable-statbmp was given.
if test "${enable_statbmp+set}" = set; then
echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6
-echo "configure:6102: checking for --enable-statbox" >&5
+echo "configure:6155: checking for --enable-statbox" >&5
no_cache=0
# Check whether --enable-statbox or --disable-statbox was given.
if test "${enable_statbox+set}" = set; then
echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6
-echo "configure:6141: checking for --enable-statline" >&5
+echo "configure:6194: checking for --enable-statline" >&5
no_cache=0
# Check whether --enable-statline or --disable-statline was given.
if test "${enable_statline+set}" = set; then
echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6
-echo "configure:6180: checking for --enable-stattext" >&5
+echo "configure:6233: checking for --enable-stattext" >&5
no_cache=0
# Check whether --enable-stattext or --disable-stattext was given.
if test "${enable_stattext+set}" = set; then
echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6
-echo "configure:6219: checking for --enable-statusbar" >&5
+echo "configure:6272: checking for --enable-statusbar" >&5
no_cache=0
# Check whether --enable-statusbar or --disable-statusbar was given.
if test "${enable_statusbar+set}" = set; then
echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6
-echo "configure:6258: checking for --enable-tabdialog" >&5
+echo "configure:6311: checking for --enable-tabdialog" >&5
no_cache=0
# Check whether --enable-tabdialog or --disable-tabdialog was given.
if test "${enable_tabdialog+set}" = set; then
echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6
-echo "configure:6297: checking for --enable-textctrl" >&5
+echo "configure:6350: checking for --enable-textctrl" >&5
no_cache=0
# Check whether --enable-textctrl or --disable-textctrl was given.
if test "${enable_textctrl+set}" = set; then
echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6
-echo "configure:6336: checking for --enable-togglebtn" >&5
+echo "configure:6389: checking for --enable-togglebtn" >&5
no_cache=0
# Check whether --enable-togglebtn or --disable-togglebtn was given.
if test "${enable_togglebtn+set}" = set; then
echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6
-echo "configure:6375: checking for --enable-toolbar" >&5
+echo "configure:6428: checking for --enable-toolbar" >&5
no_cache=0
# Check whether --enable-toolbar or --disable-toolbar was given.
if test "${enable_toolbar+set}" = set; then
echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6
-echo "configure:6414: checking for --enable-tbarnative" >&5
+echo "configure:6467: checking for --enable-tbarnative" >&5
no_cache=0
# Check whether --enable-tbarnative or --disable-tbarnative was given.
if test "${enable_tbarnative+set}" = set; then
echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6
-echo "configure:6453: checking for --enable-tbarsmpl" >&5
+echo "configure:6506: checking for --enable-tbarsmpl" >&5
no_cache=0
# Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
if test "${enable_tbarsmpl+set}" = set; then
echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6
-echo "configure:6492: checking for --enable-treectrl" >&5
+echo "configure:6545: checking for --enable-treectrl" >&5
no_cache=0
# Check whether --enable-treectrl or --disable-treectrl was given.
if test "${enable_treectrl+set}" = set; then
echo $ac_n "checking for --enable-popupwin""... $ac_c" 1>&6
-echo "configure:6531: checking for --enable-popupwin" >&5
+echo "configure:6584: checking for --enable-popupwin" >&5
no_cache=0
# Check whether --enable-popupwin or --disable-popupwin was given.
if test "${enable_popupwin+set}" = set; then
echo $ac_n "checking for --enable-commondlg""... $ac_c" 1>&6
-echo "configure:6572: checking for --enable-commondlg" >&5
+echo "configure:6625: checking for --enable-commondlg" >&5
no_cache=0
# Check whether --enable-commondlg or --disable-commondlg was given.
if test "${enable_commondlg+set}" = set; then
echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6
-echo "configure:6611: checking for --enable-choicedlg" >&5
+echo "configure:6664: checking for --enable-choicedlg" >&5
no_cache=0
# Check whether --enable-choicedlg or --disable-choicedlg was given.
if test "${enable_choicedlg+set}" = set; then
echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6
-echo "configure:6650: checking for --enable-coldlg" >&5
+echo "configure:6703: checking for --enable-coldlg" >&5
no_cache=0
# Check whether --enable-coldlg or --disable-coldlg was given.
if test "${enable_coldlg+set}" = set; then
echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6
-echo "configure:6689: checking for --enable-filedlg" >&5
+echo "configure:6742: checking for --enable-filedlg" >&5
no_cache=0
# Check whether --enable-filedlg or --disable-filedlg was given.
if test "${enable_filedlg+set}" = set; then
fi
+ echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6
+echo "configure:6781: checking for --enable-filedlg" >&5
+ no_cache=0
+ # Check whether --enable-filedlg or --disable-filedlg was given.
+if test "${enable_filedlg+set}" = set; then
+ enableval="$enable_filedlg"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_filedlg='wxUSE_FINDREPLDLG=yes'
+ else
+ ac_cv_use_filedlg='wxUSE_FINDREPLDLG=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_FINDREPLDLG" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_filedlg='wxUSE_FINDREPLDLG='$DEFAULT_wxUSE_FINDREPLDLG
+
+fi
+
+
+ eval "$ac_cv_use_filedlg"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_FINDREPLDLG" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6
-echo "configure:6728: checking for --enable-fontdlg" >&5
+echo "configure:6820: checking for --enable-fontdlg" >&5
no_cache=0
# Check whether --enable-fontdlg or --disable-fontdlg was given.
if test "${enable_fontdlg+set}" = set; then
echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6
-echo "configure:6767: checking for --enable-dirdlg" >&5
+echo "configure:6859: checking for --enable-dirdlg" >&5
no_cache=0
# Check whether --enable-dirdlg or --disable-dirdlg was given.
if test "${enable_dirdlg+set}" = set; then
echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6
-echo "configure:6806: checking for --enable-msgdlg" >&5
+echo "configure:6898: checking for --enable-msgdlg" >&5
no_cache=0
# Check whether --enable-msgdlg or --disable-msgdlg was given.
if test "${enable_msgdlg+set}" = set; then
echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6
-echo "configure:6845: checking for --enable-numberdlg" >&5
+echo "configure:6937: checking for --enable-numberdlg" >&5
no_cache=0
# Check whether --enable-numberdlg or --disable-numberdlg was given.
if test "${enable_numberdlg+set}" = set; then
fi
+ echo $ac_n "checking for --enable-splash""... $ac_c" 1>&6
+echo "configure:6976: checking for --enable-splash" >&5
+ no_cache=0
+ # Check whether --enable-splash or --disable-splash was given.
+if test "${enable_splash+set}" = set; then
+ enableval="$enable_splash"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_splash='wxUSE_SPLASH=yes'
+ else
+ ac_cv_use_splash='wxUSE_SPLASH=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_SPLASH" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_splash='wxUSE_SPLASH='$DEFAULT_wxUSE_SPLASH
+
+fi
+
+
+ eval "$ac_cv_use_splash"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_splash >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_SPLASH" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6
-echo "configure:6884: checking for --enable-textdlg" >&5
+echo "configure:7015: checking for --enable-textdlg" >&5
no_cache=0
# Check whether --enable-textdlg or --disable-textdlg was given.
if test "${enable_textdlg+set}" = set; then
echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6
-echo "configure:6923: checking for --enable-tipdlg" >&5
+echo "configure:7054: checking for --enable-tipdlg" >&5
no_cache=0
# Check whether --enable-tipdlg or --disable-tipdlg was given.
if test "${enable_tipdlg+set}" = set; then
echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6
-echo "configure:6962: checking for --enable-progressdlg" >&5
+echo "configure:7093: checking for --enable-progressdlg" >&5
no_cache=0
# Check whether --enable-progressdlg or --disable-progressdlg was given.
if test "${enable_progressdlg+set}" = set; then
echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6
-echo "configure:7001: checking for --enable-wizarddlg" >&5
+echo "configure:7132: checking for --enable-wizarddlg" >&5
no_cache=0
# Check whether --enable-wizarddlg or --disable-wizarddlg was given.
if test "${enable_wizarddlg+set}" = set; then
echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6
-echo "configure:7042: checking for --enable-menus" >&5
+echo "configure:7173: checking for --enable-menus" >&5
no_cache=0
# Check whether --enable-menus or --disable-menus was given.
if test "${enable_menus+set}" = set; then
echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6
-echo "configure:7081: checking for --enable-miniframe" >&5
+echo "configure:7212: checking for --enable-miniframe" >&5
no_cache=0
# Check whether --enable-miniframe or --disable-miniframe was given.
if test "${enable_miniframe+set}" = set; then
echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6
-echo "configure:7120: checking for --enable-tooltips" >&5
+echo "configure:7251: checking for --enable-tooltips" >&5
no_cache=0
# Check whether --enable-tooltips or --disable-tooltips was given.
if test "${enable_tooltips+set}" = set; then
echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6
-echo "configure:7159: checking for --enable-splines" >&5
+echo "configure:7290: checking for --enable-splines" >&5
no_cache=0
# Check whether --enable-splines or --disable-splines was given.
if test "${enable_splines+set}" = set; then
echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6
-echo "configure:7198: checking for --enable-validators" >&5
+echo "configure:7329: checking for --enable-validators" >&5
no_cache=0
# Check whether --enable-validators or --disable-validators was given.
if test "${enable_validators+set}" = set; then
echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6
-echo "configure:7237: checking for --enable-busyinfo" >&5
+echo "configure:7368: checking for --enable-busyinfo" >&5
no_cache=0
# Check whether --enable-busyinfo or --disable-busyinfo was given.
if test "${enable_busyinfo+set}" = set; then
echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6
-echo "configure:7276: checking for --enable-joystick" >&5
+echo "configure:7407: checking for --enable-joystick" >&5
no_cache=0
# Check whether --enable-joystick or --disable-joystick was given.
if test "${enable_joystick+set}" = set; then
echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
-echo "configure:7315: checking for --enable-metafile" >&5
+echo "configure:7446: checking for --enable-metafile" >&5
no_cache=0
# Check whether --enable-metafile or --disable-metafile was given.
if test "${enable_metafile+set}" = set; then
echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6
-echo "configure:7354: checking for --enable-dragimage" >&5
+echo "configure:7485: checking for --enable-dragimage" >&5
no_cache=0
# Check whether --enable-dragimage or --disable-dragimage was given.
if test "${enable_dragimage+set}" = set; then
echo $ac_n "checking for --enable-image""... $ac_c" 1>&6
-echo "configure:7395: checking for --enable-image" >&5
+echo "configure:7526: checking for --enable-image" >&5
no_cache=0
# Check whether --enable-image or --disable-image was given.
if test "${enable_image+set}" = set; then
echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6
-echo "configure:7434: checking for --enable-gif" >&5
+echo "configure:7565: checking for --enable-gif" >&5
no_cache=0
# Check whether --enable-gif or --disable-gif was given.
if test "${enable_gif+set}" = set; then
echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6
-echo "configure:7473: checking for --enable-pcx" >&5
+echo "configure:7604: checking for --enable-pcx" >&5
no_cache=0
# Check whether --enable-pcx or --disable-pcx was given.
if test "${enable_pcx+set}" = set; then
echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
-echo "configure:7512: checking for --enable-pnm" >&5
+echo "configure:7643: checking for --enable-pnm" >&5
no_cache=0
# Check whether --enable-pnm or --disable-pnm was given.
if test "${enable_pnm+set}" = set; then
echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
-echo "configure:7551: checking for --enable-pnm" >&5
+echo "configure:7682: checking for --enable-pnm" >&5
no_cache=0
# Check whether --enable-pnm or --disable-pnm was given.
if test "${enable_pnm+set}" = set; then
echo $ac_n "checking for toolkit""... $ac_c" 1>&6
-echo "configure:7598: checking for toolkit" >&5
+echo "configure:7729: checking for toolkit" >&5
if test "$wxUSE_GUI" = "yes"; then
# 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:7732: checking for $ac_word" >&5
+echo "configure:7863: 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
# 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:7762: checking for $ac_word" >&5
+echo "configure:7893: 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
# 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:7813: checking for $ac_word" >&5
+echo "configure:7944: 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
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:7845: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:7976: 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.
cat > conftest.$ac_ext << EOF
-#line 7856 "configure"
+#line 7987 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:7861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7992: \"$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
{ 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:7887: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:8018: 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:7892: checking whether we are using GNU C" >&5
+echo "configure:8023: 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
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:7901: \"$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:8032: \"$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
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:7920: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:8051: 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
CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:7955: checking how to run the C preprocessor" >&5
+echo "configure:8086: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 7970 "configure"
+#line 8101 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8107: \"$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*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 7987 "configure"
+#line 8118 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8124: \"$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*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 8004 "configure"
+#line 8135 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8141: \"$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 test $ac_cv_prog_gcc = yes; then
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:8037: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:8168: 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 <<EOF
-#line 8043 "configure"
+#line 8174 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 8061 "configure"
+#line 8192 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
# 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:8097: checking for $ac_word" >&5
+echo "configure:8228: 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
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:8129: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:8260: 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.
cat > conftest.$ac_ext << EOF
-#line 8140 "configure"
+#line 8271 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:8145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8276: \"$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
{ 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:8171: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:8302: 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:8176: checking whether we are using GNU C++" >&5
+echo "configure:8307: 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
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:8185: \"$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:8316: \"$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
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:8204: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:8335: 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
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:8237: checking how to run the C++ preprocessor" >&5
+echo "configure:8368: 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
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
-#line 8250 "configure"
+#line 8381 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8386: \"$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
:
# 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:8293: checking for $ac_word" >&5
+echo "configure:8424: 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
# 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:8324: checking for $ac_word" >&5
+echo "configure:8455: 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
# 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:8364: checking for a BSD compatible install" >&5
+echo "configure:8495: 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
# 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:8420: checking for $ac_word" >&5
+echo "configure:8551: 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
echo $ac_n "checking make for VPATH support""... $ac_c" 1>&6
-echo "configure:8449: checking make for VPATH support" >&5
+echo "configure:8580: checking make for VPATH support" >&5
cat - << EOF > confMake
check : file
cp \$? \$@
# 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:8486: checking for $ac_word" >&5
+echo "configure:8617: 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
# 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:8520: checking for $ac_word" >&5
+echo "configure:8651: 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
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:8554: checking for yywrap in -l$ac_lib" >&5
+echo "configure:8685: 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
ac_save_LIBS="$LIBS"
LIBS="-l$ac_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8562 "configure"
+#line 8693 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
yywrap()
; return 0; }
EOF
-if { (eval echo configure:8573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8704: \"$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 $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:8597: checking whether ln -s works" >&5
+echo "configure:8728: 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
+REGEX_INCLUDE=
+if test "$wxUSE_REGEX" != "no"; then
+ ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for regex.h""... $ac_c" 1>&6
+echo "configure:8873: 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
+#line 8878 "configure"
+#include "confdefs.h"
+#include <regex.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8883: \"$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
+ for ac_func in regcomp
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:8902: 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 <<EOF
+#line 8907 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* 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:8930: \"$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 <<EOF
+#define $ac_tr_func 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+else
+ echo "$ac_t""no" 1>&6
+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; }
+ fi
+
+ REGEX_INCLUDE="-I\${top_srcdir}/src/regex"
+ fi
+
+ cat >> confdefs.h <<\EOF
+#define wxUSE_REGEX 1
+EOF
+
+fi
+
+
AFMINSTALL=
if test "$wxUSE_GUI" = "yes"; then
if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for windows.h""... $ac_c" 1>&6
-echo "configure:8758: checking for windows.h" >&5
+echo "configure:8994: 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
-#line 8763 "configure"
+#line 8999 "configure"
#include "confdefs.h"
#include <windows.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9004: \"$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*
else
echo "$ac_t""no" 1>&6
- { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
-
+ { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
+
fi
-
+
INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
+
LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
if test "$wxUSE_ODBC" = "yes" ; then
if test "$wxUSE_GTK" = 1; then
echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6
-echo "configure:8819: checking for GTK+ version" >&5
+echo "configure:9056: checking for GTK+ version" >&5
gtk_version_cached=1
if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then
# 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:8881: checking for $ac_word" >&5
+echo "configure:9118: 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
min_gtk_version=1.3.1
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:8916: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:9153: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG_2_0" = "no" ; then
no_gtk=yes
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 8939 "configure"
+#line 9176 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:9017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9051 "configure"
+#line 9288 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
; return 0; }
EOF
-if { (eval echo configure:9061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9298: \"$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"
# 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:9119: checking for $ac_word" >&5
+echo "configure:9356: 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
min_gtk_version=1.2.7
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:9154: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:9391: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG" != "no" ; then
GTK_CFLAGS=`$GTK_CONFIG --cflags`
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 9167 "configure"
+#line 9404 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:9200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
# 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:9249: checking for $ac_word" >&5
+echo "configure:9486: 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
min_gtk_version=1.2.3
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:9284: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:9521: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG" != "no" ; then
GTK_CFLAGS=`$GTK_CONFIG --cflags`
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 9297 "configure"
+#line 9534 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:9330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
GUIDIST=GTK_DIST
echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
-echo "configure:9401: checking for gdk_im_open in -lgdk" >&5
+echo "configure:9638: 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
ac_save_LIBS="$LIBS"
LIBS="-lgdk $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9409 "configure"
+#line 9646 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
gdk_im_open()
; return 0; }
EOF
-if { (eval echo configure:9420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9657: \"$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 "$wxUSE_MGL" = 1; then
echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
-echo "configure:9448: checking for SciTech MGL library" >&5
+echo "configure:9685: 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; }
if test "$wxUSE_WINE" = 1; then
echo $ac_n "checking for WINE includes""... $ac_c" 1>&6
-echo "configure:9482: checking for WINE includes" >&5
+echo "configure:9719: checking for WINE includes" >&5
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
XPM_LINK=""
echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:9503: checking for Xpm library" >&5
+echo "configure:9740: checking for Xpm library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
MESA_LINK=""
echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
-echo "configure:9531: checking for Mesa library" >&5
+echo "configure:9768: checking for Mesa library" >&5
ac_find_libraries=
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:9565: checking for X" >&5
+echo "configure:9802: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 9627 "configure"
+#line 9864 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9869: \"$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*
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9701 "configure"
+#line 9938 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:9708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9945: \"$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.
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:9814: checking whether -R must be followed by a space" >&5
+echo "configure:10051: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 9817 "configure"
+#line 10054 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:9824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 9840 "configure"
+#line 10077 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:9847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
# 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:9879: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:10116: 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
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9887 "configure"
+#line 10124 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:9898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10135: \"$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 $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:9920: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:10157: 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
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 9928 "configure"
+#line 10165 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:9939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10176: \"$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
# 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:9968: checking for gethostbyname" >&5
+echo "configure:10205: 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 <<EOF
-#line 9973 "configure"
+#line 10210 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
; return 0; }
EOF
-if { (eval echo configure:9996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10233: \"$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
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:10017: checking for gethostbyname in -lnsl" >&5
+echo "configure:10254: 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
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10025 "configure"
+#line 10262 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:10036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10273: \"$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
# -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:10066: checking for connect" >&5
+echo "configure:10303: 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 <<EOF
-#line 10071 "configure"
+#line 10308 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
; return 0; }
EOF
-if { (eval echo configure:10094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10331: \"$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
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:10115: checking for connect in -lsocket" >&5
+echo "configure:10352: 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
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10123 "configure"
+#line 10360 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
connect()
; return 0; }
EOF
-if { (eval echo configure:10134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10371: \"$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
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:10158: checking for remove" >&5
+echo "configure:10395: 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 <<EOF
-#line 10163 "configure"
+#line 10400 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
; return 0; }
EOF
-if { (eval echo configure:10186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10423: \"$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
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:10207: checking for remove in -lposix" >&5
+echo "configure:10444: 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
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10215 "configure"
+#line 10452 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
remove()
; return 0; }
EOF
-if { (eval echo configure:10226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10463: \"$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
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:10250: checking for shmat" >&5
+echo "configure:10487: 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 <<EOF
-#line 10255 "configure"
+#line 10492 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
; return 0; }
EOF
-if { (eval echo configure:10278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10515: \"$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
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:10299: checking for shmat in -lipc" >&5
+echo "configure:10536: 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
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10307 "configure"
+#line 10544 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
shmat()
; return 0; }
EOF
-if { (eval echo configure:10318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10555: \"$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
# 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:10351: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:10588: 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
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10359 "configure"
+#line 10596 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:10370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10607: \"$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
COMPILED_X_PROGRAM=0
echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
-echo "configure:10411: checking for Motif/Lesstif headers" >&5
+echo "configure:10648: checking for Motif/Lesstif headers" >&5
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
echo "$ac_t""found $ac_find_includes" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10426 "configure"
+#line 10663 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
; return 0; }
EOF
-if { (eval echo configure:10439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""found in default search path" 1>&6
if test "$COMPILED_X_PROGRAM" = 0; then
echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
-echo "configure:10460: checking for Motif/Lesstif library" >&5
+echo "configure:10697: checking for Motif/Lesstif library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
echo "$ac_t""found at $ac_find_libraries" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10499 "configure"
+#line 10736 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
; return 0; }
EOF
-if { (eval echo configure:10512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""found in default search path" 1>&6
XPM_LINK=""
echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:10535: checking for Xpm library" >&5
+echo "configure:10772: checking for Xpm library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
echo "$ac_t""found at $ac_find_libraries" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10567 "configure"
+#line 10804 "configure"
#include "confdefs.h"
#include <X11/xpm.h>
; return 0; }
EOF
-if { (eval echo configure:10580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
XPM_LINK="-lXpm "
WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
-WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+case "${host}" in
+ *-*-mingw32* )
+ WX_LIBRARY_NAME_SHARED="wx${WX_MAJOR_VERSION_NUMBER}${WX_MINOR_VERSION_NUMBER}_${WX_RELEASE_NUMBER}.dll"
+ ;;
+ * )
+ WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+ WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+ ;;
+esac
WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
case "${host}" in
*-hp-hpux* )
if test "$GCC" = yes ; then
- SHARED_LD="${CC} -shared -fPIC -o"
+ SHARED_LD="${CXX} -shared -fPIC -o"
PIC_FLAG="-fPIC"
else
LDFLAGS="-L/usr/lib"
;;
*-*-linux* )
- SHARED_LD="${CC} -shared -o"
+ SHARED_LD="${CXX} -shared -o"
PIC_FLAG="-fPIC"
if test "$wxUSE_BURNT_NAME" = "yes" ; then
BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}"
;;
*-*-irix5* | *-*-irix6* )
if test "$GCC" = yes ; then
- SHARED_LD="${CC} -shared -o"
+ SHARED_LD="${CXX} -shared -o"
PIC_FLAG="-fPIC"
else
SHARED_LD="${CXX} -shared -o"
;;
*-*-solaris2* )
if test "$GCC" = yes ; then
- SHARED_LD="${CC} -shared -o"
+ SHARED_LD="${CXX} -shared -o"
PIC_FLAG="-fPIC"
CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
fi
;;
*-*-sunos4* )
- SHARED_LD="${CC} -shared -o"
+ SHARED_LD="${CXX} -shared -o"
PIC_FLAG="-fPIC"
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_ALL="CREATE_LINKS"
;;
*-*-freebsd* | *-*-openbsd* | *-*-netbsd* )
- SHARED_LD="${CC} -shared -o"
+ SHARED_LD="${CXX} -shared -o"
PIC_FLAG="-fPIC"
if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
fi
;;
*-*-darwin* )
- TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -D__DARWIN__ -D__POWERPC__"
- CFLAGS="${CFLAGS} -fno-common"
- CPPFLAGS="${CPPFLAGS} -fno-common"
+ TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -D__DARWIN__ -D__POWERPC__"
+ CPPFLAGS="${CPPFLAGS} -fno-common"
SHARED_LD="${CXX} -dynamiclib -o"
PIC_FLAG="-dynamic -fPIC"
if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_ALL="CREATE_LINKS"
fi
- if test "$wxUSE_MAC" = 1 ; then
- WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r"
- fi
+ if test "$wxUSE_MAC" = 1 ; then
+ WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r"
+ fi
WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}"
WX_ALL="CREATE_LINKS"
;;
*-*-sysv5* )
- SHARED_LD="${CC} -shared -o"
+ SHARED_LD="${CXX} -shared -o"
PIC_FLAG="-fPIC"
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_ALL="CREATE_LINKS"
fi
;;
*-*-mingw32* )
- WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
- WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
+ WX_LIBRARY_NAME_STATIC="lib/libwx${WX_MAJOR_VERSION_NUMBER}${WX_MINOR_VERSION_NUMBER}_${WX_RELEASE_NUMBER}.a"
+ SHARED_LD="${CC} -shared -Wl,--out-implib,${WX_LIBRARY_NAME_STATIC} -o"
+ TOOLKIT_DEF="${TOOLKIT_DEF} -DWXUSINGDLL=1"
+ WXMSW_DLL_DEFINES="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
+ WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
+ WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}"
if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL_INSTALLED="preinstall_gl"
- WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
+ WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}"
else
- WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+ WX_ALL="${WX_LIBRARY_NAME_SHARED}"
fi
;;
*-pc-os2_emx )
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10978: checking for $ac_hdr" >&5
+echo "configure:11225: 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
-#line 10983 "configure"
+#line 11230 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11235: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11018: checking for $ac_hdr" >&5
+echo "configure:11265: 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
-#line 11023 "configure"
+#line 11270 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11275: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11058: checking for $ac_hdr" >&5
+echo "configure:11305: 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
-#line 11063 "configure"
+#line 11310 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11315: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11098: checking for $ac_hdr" >&5
+echo "configure:11345: 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
-#line 11103 "configure"
+#line 11350 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11355: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11138: checking for $ac_hdr" >&5
+echo "configure:11385: 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
-#line 11143 "configure"
+#line 11390 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11395: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11178: checking for $ac_hdr" >&5
+echo "configure:11425: 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
-#line 11183 "configure"
+#line 11430 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11435: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11218: checking for $ac_hdr" >&5
+echo "configure:11465: 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
-#line 11223 "configure"
+#line 11470 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11475: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11258: checking for $ac_hdr" >&5
+echo "configure:11505: 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
-#line 11263 "configure"
+#line 11510 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11515: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11301: checking for $ac_hdr" >&5
+echo "configure:11548: 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
-#line 11306 "configure"
+#line 11553 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11558: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11345: checking for $ac_hdr" >&5
+echo "configure:11592: 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
-#line 11350 "configure"
+#line 11597 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11602: \"$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*
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:11385: checking for ANSI C header files" >&5
+echo "configure:11632: 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 <<EOF
-#line 11390 "configure"
+#line 11637 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11645: \"$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*
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
-#line 11415 "configure"
+#line 11662 "configure"
#include "confdefs.h"
#include <string.h>
EOF
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
-#line 11433 "configure"
+#line 11680 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
:
else
cat > conftest.$ac_ext <<EOF
-#line 11454 "configure"
+#line 11701 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
exit (0); }
EOF
-if { (eval echo configure:11465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
fi
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:11489: checking for mode_t" >&5
+echo "configure:11736: 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 <<EOF
-#line 11494 "configure"
+#line 11741 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:11522: checking for off_t" >&5
+echo "configure:11769: 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 <<EOF
-#line 11527 "configure"
+#line 11774 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:11555: checking for pid_t" >&5
+echo "configure:11802: 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 <<EOF
-#line 11560 "configure"
+#line 11807 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:11588: checking for size_t" >&5
+echo "configure:11835: 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 <<EOF
-#line 11593 "configure"
+#line 11840 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:11621: checking for uid_t in sys/types.h" >&5
+echo "configure:11868: 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
-#line 11626 "configure"
+#line 11873 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
echo $ac_n "checking for wchar_t""... $ac_c" 1>&6
-echo "configure:11656: checking for wchar_t" >&5
+echo "configure:11903: 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 <<EOF
-#line 11662 "configure"
+#line 11909 "configure"
#include "confdefs.h"
#include <wchar.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:11673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_wchar_t=yes
else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 11681 "configure"
+#line 11928 "configure"
#include "confdefs.h"
#include <stdlib.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:11692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_wchar_t=yes
else
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6
-echo "configure:11726: checking if size_t is unsigned int" >&5
+echo "configure:11973: 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 <<EOF
-#line 11731 "configure"
+#line 11978 "configure"
#include "confdefs.h"
#include <stddef.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:11744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_size_t_is_uint=no
else
else
echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6
-echo "configure:11767: checking if size_t is unsigned long" >&5
+echo "configure:12014: 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 <<EOF
-#line 11772 "configure"
+#line 12019 "configure"
#include "confdefs.h"
#include <stddef.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:11785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_size_t_is_ulong=no
else
echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6
-echo "configure:11819: checking for pw_gecos in struct passwd" >&5
+echo "configure:12066: 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 <<EOF
-#line 11825 "configure"
+#line 12072 "configure"
#include "confdefs.h"
#include <pwd.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:11836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_struct_pw_gecos=yes
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:11866: checking for working const" >&5
+echo "configure:12113: 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 <<EOF
-#line 11871 "configure"
+#line 12118 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:11920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:11941: checking for inline" >&5
+echo "configure:12188: 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 <<EOF
-#line 11948 "configure"
+#line 12195 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:11955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:11982: checking size of char" >&5
+echo "configure:12229: 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
ac_cv_sizeof_char=1
else
cat > conftest.$ac_ext <<EOF
-#line 11990 "configure"
+#line 12237 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:12001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12248: \"$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
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:12021: checking size of short" >&5
+echo "configure:12268: 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
ac_cv_sizeof_short=2
else
cat > conftest.$ac_ext <<EOF
-#line 12029 "configure"
+#line 12276 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:12040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12287: \"$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
echo $ac_n "checking size of int *""... $ac_c" 1>&6
-echo "configure:12060: checking size of int *" >&5
+echo "configure:12307: 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
ac_cv_sizeof_int_p=4
else
cat > conftest.$ac_ext <<EOF
-#line 12068 "configure"
+#line 12315 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:12079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12326: \"$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
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:12099: checking size of int" >&5
+echo "configure:12346: 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
ac_cv_sizeof_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 12107 "configure"
+#line 12354 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:12118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12365: \"$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
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:12138: checking size of long" >&5
+echo "configure:12385: 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
ac_cv_sizeof_long=4
else
cat > conftest.$ac_ext <<EOF
-#line 12146 "configure"
+#line 12393 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:12157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12404: \"$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
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:12177: checking size of long long" >&5
+echo "configure:12424: 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
ac_cv_sizeof_long_long=0
else
cat > conftest.$ac_ext <<EOF
-#line 12185 "configure"
+#line 12432 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:12196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12443: \"$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
echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
-echo "configure:12217: checking size of wchar_t" >&5
+echo "configure:12464: 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
else
cat > conftest.$ac_ext <<EOF
-#line 12227 "configure"
+#line 12474 "configure"
#include "confdefs.h"
#ifdef HAVE_WCHAR_H
}
EOF
-if { (eval echo configure:12246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12493: \"$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
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:12269: checking whether byte ordering is bigendian" >&5
+echo "configure:12516: 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 <<EOF
-#line 12276 "configure"
+#line 12523 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:12287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12534: \"$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 <<EOF
-#line 12291 "configure"
+#line 12538 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:12302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
ac_cv_c_bigendian=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 12322 "configure"
+#line 12569 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:12335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12582: \"$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
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12382: checking for $ac_hdr" >&5
+echo "configure:12629: 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
-#line 12387 "configure"
+#line 12634 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12639: \"$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*
echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
-echo "configure:12440: checking if C++ compiler supports bool" >&5
+echo "configure:12687: 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
cat > conftest.$ac_ext <<EOF
-#line 12455 "configure"
+#line 12702 "configure"
#include "confdefs.h"
; return 0; }
EOF
-if { (eval echo configure:12467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_cpp_bool=yes
echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6
-echo "configure:12505: checking for wcslen in -lc" >&5
+echo "configure:12752: 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
ac_save_LIBS="$LIBS"
LIBS="-lc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12513 "configure"
+#line 12760 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
wcslen()
; return 0; }
EOF
-if { (eval echo configure:12524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12771: \"$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 "$ac_t""no" 1>&6
echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
-echo "configure:12550: checking for wcslen in -lw" >&5
+echo "configure:12797: 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
ac_save_LIBS="$LIBS"
LIBS="-lw $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12558 "configure"
+#line 12805 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
wcslen()
; return 0; }
EOF
-if { (eval echo configure:12569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12816: \"$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
else
echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6
+echo "configure:12842: 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 <<EOF
+#line 12850 "configure"
+#include "confdefs.h"
+/* 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 wcslen();
+
+int main() {
+wcslen()
+; return 0; }
+EOF
+if { (eval echo configure:12861: \"$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_WCSLEN 1
+EOF
+
+ WCHAR_LINK=""
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
fi
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:12600: checking for vprintf" >&5
+echo "configure:12895: 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 <<EOF
-#line 12605 "configure"
+#line 12900 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
; return 0; }
EOF
-if { (eval echo configure:12628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12923: \"$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
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:12652: checking for _doprnt" >&5
+echo "configure:12947: 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 <<EOF
-#line 12657 "configure"
+#line 12952 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
; return 0; }
EOF
-if { (eval echo configure:12680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
-echo "configure:12711: checking for vsnprintf" >&5
+echo "configure:13006: 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 <<EOF
-#line 12717 "configure"
+#line 13012 "configure"
#include "confdefs.h"
#include <stdio.h>
; return 0; }
EOF
-if { (eval echo configure:12742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_vsnprintf=yes
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 12753 "configure"
+#line 13048 "configure"
#include "confdefs.h"
#include <stdio.h>
; return 0; }
EOF
-if { (eval echo configure:12778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_vsnprintf=yes
fi
echo $ac_n "checking for vsscanf""... $ac_c" 1>&6
-echo "configure:12810: checking for vsscanf" >&5
+echo "configure:13105: 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 <<EOF
-#line 12816 "configure"
+#line 13111 "configure"
#include "confdefs.h"
#include <stdio.h>
; return 0; }
EOF
-if { (eval echo configure:12839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_vsscanf=yes
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking if iconv() takes char**""... $ac_c" 1>&6
-echo "configure:12877: checking if iconv() takes char**" >&5
+echo "configure:13172: 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 <<EOF
-#line 12883 "configure"
+#line 13178 "configure"
#include "confdefs.h"
#include <iconv.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:12895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_iconv_takes_char=yes
else
for ac_func in sigaction
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12928: checking for $ac_func" >&5
+echo "configure:13223: 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 <<EOF
-#line 12933 "configure"
+#line 13228 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:12956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13251: \"$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 $ac_n "checking for sa_handler type""... $ac_c" 1>&6
-echo "configure:12997: checking for sa_handler type" >&5
+echo "configure:13292: 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 <<EOF
-#line 13003 "configure"
+#line 13298 "configure"
#include "confdefs.h"
#include <signal.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:13015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_sa_handler=int
for ac_func in vfork
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13052: checking for $ac_func" >&5
+echo "configure:13347: 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 <<EOF
-#line 13057 "configure"
+#line 13352 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:13080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13375: \"$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
done
+echo $ac_n "checking for statfs""... $ac_c" 1>&6
+echo "configure:13401: 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 <<EOF
+#line 13406 "configure"
+#include "confdefs.h"
+
+ #include <sys/vfs.h>
+
+int main() {
+
+ 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:13422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+
+ wx_cv_func_statfs=yes
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+
+ wx_cv_func_statfs=no
+
+
+fi
+rm -f conftest*
+
+fi
+
+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 "configure: warning: wxGetDiskSpace() function won't work without statfs()" 1>&2
+fi
+
if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
for ac_func in fcntl flock
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13109: checking for $ac_func" >&5
+echo "configure:13455: 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 <<EOF
-#line 13114 "configure"
+#line 13460 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:13137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13483: \"$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
for ac_func in timegm
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13171: checking for $ac_func" >&5
+echo "configure:13517: 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 <<EOF
-#line 13176 "configure"
+#line 13522 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:13199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13545: \"$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
for ac_func in putenv setenv
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13227: checking for $ac_func" >&5
+echo "configure:13573: 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 <<EOF
-#line 13232 "configure"
+#line 13578 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:13255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13601: \"$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
for ac_func in nanosleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13302: checking for $ac_func" >&5
+echo "configure:13648: 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 <<EOF
-#line 13307 "configure"
+#line 13653 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:13330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13676: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
-echo "configure:13355: checking for nanosleep in -lposix4" >&5
+echo "configure:13701: 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
ac_save_LIBS="$LIBS"
LIBS="-lposix4 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13363 "configure"
+#line 13709 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
nanosleep()
; return 0; }
EOF
-if { (eval echo configure:13374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13720: \"$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
for ac_func in usleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13402: checking for $ac_func" >&5
+echo "configure:13748: 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 <<EOF
-#line 13407 "configure"
+#line 13753 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:13430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13776: \"$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
for ac_func in uname gethostname
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13473: checking for $ac_func" >&5
+echo "configure:13819: 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 <<EOF
-#line 13478 "configure"
+#line 13824 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:13501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13847: \"$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
for ac_func in strtok_r
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13538: checking for $ac_func" >&5
+echo "configure:13884: 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 <<EOF
-#line 13543 "configure"
+#line 13889 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:13569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13915: \"$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
for ac_func in inet_addr
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13606: checking for $ac_func" >&5
+echo "configure:13952: 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 <<EOF
-#line 13611 "configure"
+#line 13957 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:13634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13980: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
-echo "configure:13659: checking for inet_addr in -lnsl" >&5
+echo "configure:14005: 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
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13667 "configure"
+#line 14013 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
inet_addr()
; return 0; }
EOF
-if { (eval echo configure:13678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14024: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6
-echo "configure:13697: checking for inet_addr in -lresolv" >&5
+echo "configure:14043: 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
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13705 "configure"
+#line 14051 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
inet_addr()
; return 0; }
EOF
-if { (eval echo configure:13716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14062: \"$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
for ac_func in inet_aton
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13749: checking for $ac_func" >&5
+echo "configure:14095: 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 <<EOF
-#line 13754 "configure"
+#line 14100 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:13777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14123: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6
-echo "configure:13802: checking for inet_aton in -l$INET_LINK" >&5
+echo "configure:14148: 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
ac_save_LIBS="$LIBS"
LIBS="-l$INET_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13810 "configure"
+#line 14156 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
inet_aton()
; return 0; }
EOF
-if { (eval echo configure:13821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14167: \"$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
fi
echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6
-echo "configure:13934: checking for pthread_create in -l$THREADS_LIB" >&5
+echo "configure:14280: 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
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13942 "configure"
+#line 14288 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:13953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14299: \"$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 "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:13976: checking for pthread_create in -lc_r" >&5
+echo "configure:14322: 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
ac_save_LIBS="$LIBS"
LIBS="-lc_r $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13984 "configure"
+#line 14330 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:13995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14341: \"$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
ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
-echo "configure:14019: checking for sys/prctl.h" >&5
+echo "configure:14365: checking for sys/prctl.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14024 "configure"
+#line 14370 "configure"
#include "confdefs.h"
#include <sys/prctl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14375: \"$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*
for ac_func in thr_setconcurrency
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14069: checking for $ac_func" >&5
+echo "configure:14415: 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 <<EOF
-#line 14074 "configure"
+#line 14420 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:14097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14443: \"$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
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14127: checking for $ac_hdr" >&5
+echo "configure:14473: 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
-#line 14132 "configure"
+#line 14478 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14137: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14483: \"$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*
echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:14165: checking for sched_yield in -l$THREADS_LINK" >&5
+echo "configure:14511: 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
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14173 "configure"
+#line 14519 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
sched_yield()
; return 0; }
EOF
-if { (eval echo configure:14184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14530: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
-echo "configure:14206: checking for sched_yield in -lposix4" >&5
+echo "configure:14552: 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
ac_save_LIBS="$LIBS"
LIBS="-lposix4 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14214 "configure"
+#line 14560 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
sched_yield()
; return 0; }
EOF
-if { (eval echo configure:14225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14571: \"$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
HAVE_PRIOR_FUNCS=0
echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:14256: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
+echo "configure:14602: 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
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14264 "configure"
+#line 14610 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_attr_getschedpolicy()
; return 0; }
EOF
-if { (eval echo configure:14275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14621: \"$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 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:14291: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5
+echo "configure:14637: 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
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14299 "configure"
+#line 14645 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_attr_setschedparam()
; return 0; }
EOF
-if { (eval echo configure:14310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14656: \"$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 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:14326: checking for sched_get_priority_max in -l$THREADS_LINK" >&5
+echo "configure:14672: 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
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14334 "configure"
+#line 14680 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
sched_get_priority_max()
; return 0; }
EOF
-if { (eval echo configure:14345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14691: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6
-echo "configure:14364: checking for sched_get_priority_max in -lposix4" >&5
+echo "configure:14710: 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
ac_save_LIBS="$LIBS"
LIBS="-lposix4 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14372 "configure"
+#line 14718 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
sched_get_priority_max()
; return 0; }
EOF
-if { (eval echo configure:14383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14729: \"$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
fi
echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:14430: checking for pthread_cancel in -l$THREADS_LINK" >&5
+echo "configure:14776: 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
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14438 "configure"
+#line 14784 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_cancel()
; return 0; }
EOF
-if { (eval echo configure:14449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14795: \"$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 $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
-echo "configure:14475: checking for pthread_cleanup_push/pop" >&5
+echo "configure:14821: 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 <<EOF
-#line 14481 "configure"
+#line 14827 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:14491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_pthread_cleanup_push=yes
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:14519: checking for pthread_mutexattr_t" >&5
+echo "configure:14869: 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 <<EOF
-#line 14525 "configure"
+#line 14875 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:14535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_pthread_mutexattr_t=yes
else
echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6
-echo "configure:14562: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
+echo "configure:14912: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14568 "configure"
+#line 14918 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:14577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_pthread_rec_mutex_init=yes
THREADS_LINK="-l$THREADS_LINK"
if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
- CFLAGS="${CFLAGS} -mt"
+ CPPFLAGS="${CFLAGS} -mt"
CXXFLAGS="${CXXFLAGS} -mt"
LDFLAGS="${LDFLAGS} -mt"
fi
EOF
- if test "x$wxUSE_DARWIN" != "x1"; then
- CFLAGS="${CFLAGS} -D_REENTRANT"
- CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
+ if test "$USE_DARWIN" != 1; then
+ CPPFLAGS="${CPPFLAGS} -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:14632: checking if -D_REENTRANT is needed" >&5
+echo "configure:14981: checking if -D_REENTRANT is needed" >&5
if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
- CFLAGS="${CFLAGS} -D_REENTRANT"
- CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
+ CPPFLAGS="${CPPFLAGS} -D_REENTRANT"
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
if test "$wxUSE_MAC" = 1 ; then
TOOLKIT_DEF="${TOOLKIT_DEF} -DTARGET_CARBON"
- CFLAGS="${CFLAGS} -fpascal-strings"
- CPPFLAGS="${CPPFLAGS} -cpp-precomp -fpascal-strings"
+ CPPFLAGS="${CPPFLAGS} -fpascal-strings"
+ CXXFLAGS="${CXXFLAGS} -cpp-precomp"
# 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:14676: checking for $ac_word" >&5
+echo "configure:15024: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_REZ'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# 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:14706: checking for $ac_word" >&5
+echo "configure:15054: 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
fi
-REGEX_INCLUDE=
-if test "$wxUSE_REGEX" != "no"; then
- ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for regex.h""... $ac_c" 1>&6
-echo "configure:14851: 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
-#line 14856 "configure"
-#include "confdefs.h"
-#include <regex.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14861: \"$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
- for ac_func in regcomp
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14880: 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 <<EOF
-#line 14885 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* 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:14908: \"$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 <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
-
-else
- echo "$ac_t""no" 1>&6
-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; }
- fi
-
- REGEX_INCLUDE="-I\${top_srcdir}/src/regex"
- fi
-
- cat >> confdefs.h <<\EOF
-#define wxUSE_REGEX 1
-EOF
-
-fi
-
ZLIB_INCLUDE=
if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
cat >> confdefs.h <<\EOF
ZLIB_LINK=
ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
-echo "configure:14963: checking for zlib.h" >&5
+echo "configure:15207: checking for zlib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 14968 "configure"
+#line 15212 "configure"
#include "confdefs.h"
#include <zlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15217: \"$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*
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:14990: checking for deflate in -lz" >&5
+echo "configure:15234: 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
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14998 "configure"
+#line 15242 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
deflate()
; return 0; }
EOF
-if { (eval echo configure:15009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15253: \"$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
PNG_LINK=
ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:15056: checking for png.h" >&5
+echo "configure:15300: checking for png.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 15061 "configure"
+#line 15305 "configure"
#include "confdefs.h"
#include <png.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15310: \"$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*
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6
-echo "configure:15083: checking for png_check_sig in -lpng" >&5
+echo "configure:15327: 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
ac_save_LIBS="$LIBS"
LIBS="-lpng -lz -lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15091 "configure"
+#line 15335 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
png_check_sig()
; return 0; }
EOF
-if { (eval echo configure:15102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15346: \"$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
else
JPEG_LINK=
echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:15146: checking for jpeglib.h" >&5
+echo "configure:15390: 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 <<EOF
-#line 15151 "configure"
+#line 15395 "configure"
#include "confdefs.h"
#undef HAVE_STDLIB_H
; return 0; }
EOF
-if { (eval echo configure:15163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_jpeglib_h=yes
else
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:15181: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:15425: 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
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15189 "configure"
+#line 15433 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
jpeg_read_header()
; return 0; }
EOF
-if { (eval echo configure:15200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15444: \"$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
TIFF_LINK=
ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:15240: checking for tiffio.h" >&5
+echo "configure:15484: 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
-#line 15245 "configure"
+#line 15489 "configure"
#include "confdefs.h"
#include <tiffio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15494: \"$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*
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:15267: checking for TIFFError in -ltiff" >&5
+echo "configure:15511: 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
ac_save_LIBS="$LIBS"
LIBS="-ltiff -lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15275 "configure"
+#line 15519 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
TIFFError()
; return 0; }
EOF
-if { (eval echo configure:15286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15530: \"$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
FREETYPE_LINK=
ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for freetype.h""... $ac_c" 1>&6
-echo "configure:15328: checking for freetype.h" >&5
+echo "configure:15572: 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
-#line 15333 "configure"
+#line 15577 "configure"
#include "confdefs.h"
#include <freetype.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15582: \"$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*
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:15355: checking for FT_Render_Glyph in -lfreetype" >&5
+echo "configure:15599: 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
ac_save_LIBS="$LIBS"
LIBS="-lfreetype -lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15363 "configure"
+#line 15607 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
FT_Render_Glyph()
; return 0; }
EOF
-if { (eval echo configure:15374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15618: \"$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
fi
if test "$wxUSE_OPENGL" = "yes"; then
- ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
+ if test "$wxUSE_MAC" = 1; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_OPENGL 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define wxUSE_GLCANVAS 1
+EOF
+
+ OPENGL_LINK="-framework OpenGL -framework AGL"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
+ else
+ ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
-echo "configure:15408: checking for GL/gl.h" >&5
+echo "configure:15664: 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
-#line 15413 "configure"
+#line 15669 "configure"
#include "confdefs.h"
#include <GL/gl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15674: \"$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*
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
+ cat >> confdefs.h <<\EOF
#define wxUSE_OPENGL 1
EOF
- cat >> confdefs.h <<\EOF
+ cat >> confdefs.h <<\EOF
#define wxUSE_GLCANVAS 1
EOF
- echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6
-echo "configure:15444: checking for glFlush in -lGL" >&5
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
+ echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6
+echo "configure:15701: 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
ac_save_LIBS="$LIBS"
LIBS="-lGL $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15452 "configure"
+#line 15709 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
glFlush()
; return 0; }
EOF
-if { (eval echo configure:15463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15720: \"$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 eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- OPENGL_LINK="-lGL -lGLU"
-
+ OPENGL_LINK="-lGL -lGLU"
+
else
echo "$ac_t""no" 1>&6
- echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6
-echo "configure:15485: checking for glFlush in -lMesaGL" >&5
+ echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6
+echo "configure:15742: 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
ac_save_LIBS="$LIBS"
LIBS="-lMesaGL $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15493 "configure"
+#line 15750 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
glFlush()
; return 0; }
EOF
-if { (eval echo configure:15504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15761: \"$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 eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- OPENGL_LINK="-lMesaGL -lMesaGLU"
-
+ OPENGL_LINK="-lMesaGL -lMesaGLU"
+
else
echo "$ac_t""no" 1>&6
fi
-
+
fi
-
+
else
echo "$ac_t""no" 1>&6
wxUSE_OPENGL=0
fi
+ fi
fi
for ac_func in strptime
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15770: checking for $ac_func" >&5
+echo "configure:16028: 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 <<EOF
-#line 15775 "configure"
+#line 16033 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:15798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16056: \"$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 $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
-echo "configure:15824: checking for timezone variable in <time.h>" >&5
+echo "configure:16082: checking for timezone variable in <time.h>" >&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 <<EOF
-#line 15830 "configure"
+#line 16088 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:15842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_var_timezone=timezone
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 15853 "configure"
+#line 16111 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:15865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_var_timezone=_timezone
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 15876 "configure"
+#line 16134 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:15888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_var_timezone=__timezone
for ac_func in localtime
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15923: checking for $ac_func" >&5
+echo "configure:16181: 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 <<EOF
-#line 15928 "configure"
+#line 16186 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:15951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16209: \"$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
if test "$ac_cv_func_localtime" = "yes"; then
echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:15978: checking for tm_gmtoff in struct tm" >&5
+echo "configure:16236: 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 <<EOF
-#line 15984 "configure"
+#line 16242 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:15996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_struct_tm_has_gmtoff=yes
for ac_func in gettimeofday ftime
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16025: checking for $ac_func" >&5
+echo "configure:16283: 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 <<EOF
-#line 16030 "configure"
+#line 16288 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:16053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16311: \"$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
if test "$ac_cv_func_gettimeofday" = "yes"; then
echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
-echo "configure:16080: checking whether gettimeofday takes two arguments" >&5
+echo "configure:16338: 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
cat > conftest.$ac_ext <<EOF
-#line 16095 "configure"
+#line 16353 "configure"
#include "confdefs.h"
#include <sys/time.h>
int main() {
struct timeval tv;
- struct timezone tz;
- gettimeofday(&tv, &tz);
+ gettimeofday(&tv, NULL);
; return 0; }
EOF
-if { (eval echo configure:16109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_gettimeofday_has_2_args=yes
else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 16117 "configure"
+#line 16374 "configure"
#include "confdefs.h"
#include <sys/time.h>
; return 0; }
EOF
-if { (eval echo configure:16130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_gettimeofday_has_2_args=no
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- wx_cv_func_gettimeofday_has_2_args=unknown
+
+ echo "configure: warning: failed to determine number of gettimeofday() arguments" 1>&2
+ wx_cv_func_gettimeofday_has_2_args=unknown
+
fi
rm -f conftest*
if test "$wxUSE_SOCKETS" = "yes"; then
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:16176: checking for socket" >&5
+echo "configure:16436: 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 <<EOF
-#line 16181 "configure"
+#line 16441 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
; return 0; }
EOF
-if { (eval echo configure:16204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16464: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:16222: checking for socket in -lsocket" >&5
+echo "configure:16482: 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
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 16230 "configure"
+#line 16490 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
socket()
; return 0; }
EOF
-if { (eval echo configure:16241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16501: \"$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 "$wxUSE_SOCKETS" = "yes" ; then
echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6
-echo "configure:16274: checking what is the type of the third argument of getsockname" >&5
+echo "configure:16534: 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
cat > conftest.$ac_ext <<EOF
-#line 16289 "configure"
+#line 16549 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:16302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_getsockname3=socklen_t
else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 16310 "configure"
+#line 16570 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:16323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_getsockname3=size_t
else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 16331 "configure"
+#line 16591 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:16344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_getsockname3=int
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:16406: checking for $ac_hdr" >&5
+echo "configure:16666: 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
-#line 16411 "configure"
+#line 16671 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:16416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16676: \"$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*
for ac_func in dlopen
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16472: checking for $ac_func" >&5
+echo "configure:16732: 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 <<EOF
-#line 16477 "configure"
+#line 16737 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:16500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16760: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:16528: checking for dlopen in -ldl" >&5
+echo "configure:16788: 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
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 16536 "configure"
+#line 16796 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dlopen()
; return 0; }
EOF
-if { (eval echo configure:16547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16807: \"$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
for ac_func in shl_load
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16576: checking for $ac_func" >&5
+echo "configure:16836: 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 <<EOF
-#line 16581 "configure"
+#line 16841 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:16604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16864: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6
-echo "configure:16632: checking for dld in -lshl_load" >&5
+echo "configure:16892: 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
ac_save_LIBS="$LIBS"
LIBS="-lshl_load $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 16640 "configure"
+#line 16900 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dld()
; return 0; }
EOF
-if { (eval echo configure:16651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16911: \"$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
for ac_func in dlerror
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16690: checking for $ac_func" >&5
+echo "configure:16950: 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 <<EOF
-#line 16695 "configure"
+#line 16955 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:16718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16978: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6
-echo "configure:16743: checking for dlerror in -ldl" >&5
+echo "configure:17003: 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
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 16751 "configure"
+#line 17011 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dlerror()
; return 0; }
EOF
-if { (eval echo configure:16762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17022: \"$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 "$USE_WIN32" = 1; then
if test "$wxUSE_MS_HTML_HELP" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_MS_HTML_HELP 1
-EOF
-
ac_safe=`echo "htmlhelp.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for htmlhelp.h""... $ac_c" 1>&6
-echo "configure:16924: checking for htmlhelp.h" >&5
+echo "configure:17180: 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
-#line 16929 "configure"
+#line 17185 "configure"
#include "confdefs.h"
#include <htmlhelp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:16934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:17190: \"$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*
else
echo "$ac_t""no" 1>&6
- echo "configure: warning: MS HTML Help cannot be used without htmlhelp.h so it won't be compiled without it" 1>&2
+ echo "configure: warning: MS HTML Help cannot be used without htmlhelp.h, disabled" 1>&2
wxUSE_MS_HTML_HELP=no
fi
fi
-if test "$wxUSE_IPC" = "yes"; then
- if test "$wxUSE_SOCKETS" != "yes"; then
- echo "configure: warning: wxWindows IPC classes require sockets" 1>&2
- fi
-
- cat >> confdefs.h <<\EOF
-#define wxUSE_IPC 1
-EOF
-
-fi
-
-if test "$wxUSE_CLIPBOARD" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_CLIPBOARD 1
-EOF
-
- cat >> confdefs.h <<\EOF
-#define wxUSE_DATAOBJ 1
-EOF
-
-fi
-
-if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
- if test "$wxUSE_GTK" = 1; then
- if test "$WXGTK12" != 1; then
- echo "configure: warning: Drag and drop is only supported under GTK+ 1.2" 1>&2
- wxUSE_DRAG_AND_DROP=no
- fi
- fi
-
- if test "$wxUSE_MOTIF" = 1; then
- echo "configure: warning: Drag and drop is not yet supported under Motif" 1>&2
- wxUSE_DRAG_AND_DROP=no
- fi
-
- if test "$wxUSE_MAC" = 1; then
- echo "configure: warning: Drag and drop is not yet supported under Mac OS X" 1>&2
- wxUSE_DRAG_AND_DROP=no
- fi
-
- if test "$USE_WIN32" = 1; then
-
- for ac_hdr in ole2.h
+if test "$USE_WIN32" = 1; 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:17061: checking for $ac_hdr" >&5
+echo "configure:17276: 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
-#line 17066 "configure"
+#line 17281 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:17071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:17286: \"$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*
done
- if test "$ac_cv_header_ole2_h" = "yes" ; then
- if test "$GCC" = yes ; then
- ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
- ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"
- CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
- LIBS="$LIBS -lole32 -luuid"
- cat >> confdefs.h <<\EOF
+ if test "$ac_cv_header_ole2_h" = "yes" ; then
+ if test "$GCC" = yes ; then
+ ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
+ ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"
+ CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
+ LIBS="$LIBS -lrpcrt4 -loleaut32 -lole32 -luuid"
+ cat >> confdefs.h <<\EOF
#define wxUSE_OLE 1
EOF
- if test "$wxUSE_METAFILE" = "yes"; then
- cat >> confdefs.h <<\EOF
+ fi
+
+ cat >> confdefs.h <<\EOF
+#define wxUSE_DATAOBJ 1
+EOF
+
+ else
+ echo "configure: warning: Some features disabled because OLE headers not found" 1>&2
+
+ wxUSE_CLIPBOARD=no
+ wxUSE_DRAG_AND_DROP=no
+ wxUSE_DATAOBJ=no
+ fi
+
+ if test "$wxUSE_METAFILE" = "yes"; then
+ cat >> confdefs.h <<\EOF
#define wxUSE_METAFILE 1
EOF
- cat >> confdefs.h <<\EOF
+
+ cat >> confdefs.h <<\EOF
#define wxUSE_ENH_METAFILE 1
EOF
- fi
- fi
- else
- echo "configure: warning: Drag and drop disabled because OLE headers not found" 1>&2
+ fi
+fi
+
+if test "$wxUSE_IPC" = "yes"; then
+ if test "$wxUSE_SOCKETS" != "yes"; then
+ echo "configure: warning: wxWindows IPC classes require sockets" 1>&2
+ fi
+
+ cat >> confdefs.h <<\EOF
+#define wxUSE_IPC 1
+EOF
+
+fi
+
+if test "$wxUSE_CLIPBOARD" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_CLIPBOARD 1
+EOF
+
+
+ cat >> confdefs.h <<\EOF
+#define wxUSE_DATAOBJ 1
+EOF
+
+fi
+
+if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
+ if test "$wxUSE_GTK" = 1; then
+ if test "$WXGTK12" != 1; then
+ echo "configure: warning: Drag and drop is only supported under GTK+ 1.2" 1>&2
wxUSE_DRAG_AND_DROP=no
fi
fi
+ if test "$wxUSE_MOTIF" = 1; then
+ echo "configure: warning: Drag and drop is not yet supported under Motif" 1>&2
+ wxUSE_DRAG_AND_DROP=no
+ fi
+
+ if test "$wxUSE_MAC" = 1; then
+ echo "configure: warning: Drag and drop is not yet supported under Mac OS X" 1>&2
+ wxUSE_DRAG_AND_DROP=no
+ fi
+
if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_DRAG_AND_DROP 1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
fi
+if test "$wxUSE_PROPSHEET" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_PROPSHEET 1
+EOF
+
+ USES_CONTROLS=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS proplist"
+fi
+
if test "$wxUSE_RADIOBOX" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_RADIOBOX 1
fi
+if test "$wxUSE_TREELAYOUT" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_TREELAYOUT 1
+EOF
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelay"
+fi
if test "$wxUSE_DRAGIMAGE" = "yes"; then
cat >> confdefs.h <<\EOF
fi
+if test "$wxUSE_FINDREPLDLG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_FINDREPLDLG 1
+EOF
+
+fi
+
if test "$wxUSE_FONTDLG" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_FONTDLG 1
fi
fi
+if test "$wxUSE_SPLASH" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_SPLASH 1
+EOF
+
+fi
+
if test "$wxUSE_STARTUP_TIPS" = "yes"; then
if test "$wxUSE_CONSTRAINTS" != "yes"; then
echo "configure: warning: Startup tips requires constraints and won't be compiled without them" 1>&2
+if test "x$prefix" != "xNONE"; then
+ wxPREFIX=$prefix
+else
+ wxPREFIX=$ac_default_prefix
+fi
+
+cat >> confdefs.h <<EOF
+#define wxINSTALL_PREFIX "$wxPREFIX"
+EOF
+
+
+
GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK"
OPENGL_LIBS="$OPENGL_LINK"
if test "$wxUSE_GUI" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \
- drawing dynamic event font fractal image \
- minimal richedit widgets"
+ drawing dynamic erase event exec font image \
+ minimal richedit rotate widgets"
if test "$wxUSE_UNIVERSAL" = "yes" ; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS univ"
CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
else
- SAMPLES_SUBDIRS=""
+ SAMPLES_SUBDIRS="console"
fi
SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
+
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:17861: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:18170: 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
wx_cv_path_ifs=$PATH_IFS
wx_cv_program_ext=$PROGRAM_EXT
wx_cv_target_library=$WX_TARGET_LIBRARY
+ wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
export wx_cv_path_samplesubdirs wx_cv_path_ifs wx_cv_program_ext \
- wx_cv_target_library wx_cv_target_libtype
+ wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype
subdirs="demos samples utils contrib"
fi
s%@OPENGL_LIBS@%$OPENGL_LIBS%g
s%@EXTRADEFS@%$EXTRADEFS%g
s%@LD_LIBS@%$LD_LIBS%g
+s%@WXMSW_DLL_DEFINES@%$WXMSW_DLL_DEFINES%g
s%@RCINPUTSWITCH@%$RCINPUTSWITCH%g
s%@RCOUTPUTSWITCH@%$RCOUTPUTSWITCH%g
s%@RESPROGRAM@%$RESPROGRAM%g
projects / wxWidgets.git / blobdiff