X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7708a267207473783f88cae047b78adaecf83675..bf511d579fb186e8f5ec7a0dc933a5c0df10902d:/configure?ds=sidebyside diff --git a/configure b/configure index bf461cc66d..21816299f5 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in. +# From configure.in Id: configure.in 46713 2007-06-26 20:44:58Z VS . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # @@ -740,6 +740,7 @@ WX_LIB_FLAVOUR WXUNIV MONOLITHIC USE_PLUGINS +CXXWARNINGS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML @@ -940,6 +941,7 @@ COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 +COND_USE_GUI_1_USE_OPENGL_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN @@ -1638,6 +1640,7 @@ Optional Features: --enable-optimise create optimised code --enable-debug same as debug_flag and debug_info --enable-stl use STL for containers + --enable-extended_rtti use extended RTTI (XTI) --enable-omf use OMF object format --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!) --enable-debug_info create code with debugging information @@ -1654,6 +1657,7 @@ Optional Features: --enable-compat26 enable wxWidgets 2.6 compatibility --disable-compat28 disable wxWidgets 2.8 compatibility --disable-rpath disable use of rpath for uninstalled builds + --enable-objc_uniquifying enable Objective-C class name uniquifying --enable-intl use internationalization system --enable-config use wxConfig (and derived) classes --enable-protocols use wxProtocol and derived classes @@ -1687,6 +1691,8 @@ Optional Features: --enable-longlong use wxLongLong class --enable-mimetype use wxMimeTypesManager --enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only) + --enable-utf8 use UTF-8 representation for strings (Unix only) + --enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only) --enable-snglinst use wxSingleInstanceChecker class --enable-std_iostreams use standard C++ stream classes --enable-std_string use standard C++ string classes @@ -1698,7 +1704,7 @@ Optional Features: --enable-textbuf use wxTextBuffer class --enable-textfile use wxTextFile class --enable-timer use wxTimer class - --enable-unicode compile wxString with Unicode support + --enable-unicode compile without Unicode support --enable-sound use wxSound class --enable-mediactrl use wxMediaCtrl class --enable-gstreamer8 force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix @@ -1753,6 +1759,7 @@ Optional Features: --enable-dirpicker use wxDirPickerCtrl class --enable-display use wxDisplay class --enable-detect_sm use code to detect X11 session manager + --enable-editablebox use wxEditableListBox class --enable-filepicker use wxFilePickerCtrl class --enable-fontpicker use wxFontPickerCtrl class --enable-gauge use wxGauge class @@ -2899,6 +2906,7 @@ DEBUG_CONFIGURE=0 if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_UNIVERSAL=no DEFAULT_wxUSE_STL=no + DEFAULT_wxUSE_EXTENDED_RTTI=no DEFAULT_wxUSE_NANOX=no @@ -3065,6 +3073,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_DISPLAY=no DEFAULT_wxUSE_DETECT_SM=no DEFAULT_wxUSE_DIRPICKERCTRL=no + DEFAULT_wxUSE_EDITABLELISTBOX=no DEFAULT_wxUSE_FILEPICKERCTRL=no DEFAULT_wxUSE_FONTPICKERCTRL=no DEFAULT_wxUSE_GAUGE=no @@ -3103,8 +3112,10 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_POPUPWIN=no DEFAULT_wxUSE_TIPWINDOW=no - DEFAULT_wxUSE_UNICODE=no + DEFAULT_wxUSE_UNICODE=yes DEFAULT_wxUSE_UNICODE_MSLU=no + DEFAULT_wxUSE_UNICODE_UTF8=auto + DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no DEFAULT_wxUSE_WCSRTOMBS=no DEFAULT_wxUSE_PALETTE=no @@ -3124,6 +3135,7 @@ if test $DEBUG_CONFIGURE = 1; then else DEFAULT_wxUSE_UNIVERSAL=no DEFAULT_wxUSE_STL=no + DEFAULT_wxUSE_EXTENDED_RTTI=no DEFAULT_wxUSE_NANOX=no @@ -3289,6 +3301,7 @@ else DEFAULT_wxUSE_DISPLAY=yes DEFAULT_wxUSE_DETECT_SM=yes DEFAULT_wxUSE_DIRPICKERCTRL=yes + DEFAULT_wxUSE_EDITABLELISTBOX=yes DEFAULT_wxUSE_FILEPICKERCTRL=yes DEFAULT_wxUSE_FONTPICKERCTRL=yes DEFAULT_wxUSE_GAUGE=yes @@ -3327,8 +3340,10 @@ else DEFAULT_wxUSE_POPUPWIN=yes DEFAULT_wxUSE_TIPWINDOW=yes - DEFAULT_wxUSE_UNICODE=no + DEFAULT_wxUSE_UNICODE=yes DEFAULT_wxUSE_UNICODE_MSLU=yes + DEFAULT_wxUSE_UNICODE_UTF8=auto + DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no DEFAULT_wxUSE_WCSRTOMBS=no DEFAULT_wxUSE_PALETTE=yes @@ -3348,6 +3363,8 @@ else DEFAULT_wxUSE_GTK2=yes fi +DEFAULT_wxUSE_OBJC_UNIQUIFYING=no + @@ -3382,7 +3399,7 @@ if test "${enable_gui+set}" = set; then else - LINE=`grep "wxUSE_GUI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -3423,7 +3440,7 @@ if test "${enable_monolithic+set}" = set; then else - LINE=`grep "wxUSE_MONOLITHIC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -3464,7 +3481,7 @@ if test "${enable_plugins+set}" = set; then else - LINE=`grep "wxUSE_PLUGINS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -3506,7 +3523,7 @@ if test "${with_subdirs+set}" = set; then else - LINE=`grep "wxWITH_SUBDIRS" ${wx_arg_cache_file}` + LINE=`grep "^wxWITH_SUBDIRS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -3550,7 +3567,7 @@ if test "${enable_universal+set}" = set; then else - LINE=`grep "wxUSE_UNIVERSAL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -3657,7 +3674,7 @@ if test "${enable_nanox+set}" = set; then else - LINE=`grep "wxUSE_NANOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -3704,7 +3721,7 @@ if test "${enable_gpe+set}" = set; then else - LINE=`grep "wxUSE_GPE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -3754,7 +3771,7 @@ echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or else - LINE=`grep "wxUSE_LIBPNG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -3813,7 +3830,7 @@ echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, o else - LINE=`grep "wxUSE_LIBJPEG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -3872,7 +3889,7 @@ echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, o else - LINE=`grep "wxUSE_LIBTIFF" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -3931,7 +3948,7 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or else - LINE=`grep "wxUSE_LIBXPM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -3983,7 +4000,7 @@ if test "${with_libmspack+set}" = set; then else - LINE=`grep "wxUSE_LIBMSPACK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4025,7 +4042,7 @@ if test "${with_sdl+set}" = set; then else - LINE=`grep "wxUSE_LIBSDL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4067,7 +4084,7 @@ if test "${with_gnomeprint+set}" = set; then else - LINE=`grep "wxUSE_LIBGNOMEPRINT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4109,7 +4126,7 @@ if test "${with_gnomevfs+set}" = set; then else - LINE=`grep "wxUSE_LIBGNOMEVFS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4151,7 +4168,7 @@ if test "${with_hildon+set}" = set; then else - LINE=`grep "wxUSE_LIBHILDON" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4193,7 +4210,7 @@ if test "${with_opengl+set}" = set; then else - LINE=`grep "wxUSE_OPENGL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4247,7 +4264,7 @@ if test "${with_dmalloc+set}" = set; then else - LINE=`grep "wxUSE_DMALLOC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4296,7 +4313,7 @@ echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or else - LINE=`grep "wxUSE_REGEX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4355,7 +4372,7 @@ echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or b else - LINE=`grep "wxUSE_ZLIB" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4414,7 +4431,7 @@ echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or b else - LINE=`grep "wxUSE_ODBC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ODBC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4473,7 +4490,7 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or else - LINE=`grep "wxUSE_EXPAT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4526,7 +4543,7 @@ if test "${enable_shared+set}" = set; then else - LINE=`grep "wxUSE_SHARED" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4567,7 +4584,7 @@ if test "${enable_optimise+set}" = set; then else - LINE=`grep "wxUSE_OPTIMISE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4608,7 +4625,7 @@ if test "${enable_debug+set}" = set; then else - LINE=`grep "wxUSE_DEBUG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4649,7 +4666,7 @@ if test "${enable_stl+set}" = set; then else - LINE=`grep "wxUSE_STL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4674,6 +4691,47 @@ echo "${ECHO_T}yes" >&6; } echo "${ECHO_T}no" >&6; } fi + + enablestring= + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-extended_rtti" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-extended_rtti... $ECHO_C" >&6; } + no_cache=0 + # Check whether --enable-extended_rtti was given. +if test "${enable_extended_rtti+set}" = set; then + enableval=$enable_extended_rtti; + if test "$enableval" = yes; then + ac_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=yes' + else + ac_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no' + fi + +else + + LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI='$DEFAULT_wxUSE_EXTENDED_RTTI + +fi + + + eval "$ac_cv_use_extended_rtti" + if test "$no_cache" != 1; then + echo $ac_cv_use_extended_rtti >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_EXTENDED_RTTI" = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + fi + if test "$USE_OS2" = "1"; then DEFAULT_wxUSE_OMF=no @@ -4692,7 +4750,7 @@ if test "${enable_omf+set}" = set; then else - LINE=`grep "wxUSE_OMF" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4745,7 +4803,7 @@ if test "${enable_debug_flag+set}" = set; then else - LINE=`grep "wxUSE_DEBUG_FLAG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4786,7 +4844,7 @@ if test "${enable_debug_info+set}" = set; then else - LINE=`grep "wxUSE_DEBUG_INFO" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4827,7 +4885,7 @@ if test "${enable_debug_gdb+set}" = set; then else - LINE=`grep "wxUSE_DEBUG_GDB" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4868,7 +4926,7 @@ if test "${enable_debug_cntxt+set}" = set; then else - LINE=`grep "wxUSE_DEBUG_CONTEXT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4909,7 +4967,7 @@ if test "${enable_mem_tracing+set}" = set; then else - LINE=`grep "wxUSE_MEM_TRACING" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4950,7 +5008,7 @@ if test "${enable_profile+set}" = set; then else - LINE=`grep "wxUSE_PROFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -4991,7 +5049,7 @@ if test "${enable_no_rtti+set}" = set; then else - LINE=`grep "wxUSE_NO_RTTI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5032,7 +5090,7 @@ if test "${enable_no_exceptions+set}" = set; then else - LINE=`grep "wxUSE_NO_EXCEPTIONS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5073,7 +5131,7 @@ if test "${enable_permissive+set}" = set; then else - LINE=`grep "wxUSE_PERMISSIVE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5114,7 +5172,7 @@ if test "${enable_no_deps+set}" = set; then else - LINE=`grep "wxUSE_NO_DEPS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5155,7 +5213,7 @@ if test "${enable_vararg_macros+set}" = set; then else - LINE=`grep "wxUSE_VARARG_MACROS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5192,15 +5250,15 @@ if test "${enable_universal_binary+set}" = set; then else - LINE=`grep "wxUSE_UNIVERSAL_BINARY" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" - wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY else no_cache=1 - wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY=no" fi + wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY + fi @@ -5229,7 +5287,7 @@ if test "${enable_compat26+set}" = set; then else - LINE=`grep "WXWIN_COMPATIBILITY_2_6" ${wx_arg_cache_file}` + LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5270,7 +5328,7 @@ if test "${enable_compat28+set}" = set; then else - LINE=`grep "WXWIN_COMPATIBILITY_2_8" ${wx_arg_cache_file}` + LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5312,7 +5370,7 @@ if test "${enable_rpath+set}" = set; then else - LINE=`grep "wxUSE_RPATH" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5339,6 +5397,47 @@ echo "${ECHO_T}no" >&6; } + enablestring= + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-objc_uniquifying" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-objc_uniquifying... $ECHO_C" >&6; } + no_cache=0 + # Check whether --enable-objc_uniquifying was given. +if test "${enable_objc_uniquifying+set}" = set; then + enableval=$enable_objc_uniquifying; + if test "$enableval" = yes; then + ac_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=yes' + else + ac_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no' + fi + +else + + LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING='$DEFAULT_wxUSE_OBJC_UNIQUIFYING + +fi + + + eval "$ac_cv_use_objc_uniquifying" + if test "$no_cache" != 1; then + echo $ac_cv_use_objc_uniquifying >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_OBJC_UNIQUIFYING" = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + fi + + enablestring= @@ -5356,7 +5455,7 @@ if test "${enable_intl+set}" = set; then else - LINE=`grep "wxUSE_INTL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5397,7 +5496,7 @@ if test "${enable_config+set}" = set; then else - LINE=`grep "wxUSE_CONFIG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5439,7 +5538,7 @@ if test "${enable_protocols+set}" = set; then else - LINE=`grep "wxUSE_PROTOCOL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5480,7 +5579,7 @@ if test "${enable_ftp+set}" = set; then else - LINE=`grep "wxUSE_PROTOCOL_FTP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5521,7 +5620,7 @@ if test "${enable_http+set}" = set; then else - LINE=`grep "wxUSE_PROTOCOL_HTTP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5562,7 +5661,7 @@ if test "${enable_fileproto+set}" = set; then else - LINE=`grep "wxUSE_PROTOCOL_FILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5603,7 +5702,7 @@ if test "${enable_sockets+set}" = set; then else - LINE=`grep "wxUSE_SOCKETS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5644,7 +5743,7 @@ if test "${enable_ole+set}" = set; then else - LINE=`grep "wxUSE_OLE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5685,7 +5784,7 @@ if test "${enable_dataobj+set}" = set; then else - LINE=`grep "wxUSE_DATAOBJ" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5727,7 +5826,7 @@ if test "${enable_ipc+set}" = set; then else - LINE=`grep "wxUSE_IPC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5769,7 +5868,7 @@ if test "${enable_apple_ieee+set}" = set; then else - LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5810,7 +5909,7 @@ if test "${enable_arcstream+set}" = set; then else - LINE=`grep "wxUSE_ARCHIVE_STREAMS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5851,7 +5950,7 @@ if test "${enable_backtrace+set}" = set; then else - LINE=`grep "wxUSE_STACKWALKER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5892,7 +5991,7 @@ if test "${enable_catch_segvs+set}" = set; then else - LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5933,7 +6032,7 @@ if test "${enable_cmdline+set}" = set; then else - LINE=`grep "wxUSE_CMDLINE_PARSER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -5974,7 +6073,7 @@ if test "${enable_datetime+set}" = set; then else - LINE=`grep "wxUSE_DATETIME" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6015,7 +6114,7 @@ if test "${enable_debugreport+set}" = set; then else - LINE=`grep "wxUSE_DEBUGREPORT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6056,7 +6155,7 @@ if test "${enable_dialupman+set}" = set; then else - LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6097,7 +6196,7 @@ if test "${enable_dynlib+set}" = set; then else - LINE=`grep "wxUSE_DYNLIB_CLASS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6138,7 +6237,7 @@ if test "${enable_dynamicloader+set}" = set; then else - LINE=`grep "wxUSE_DYNAMIC_LOADER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6179,7 +6278,7 @@ if test "${enable_exceptions+set}" = set; then else - LINE=`grep "wxUSE_EXCEPTIONS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6220,7 +6319,7 @@ if test "${enable_ffile+set}" = set; then else - LINE=`grep "wxUSE_FFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6261,7 +6360,7 @@ if test "${enable_file+set}" = set; then else - LINE=`grep "wxUSE_FILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6302,7 +6401,7 @@ if test "${enable_filesystem+set}" = set; then else - LINE=`grep "wxUSE_FILESYSTEM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6343,7 +6442,7 @@ if test "${enable_fontmap+set}" = set; then else - LINE=`grep "wxUSE_FONTMAP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6384,7 +6483,7 @@ if test "${enable_fs_archive+set}" = set; then else - LINE=`grep "wxUSE_FS_ARCHIVE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6425,7 +6524,7 @@ if test "${enable_fs_inet+set}" = set; then else - LINE=`grep "wxUSE_FS_INET" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6466,7 +6565,7 @@ if test "${enable_fs_zip+set}" = set; then else - LINE=`grep "wxUSE_FS_ZIP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6507,7 +6606,7 @@ if test "${enable_geometry+set}" = set; then else - LINE=`grep "wxUSE_GEOMETRY" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6548,7 +6647,7 @@ if test "${enable_log+set}" = set; then else - LINE=`grep "wxUSE_LOG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6589,7 +6688,7 @@ if test "${enable_longlong+set}" = set; then else - LINE=`grep "wxUSE_LONGLONG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6630,7 +6729,7 @@ if test "${enable_mimetype+set}" = set; then else - LINE=`grep "wxUSE_MIMETYPE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6671,7 +6770,7 @@ if test "${enable_mslu+set}" = set; then else - LINE=`grep "wxUSE_UNICODE_MSLU" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6697,6 +6796,79 @@ echo "${ECHO_T}no" >&6; } fi + enablestring= + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-utf8... $ECHO_C" >&6; } + no_cache=0 + # Check whether --enable-utf8 was given. +if test "${enable_utf8+set}" = set; then + enableval=$enable_utf8; + wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'" + +else + + LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8 + +fi + + + eval "$wx_cv_use_utf8" + if test "$no_cache" != 1; then + echo $wx_cv_use_utf8 >> ${wx_arg_cache_file}.tmp + fi + + { echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5 +echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; } + + + enablestring= + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8only" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-utf8only... $ECHO_C" >&6; } + no_cache=0 + # Check whether --enable-utf8only was given. +if test "${enable_utf8only+set}" = set; then + enableval=$enable_utf8only; + if test "$enableval" = yes; then + ac_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=yes' + else + ac_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no' + fi + +else + + LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE='$DEFAULT_wxUSE_UNICODE_UTF8_LOCALE + +fi + + + eval "$ac_cv_use_utf8only" + if test "$no_cache" != 1; then + echo $ac_cv_use_utf8only >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_UNICODE_UTF8_LOCALE" = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + fi + + enablestring= { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-snglinst" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6; } @@ -6712,7 +6884,7 @@ if test "${enable_snglinst+set}" = set; then else - LINE=`grep "wxUSE_SNGLINST_CHECKER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6753,7 +6925,7 @@ if test "${enable_std_iostreams+set}" = set; then else - LINE=`grep "wxUSE_STD_IOSTREAM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6794,7 +6966,7 @@ if test "${enable_std_string+set}" = set; then else - LINE=`grep "wxUSE_STD_STRING" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6835,7 +7007,7 @@ if test "${enable_stdpaths+set}" = set; then else - LINE=`grep "wxUSE_STDPATHS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6876,7 +7048,7 @@ if test "${enable_stopwatch+set}" = set; then else - LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6917,7 +7089,7 @@ if test "${enable_streams+set}" = set; then else - LINE=`grep "wxUSE_STREAMS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6958,7 +7130,7 @@ if test "${enable_system_options+set}" = set; then else - LINE=`grep "wxUSE_SYSTEM_OPTIONS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -6999,7 +7171,7 @@ if test "${enable_tarstream+set}" = set; then else - LINE=`grep "wxUSE_TARSTREAM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7040,7 +7212,7 @@ if test "${enable_textbuf+set}" = set; then else - LINE=`grep "wxUSE_TEXTBUFFER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7081,7 +7253,7 @@ if test "${enable_textfile+set}" = set; then else - LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7122,7 +7294,7 @@ if test "${enable_timer+set}" = set; then else - LINE=`grep "wxUSE_TIMER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7163,7 +7335,7 @@ if test "${enable_unicode+set}" = set; then else - LINE=`grep "wxUSE_UNICODE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7204,7 +7376,7 @@ if test "${enable_sound+set}" = set; then else - LINE=`grep "wxUSE_SOUND" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7245,7 +7417,7 @@ if test "${enable_mediactrl+set}" = set; then else - LINE=`grep "wxUSE_MEDIACTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7286,7 +7458,7 @@ if test "${enable_gstreamer8+set}" = set; then else - LINE=`grep "wxUSE_GSTREAMER8" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7327,7 +7499,7 @@ if test "${enable_printfposparam+set}" = set; then else - LINE=`grep "wxUSE_PRINTF_POS_PARAMS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7368,7 +7540,7 @@ if test "${enable_zipstream+set}" = set; then else - LINE=`grep "wxUSE_ZIPSTREAM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7410,7 +7582,7 @@ if test "${enable_url+set}" = set; then else - LINE=`grep "wxUSE_URL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7451,7 +7623,7 @@ if test "${enable_variant+set}" = set; then else - LINE=`grep "wxUSE_VARIANT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7492,7 +7664,7 @@ if test "${enable_protocol+set}" = set; then else - LINE=`grep "wxUSE_PROTOCOL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7533,7 +7705,7 @@ if test "${enable_protocol_http+set}" = set; then else - LINE=`grep "wxUSE_PROTOCOL_HTTP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7574,7 +7746,7 @@ if test "${enable_protocol_ftp+set}" = set; then else - LINE=`grep "wxUSE_PROTOCOL_FTP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7615,7 +7787,7 @@ if test "${enable_protocol_file+set}" = set; then else - LINE=`grep "wxUSE_PROTOCOL_FILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7659,7 +7831,7 @@ if test "${enable_threads+set}" = set; then else - LINE=`grep "wxUSE_THREADS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7704,7 +7876,7 @@ if test "${enable_docview+set}" = set; then else - LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7745,7 +7917,7 @@ if test "${enable_help+set}" = set; then else - LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7786,7 +7958,7 @@ if test "${enable_mshtmlhelp+set}" = set; then else - LINE=`grep "wxUSE_MS_HTML_HELP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7827,7 +7999,7 @@ if test "${enable_html+set}" = set; then else - LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7868,7 +8040,7 @@ if test "${enable_htmlhelp+set}" = set; then else - LINE=`grep "wxUSE_WXHTML_HELP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7909,7 +8081,7 @@ if test "${enable_xrc+set}" = set; then else - LINE=`grep "wxUSE_XRC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7950,7 +8122,7 @@ if test "${enable_aui+set}" = set; then else - LINE=`grep "wxUSE_AUI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -7991,7 +8163,7 @@ if test "${enable_stc+set}" = set; then else - LINE=`grep "wxUSE_STC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8032,7 +8204,7 @@ if test "${enable_constraints+set}" = set; then else - LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8073,7 +8245,7 @@ if test "${enable_printarch+set}" = set; then else - LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8114,7 +8286,7 @@ if test "${enable_mdi+set}" = set; then else - LINE=`grep "wxUSE_MDI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8155,7 +8327,7 @@ if test "${enable_mdidoc+set}" = set; then else - LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8196,7 +8368,7 @@ if test "${enable_loggui+set}" = set; then else - LINE=`grep "wxUSE_LOGGUI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8237,7 +8409,7 @@ if test "${enable_logwin+set}" = set; then else - LINE=`grep "wxUSE_LOGWINDOW" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8278,7 +8450,7 @@ if test "${enable_logdialog+set}" = set; then else - LINE=`grep "wxUSE_LOGDIALOG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8319,7 +8491,7 @@ if test "${enable_webkit+set}" = set; then else - LINE=`grep "wxUSE_WEBKIT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8360,7 +8532,7 @@ if test "${enable_richtext+set}" = set; then else - LINE=`grep "wxUSE_RICHTEXT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8401,7 +8573,7 @@ if test "${enable_graphics_ctx+set}" = set; then else - LINE=`grep "wxUSE_GRAPHICS_CONTEXT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8443,7 +8615,7 @@ if test "${enable_postscript+set}" = set; then else - LINE=`grep "wxUSE_POSTSCRIPT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8487,7 +8659,7 @@ if test "${enable_clipboard+set}" = set; then else - LINE=`grep "wxUSE_CLIPBOARD" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8528,7 +8700,7 @@ if test "${enable_dnd+set}" = set; then else - LINE=`grep "wxUSE_DRAG_AND_DROP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8569,7 +8741,7 @@ if test "${enable_metafile+set}" = set; then else - LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8613,7 +8785,7 @@ if test "${enable_controls+set}" = set; then else - LINE=`grep "wxUSE_CONTROLS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8763,7 +8935,7 @@ if test "${enable_accel+set}" = set; then else - LINE=`grep "wxUSE_ACCEL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8804,7 +8976,7 @@ if test "${enable_animatectrl+set}" = set; then else - LINE=`grep "wxUSE_ANIMATIONCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8845,7 +9017,7 @@ if test "${enable_button+set}" = set; then else - LINE=`grep "wxUSE_BUTTON" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8886,7 +9058,7 @@ if test "${enable_bmpbutton+set}" = set; then else - LINE=`grep "wxUSE_BMPBUTTON" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8927,7 +9099,7 @@ if test "${enable_bmpcombobox+set}" = set; then else - LINE=`grep "wxUSE_BITMAPCOMBOBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -8968,7 +9140,7 @@ if test "${enable_calendar+set}" = set; then else - LINE=`grep "wxUSE_CALCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9009,7 +9181,7 @@ if test "${enable_caret+set}" = set; then else - LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9050,7 +9222,7 @@ if test "${enable_checkbox+set}" = set; then else - LINE=`grep "wxUSE_CHECKBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9091,7 +9263,7 @@ if test "${enable_checklst+set}" = set; then else - LINE=`grep "wxUSE_CHECKLST" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9132,7 +9304,7 @@ if test "${enable_choice+set}" = set; then else - LINE=`grep "wxUSE_CHOICE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9173,7 +9345,7 @@ if test "${enable_choicebook+set}" = set; then else - LINE=`grep "wxUSE_CHOICEBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9214,7 +9386,7 @@ if test "${enable_collpane+set}" = set; then else - LINE=`grep "wxUSE_COLLPANE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9255,7 +9427,7 @@ if test "${enable_colourpicker+set}" = set; then else - LINE=`grep "wxUSE_COLOURPICKERCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9296,7 +9468,7 @@ if test "${enable_combobox+set}" = set; then else - LINE=`grep "wxUSE_COMBOBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9337,7 +9509,7 @@ if test "${enable_comboctrl+set}" = set; then else - LINE=`grep "wxUSE_COMBOCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9378,7 +9550,7 @@ if test "${enable_datepick+set}" = set; then else - LINE=`grep "wxUSE_DATEPICKCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9419,7 +9591,7 @@ if test "${enable_dirpicker+set}" = set; then else - LINE=`grep "wxUSE_DIRPICKERCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9460,7 +9632,7 @@ if test "${enable_display+set}" = set; then else - LINE=`grep "wxUSE_DISPLAY" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9501,7 +9673,7 @@ if test "${enable_detect_sm+set}" = set; then else - LINE=`grep "wxUSE_DETECT_SM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9527,6 +9699,47 @@ echo "${ECHO_T}no" >&6; } fi + enablestring= + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-editablebox" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-editablebox... $ECHO_C" >&6; } + no_cache=0 + # Check whether --enable-editablebox was given. +if test "${enable_editablebox+set}" = set; then + enableval=$enable_editablebox; + if test "$enableval" = yes; then + ac_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes' + else + ac_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no' + fi + +else + + LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_editablebox='wxUSE_EDITABLELISTBOX='$DEFAULT_wxUSE_EDITABLELISTBOX + +fi + + + eval "$ac_cv_use_editablebox" + if test "$no_cache" != 1; then + echo $ac_cv_use_editablebox >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_EDITABLELISTBOX" = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + fi + + enablestring= { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6; } @@ -9542,7 +9755,7 @@ if test "${enable_filepicker+set}" = set; then else - LINE=`grep "wxUSE_FILEPICKERCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9583,7 +9796,7 @@ if test "${enable_fontpicker+set}" = set; then else - LINE=`grep "wxUSE_FONTPICKERCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9624,7 +9837,7 @@ if test "${enable_gauge+set}" = set; then else - LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9665,7 +9878,7 @@ if test "${enable_grid+set}" = set; then else - LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9706,7 +9919,7 @@ if test "${enable_dataviewctrl+set}" = set; then else - LINE=`grep "wxUSE_DATAVIEWCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9747,7 +9960,7 @@ if test "${enable_hyperlink+set}" = set; then else - LINE=`grep "wxUSE_HYPERLINKCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9788,7 +10001,7 @@ if test "${enable_imaglist+set}" = set; then else - LINE=`grep "wxUSE_IMAGLIST" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9829,7 +10042,7 @@ if test "${enable_listbook+set}" = set; then else - LINE=`grep "wxUSE_LISTBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9870,7 +10083,7 @@ if test "${enable_listbox+set}" = set; then else - LINE=`grep "wxUSE_LISTBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9911,7 +10124,7 @@ if test "${enable_listctrl+set}" = set; then else - LINE=`grep "wxUSE_LISTCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9952,7 +10165,7 @@ if test "${enable_notebook+set}" = set; then else - LINE=`grep "wxUSE_NOTEBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -9993,7 +10206,7 @@ if test "${enable_odcombobox+set}" = set; then else - LINE=`grep "wxUSE_ODCOMBOBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10034,7 +10247,7 @@ if test "${enable_radiobox+set}" = set; then else - LINE=`grep "wxUSE_RADIOBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10075,7 +10288,7 @@ if test "${enable_radiobtn+set}" = set; then else - LINE=`grep "wxUSE_RADIOBTN" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10116,7 +10329,7 @@ if test "${enable_sash+set}" = set; then else - LINE=`grep "wxUSE_SASH" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10157,7 +10370,7 @@ if test "${enable_scrollbar+set}" = set; then else - LINE=`grep "wxUSE_SCROLLBAR" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10198,7 +10411,7 @@ if test "${enable_searchctrl+set}" = set; then else - LINE=`grep "wxUSE_SEARCHCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10239,7 +10452,7 @@ if test "${enable_slider+set}" = set; then else - LINE=`grep "wxUSE_SLIDER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10280,7 +10493,7 @@ if test "${enable_spinbtn+set}" = set; then else - LINE=`grep "wxUSE_SPINBTN" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10321,7 +10534,7 @@ if test "${enable_spinctrl+set}" = set; then else - LINE=`grep "wxUSE_SPINCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10362,7 +10575,7 @@ if test "${enable_splitter+set}" = set; then else - LINE=`grep "wxUSE_SPLITTER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10403,7 +10616,7 @@ if test "${enable_statbmp+set}" = set; then else - LINE=`grep "wxUSE_STATBMP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10444,7 +10657,7 @@ if test "${enable_statbox+set}" = set; then else - LINE=`grep "wxUSE_STATBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10485,7 +10698,7 @@ if test "${enable_statline+set}" = set; then else - LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10526,7 +10739,7 @@ if test "${enable_stattext+set}" = set; then else - LINE=`grep "wxUSE_STATTEXT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10567,7 +10780,7 @@ if test "${enable_statusbar+set}" = set; then else - LINE=`grep "wxUSE_STATUSBAR" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10608,7 +10821,7 @@ if test "${enable_tabdialog+set}" = set; then else - LINE=`grep "wxUSE_TAB_DIALOG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10649,7 +10862,7 @@ if test "${enable_textctrl+set}" = set; then else - LINE=`grep "wxUSE_TEXTCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10690,7 +10903,7 @@ if test "${enable_togglebtn+set}" = set; then else - LINE=`grep "wxUSE_TOGGLEBTN" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10731,7 +10944,7 @@ if test "${enable_toolbar+set}" = set; then else - LINE=`grep "wxUSE_TOOLBAR" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10772,7 +10985,7 @@ if test "${enable_tbarnative+set}" = set; then else - LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10813,7 +11026,7 @@ if test "${enable_treebook+set}" = set; then else - LINE=`grep "wxUSE_TREEBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10854,7 +11067,7 @@ if test "${enable_toolbook+set}" = set; then else - LINE=`grep "wxUSE_TOOLBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10895,7 +11108,7 @@ if test "${enable_treectrl+set}" = set; then else - LINE=`grep "wxUSE_TREECTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10936,7 +11149,7 @@ if test "${enable_tipwindow+set}" = set; then else - LINE=`grep "wxUSE_TIPWINDOW" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -10977,7 +11190,7 @@ if test "${enable_popupwin+set}" = set; then else - LINE=`grep "wxUSE_POPUPWIN" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11020,7 +11233,7 @@ if test "${enable_commondlg+set}" = set; then else - LINE=`grep "wxUSE_COMMONDLGS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11061,7 +11274,7 @@ if test "${enable_aboutdlg+set}" = set; then else - LINE=`grep "wxUSE_ABOUTDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11102,7 +11315,7 @@ if test "${enable_choicedlg+set}" = set; then else - LINE=`grep "wxUSE_CHOICEDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11143,7 +11356,7 @@ if test "${enable_coldlg+set}" = set; then else - LINE=`grep "wxUSE_COLOURDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11184,7 +11397,7 @@ if test "${enable_filedlg+set}" = set; then else - LINE=`grep "wxUSE_FILEDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11225,7 +11438,7 @@ if test "${enable_finddlg+set}" = set; then else - LINE=`grep "wxUSE_FINDREPLDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11266,7 +11479,7 @@ if test "${enable_fontdlg+set}" = set; then else - LINE=`grep "wxUSE_FONTDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11307,7 +11520,7 @@ if test "${enable_dirdlg+set}" = set; then else - LINE=`grep "wxUSE_DIRDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11348,7 +11561,7 @@ if test "${enable_msgdlg+set}" = set; then else - LINE=`grep "wxUSE_MSGDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11389,7 +11602,7 @@ if test "${enable_numberdlg+set}" = set; then else - LINE=`grep "wxUSE_NUMBERDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11430,7 +11643,7 @@ if test "${enable_splash+set}" = set; then else - LINE=`grep "wxUSE_SPLASH" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11471,7 +11684,7 @@ if test "${enable_textdlg+set}" = set; then else - LINE=`grep "wxUSE_TEXTDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11512,7 +11725,7 @@ if test "${enable_tipdlg+set}" = set; then else - LINE=`grep "wxUSE_STARTUP_TIPS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11553,7 +11766,7 @@ if test "${enable_progressdlg+set}" = set; then else - LINE=`grep "wxUSE_PROGRESSDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11594,7 +11807,7 @@ if test "${enable_wizarddlg+set}" = set; then else - LINE=`grep "wxUSE_WIZARDDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11637,7 +11850,7 @@ if test "${enable_menus+set}" = set; then else - LINE=`grep "wxUSE_MENUS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11678,7 +11891,7 @@ if test "${enable_miniframe+set}" = set; then else - LINE=`grep "wxUSE_MINIFRAME" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11719,7 +11932,7 @@ if test "${enable_tooltips+set}" = set; then else - LINE=`grep "wxUSE_TOOLTIPS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11760,7 +11973,7 @@ if test "${enable_splines+set}" = set; then else - LINE=`grep "wxUSE_SPLINES" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11801,7 +12014,7 @@ if test "${enable_mousewheel+set}" = set; then else - LINE=`grep "wxUSE_MOUSEWHEEL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11842,7 +12055,7 @@ if test "${enable_validators+set}" = set; then else - LINE=`grep "wxUSE_VALIDATORS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11883,7 +12096,7 @@ if test "${enable_busyinfo+set}" = set; then else - LINE=`grep "wxUSE_BUSYINFO" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11924,7 +12137,7 @@ if test "${enable_joystick+set}" = set; then else - LINE=`grep "wxUSE_JOYSTICK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -11965,7 +12178,7 @@ if test "${enable_metafile+set}" = set; then else - LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -12006,7 +12219,7 @@ if test "${enable_dragimage+set}" = set; then else - LINE=`grep "wxUSE_DRAGIMAGE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -12047,7 +12260,7 @@ if test "${enable_accessibility+set}" = set; then else - LINE=`grep "wxUSE_ACCESSIBILITY" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -12090,7 +12303,7 @@ if test "${enable_dccache+set}" = set; then else - LINE=`grep "wxUSE_DC_CACHEING" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -12134,7 +12347,7 @@ if test "${enable_palette+set}" = set; then else - LINE=`grep "wxUSE_PALETTE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -12175,7 +12388,7 @@ if test "${enable_image+set}" = set; then else - LINE=`grep "wxUSE_IMAGE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -12216,7 +12429,7 @@ if test "${enable_gif+set}" = set; then else - LINE=`grep "wxUSE_GIF" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -12257,7 +12470,7 @@ if test "${enable_pcx+set}" = set; then else - LINE=`grep "wxUSE_PCX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -12298,7 +12511,7 @@ if test "${enable_tga+set}" = set; then else - LINE=`grep "wxUSE_TGA" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -12339,7 +12552,7 @@ if test "${enable_iff+set}" = set; then else - LINE=`grep "wxUSE_IFF" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -12380,7 +12593,7 @@ if test "${enable_pnm+set}" = set; then else - LINE=`grep "wxUSE_PNM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -12421,7 +12634,7 @@ if test "${enable_xpm+set}" = set; then else - LINE=`grep "wxUSE_XPM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -12462,7 +12675,7 @@ if test "${enable_ico_cur+set}" = set; then else - LINE=`grep "wxUSE_ICO_CUR" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -12515,7 +12728,7 @@ if test "${enable_official_build+set}" = set; then else - LINE=`grep "wxUSE_OFFICIAL_BUILD" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else @@ -13669,6 +13882,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -13731,17 +13945,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER" >&5 echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER" >&6; } + if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then + :; INTELCC=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then - :; INTELCC=yes - else - :; - fi + if test "x$GCC" != "xyes"; then @@ -13965,15 +14180,17 @@ fi case `uname -s` in AIX*) - ac_ext=c + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5 + { echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5 echo $ECHO_N "checking whether we are using the IBM xlC C compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_c_compiler_xlc+set}" = set; then +if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -13986,9 +14203,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __xlC__ - choke me -#endif + + #ifndef __xlC__ + choke me + #endif ; return 0; @@ -14011,110 +14229,48 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - bakefile_compiler_xlc=yes + bakefile_cv_c_compiler___xlC__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - bakefile_compiler_xlc=no + bakefile_cv_c_compiler___xlC__=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_c_compiler_xlc=$bakefile_compiler_xlc -fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_xlc" >&5 -echo "${ECHO_T}$bakefile_cv_c_compiler_xlc" >&6; } -XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes` -ac_ext=c +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___xlC__" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler___xlC__" >&6; } + if test "x$bakefile_cv_c_compiler___xlC__" = "xyes"; then + :; XLCC=yes + else + :; + fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + ;; Darwin) - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -{ echo "$as_me:$LINENO: checking whether we are using the Metrowerks C compiler" >&5 -echo $ECHO_N "checking whether we are using the Metrowerks C compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_c_compiler_mwerks+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __MWERKS__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - bakefile_compiler_mwerks=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - bakefile_compiler_mwerks=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_c_compiler_mwerks=$bakefile_compiler_mwerks - -fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_mwerks" >&5 -echo "${ECHO_T}$bakefile_cv_c_compiler_mwerks" >&6; } - -MWCC=`test $bakefile_cv_c_compiler_mwerks = yes && echo yes` -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_ext=c + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5 -echo $ECHO_N "checking whether we are using the IBM xlC C compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_c_compiler_xlc+set}" = set; then + { echo "$as_me:$LINENO: checking whether we are using the Metrowerks C compiler" >&5 +echo $ECHO_N "checking whether we are using the Metrowerks C compiler... $ECHO_C" >&6; } +if test "${bakefile_cv_c_compiler___MWERKS__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14127,9 +14283,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __xlC__ - choke me -#endif + + #ifndef __MWERKS__ + choke me + #endif ; return 0; @@ -14152,32 +14309,34 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - bakefile_compiler_xlc=yes + bakefile_cv_c_compiler___MWERKS__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - bakefile_compiler_xlc=no + bakefile_cv_c_compiler___MWERKS__=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_c_compiler_xlc=$bakefile_compiler_xlc -fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_xlc" >&5 -echo "${ECHO_T}$bakefile_cv_c_compiler_xlc" >&6; } -XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes` -ac_ext=c +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___MWERKS__" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler___MWERKS__" >&6; } + if test "x$bakefile_cv_c_compiler___MWERKS__" = "xyes"; then + :; MWCC=yes + else + :; + fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - ;; - IRIX*) ac_ext=c @@ -14186,9 +14345,9 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - { echo "$as_me:$LINENO: checking whether we are using the SGI C compiler" >&5 -echo $ECHO_N "checking whether we are using the SGI C compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_c_compiler__SGI_COMPILER_VERSION+set}" = set; then + { echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5 +echo $ECHO_N "checking whether we are using the IBM xlC C compiler... $ECHO_C" >&6; } +if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14202,7 +14361,7 @@ int main () { - #ifndef _SGI_COMPILER_VERSION + #ifndef __xlC__ choke me #endif @@ -14227,12 +14386,12 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - bakefile_cv_c_compiler__SGI_COMPILER_VERSION=yes + bakefile_cv_c_compiler___xlC__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - bakefile_cv_c_compiler__SGI_COMPILER_VERSION=no + bakefile_cv_c_compiler___xlC__=no fi @@ -14240,24 +14399,24 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&5 -echo "${ECHO_T}$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&6; } +{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___xlC__" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler___xlC__" >&6; } + if test "x$bakefile_cv_c_compiler___xlC__" = "xyes"; then + :; XLCC=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then - :; SGICC=yes - else - :; - fi ;; - HP-UX*) + IRIX*) ac_ext=c @@ -14266,9 +14425,9 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - { echo "$as_me:$LINENO: checking whether we are using the HP C compiler" >&5 -echo $ECHO_N "checking whether we are using the HP C compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_c_compiler___HP_cc+set}" = set; then + { echo "$as_me:$LINENO: checking whether we are using the SGI C compiler" >&5 +echo $ECHO_N "checking whether we are using the SGI C compiler... $ECHO_C" >&6; } +if test "${bakefile_cv_c_compiler__SGI_COMPILER_VERSION+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14282,7 +14441,7 @@ int main () { - #ifndef __HP_cc + #ifndef _SGI_COMPILER_VERSION choke me #endif @@ -14307,12 +14466,12 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - bakefile_cv_c_compiler___HP_cc=yes + bakefile_cv_c_compiler__SGI_COMPILER_VERSION=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - bakefile_cv_c_compiler___HP_cc=no + bakefile_cv_c_compiler__SGI_COMPILER_VERSION=no fi @@ -14320,19 +14479,179 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___HP_cc" >&5 -echo "${ECHO_T}$bakefile_cv_c_compiler___HP_cc" >&6; } +{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&6; } + if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then + :; SGICC=yes + else + :; + fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + ;; + + Linux*) + + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + { echo "$as_me:$LINENO: checking whether we are using the Sun C compiler" >&5 +echo $ECHO_N "checking whether we are using the Sun C compiler... $ECHO_C" >&6; } +if test "${bakefile_cv_c_compiler___SUNPRO_C+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + #ifndef __SUNPRO_C + choke me + #endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + bakefile_cv_c_compiler___SUNPRO_C=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + bakefile_cv_c_compiler___SUNPRO_C=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6; } + if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then + :; SUNCC=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + ;; + + HP-UX*) + + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + { echo "$as_me:$LINENO: checking whether we are using the HP C compiler" >&5 +echo $ECHO_N "checking whether we are using the HP C compiler... $ECHO_C" >&6; } +if test "${bakefile_cv_c_compiler___HP_cc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + #ifndef __HP_cc + choke me + #endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + bakefile_cv_c_compiler___HP_cc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + bakefile_cv_c_compiler___HP_cc=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___HP_cc" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler___HP_cc" >&6; } if test "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then :; HPCC=yes else :; fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + ;; @@ -14402,17 +14721,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___DECC" >&5 echo "${ECHO_T}$bakefile_cv_c_compiler___DECC" >&6; } + if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then + :; COMPAQCC=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then - :; COMPAQCC=yes - else - :; - fi ;; @@ -14482,17 +14801,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5 echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6; } + if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then + :; SUNCC=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then - :; SUNCC=yes - else - :; - fi ;; @@ -15315,6 +15634,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -15377,17 +15697,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5 echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER" >&6; } + if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER" = "xyes"; then + :; INTELCXX=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then - :; INTELCXX=yes - else - :; - fi + if test "x$GCXX" != "xyes"; then @@ -15611,87 +15932,17 @@ fi case `uname -s` in AIX*) - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the IBM xlC C++ compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_cxx_compiler_xlc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __xlC__ - choke me -#endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - bakefile_compiler_xlc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - bakefile_compiler_xlc=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_cxx_compiler_xlc=$bakefile_compiler_xlc - -fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler_xlc" >&5 -echo "${ECHO_T}$bakefile_cv_cxx_compiler_xlc" >&6; } - -XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes` -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - ;; - - Darwin) - ac_ext=cpp + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ echo "$as_me:$LINENO: checking whether we are using the Metrowerks C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the Metrowerks C++ compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_cxx_compiler_mwerks+set}" = set; then + { echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the IBM xlC C++ compiler... $ECHO_C" >&6; } +if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -15704,9 +15955,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __MWERKS__ - choke me -#endif + + #ifndef __xlC__ + choke me + #endif ; return 0; @@ -15729,38 +15981,125 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - bakefile_compiler_mwerks=yes + bakefile_cv_cxx_compiler___xlC__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - bakefile_compiler_mwerks=no + bakefile_cv_cxx_compiler___xlC__=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_cxx_compiler_mwerks=$bakefile_compiler_mwerks + fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler_mwerks" >&5 -echo "${ECHO_T}$bakefile_cv_cxx_compiler_mwerks" >&6; } +{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___xlC__" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___xlC__" >&6; } + if test "x$bakefile_cv_cxx_compiler___xlC__" = "xyes"; then + :; XLCXX=yes + else + :; + fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -MWCXX=`test $bakefile_cv_cxx_compiler_mwerks = yes && echo yes` -ac_ext=c + + + ;; + + Darwin) + + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + { echo "$as_me:$LINENO: checking whether we are using the Metrowerks C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the Metrowerks C++ compiler... $ECHO_C" >&6; } +if test "${bakefile_cv_cxx_compiler___MWERKS__+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + #ifndef __MWERKS__ + choke me + #endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + bakefile_cv_cxx_compiler___MWERKS__=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + bakefile_cv_cxx_compiler___MWERKS__=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___MWERKS__" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___MWERKS__" >&6; } + if test "x$bakefile_cv_cxx_compiler___MWERKS__" = "xyes"; then + :; MWCXX=yes + else + :; + fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_ext=cpp + + + + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5 + { echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5 echo $ECHO_N "checking whether we are using the IBM xlC C++ compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_cxx_compiler_xlc+set}" = set; then +if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -15773,9 +16112,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __xlC__ - choke me -#endif + + #ifndef __xlC__ + choke me + #endif ; return 0; @@ -15798,29 +16138,34 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - bakefile_compiler_xlc=yes + bakefile_cv_cxx_compiler___xlC__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - bakefile_compiler_xlc=no + bakefile_cv_cxx_compiler___xlC__=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_cxx_compiler_xlc=$bakefile_compiler_xlc -fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler_xlc" >&5 -echo "${ECHO_T}$bakefile_cv_cxx_compiler_xlc" >&6; } -XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes` -ac_ext=c +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___xlC__" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___xlC__" >&6; } + if test "x$bakefile_cv_cxx_compiler___xlC__" = "xyes"; then + :; XLCXX=yes + else + :; + fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + ;; IRIX*) @@ -15888,17 +16233,97 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&5 echo "${ECHO_T}$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&6; } + if test "x$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" = "xyes"; then + :; SGICXX=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then - :; SGICXX=yes + + + ;; + + Linux*) + + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + { echo "$as_me:$LINENO: checking whether we are using the Sun C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the Sun C++ compiler... $ECHO_C" >&6; } +if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + #ifndef __SUNPRO_CC + choke me + #endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + bakefile_cv_cxx_compiler___SUNPRO_CC=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + bakefile_cv_cxx_compiler___SUNPRO_CC=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; } + if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then + :; SUNCXX=yes else :; fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + ;; @@ -15968,17 +16393,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___HP_aCC" >&5 echo "${ECHO_T}$bakefile_cv_cxx_compiler___HP_aCC" >&6; } + if test "x$bakefile_cv_cxx_compiler___HP_aCC" = "xyes"; then + :; HPCXX=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler___HP_aCC" = "xyes"; then - :; HPCXX=yes - else - :; - fi ;; @@ -16048,17 +16473,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___DECCXX" >&5 echo "${ECHO_T}$bakefile_cv_cxx_compiler___DECCXX" >&6; } + if test "x$bakefile_cv_cxx_compiler___DECCXX" = "xyes"; then + :; COMPAQCXX=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler___DECCXX" = "xyes"; then - :; COMPAQCXX=yes - else - :; - fi ;; @@ -16128,17 +16553,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5 echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; } + if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then + :; SUNCXX=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler___SUNPRO_CC" = "xyes"; then - :; SUNCXX=yes - else - :; - fi ;; @@ -16147,6 +16572,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test "$CXX" = "g++" -a "$GXX" != "yes"; then + { { echo "$as_me:$LINENO: error: C++ compiler is needed to build wxWidgets" >&5 +echo "$as_me: error: C++ compiler is needed to build wxWidgets" >&2;} + { (exit 1); exit 1; }; } +fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -17951,6 +18382,152 @@ echo "${ECHO_T}$ac_cv_header_sys_select_h" >&6; } fi +for ac_header in sys/epoll.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ----------------------------------------- ## +## Report this to wx-dev@lists.wxwidgets.org ## +## ----------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } if test "${ac_cv_c_const+set}" = set; then @@ -21915,6 +22492,12 @@ if test "${wx_cv_func_va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + cat >conftest.$ac_ext <<_ACEOF #include @@ -21946,7 +22529,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then @@ -21961,6 +22544,12 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi @@ -26832,7 +27421,7 @@ echo "${ECHO_T}" >&6; } case "${host}" in *-*-solaris2* ) if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then - enable_gtktest=no + enable_gtktest=no fi esac @@ -27151,11 +27740,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ case "${host}" in *-*-solaris2* ) - if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then - GTK_CFLAGS=`echo $GTK_CFLAGS | sed 's/-mt//'` - GTK_LIBS=`echo $GTK_LIBS | sed 's/-mt//'` - fi - if test "$wxUSE_SHARED" != "yes"; then + if test "$wxUSE_SHARED" != "yes"; then GTK_LIBS="$GTK_LIBS -lX11" fi esac @@ -31401,6 +31986,20 @@ else fi + +if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then + if test "$TOOLKIT" = "DFB" ; then + wxUSE_UNICODE_UTF8=yes + elif test "$TOOLKIT" = "GTK" -a "$WXGTK20" = "1" ; then + wxUSE_UNICODE_UTF8=yes + elif test "$USE_OS2" = "1" ; then + wxUSE_UNICODE_UTF8=yes + else + wxUSE_UNICODE_UTF8=no + fi +fi + + if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5 @@ -32497,6 +33096,10 @@ echo "${ECHO_T}$wx_cv_version_script" >&6; } esac + if test "x$SUNCXX" = xyes; then + SAMPLES_RPATH_FLAG="-R\$(wx_top_builddir)/lib" + WXCONFIG_RPATH="-R\$libdir" + else case "${host}" in *-*-linux* | *-*-gnu* ) SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib" @@ -32504,14 +33107,14 @@ echo "${ECHO_T}$wx_cv_version_script" >&6; } ;; *-*-solaris2* ) - if test "$GCC" = yes ; then - CPPFLAGS="-isystem /usr/openwin/include $CPPFLAGS" - saveLdflags="$LDFLAGS" - LDFLAGS="$saveLdflags -Wl,-rpath,/" - { echo "$as_me:$LINENO: checking if the linker accepts -rpath" >&5 + CPPFLAGS="-isystem /usr/openwin/include $CPPFLAGS" + + saveLdflags="$LDFLAGS" + LDFLAGS="$saveLdflags -Wl,-rpath,/" + { echo "$as_me:$LINENO: checking if the linker accepts -rpath" >&5 echo $ECHO_N "checking if the linker accepts -rpath... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -32545,22 +33148,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 + { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib" - WXCONFIG_RPATH="-Wl,-rpath,\$libdir" + SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib" + WXCONFIG_RPATH="-Wl,-rpath,\$libdir" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { echo "$as_me:$LINENO: result: no" >&5 + { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: checking if the linker accepts -R" >&5 + { echo "$as_me:$LINENO: checking if the linker accepts -R" >&5 echo $ECHO_N "checking if the linker accepts -R... $ECHO_C" >&6; } - LDFLAGS="$saveLdflags -Wl,-R,/" - cat >conftest.$ac_ext <<_ACEOF + LDFLAGS="$saveLdflags -Wl,-R,/" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -32594,17 +33197,17 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 + { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - SAMPLES_RPATH_FLAG="-Wl,-R,\$(wx_top_builddir)/lib" - WXCONFIG_RPATH="-Wl,-R,\$libdir" + SAMPLES_RPATH_FLAG="-Wl,-R,\$(wx_top_builddir)/lib" + WXCONFIG_RPATH="-Wl,-R,\$libdir" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { echo "$as_me:$LINENO: result: no" >&5 + { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi @@ -32616,11 +33219,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$saveLdflags" - else - SAMPLES_RPATH_FLAG="-R\$(wx_top_builddir)/lib" - WXCONFIG_RPATH="-R\$libdir" - fi + LDFLAGS="$saveLdflags" ;; *-*-darwin* ) @@ -32650,6 +33249,7 @@ EOF ;; esac + fi if test $wxUSE_RPATH = "no"; then SAMPLES_RPATH_FLAG='' @@ -33477,6 +34077,79 @@ _ACEOF fi fi +{ echo "$as_me:$LINENO: checking if wchar_t is separate type" >&5 +echo $ECHO_N "checking if wchar_t is separate type... $ECHO_C" >&6; } +if test "${wx_cv_wchar_t_is_separate_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ + + return 0; } + + struct Foo { void foo(wchar_t); + void foo(unsigned short); + void foo(unsigned int); + void foo(unsigned long); }; + + int bar() { + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wx_cv_wchar_t_is_separate_type=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_wchar_t_is_separate_type=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_wchar_t_is_separate_type" >&5 +echo "${ECHO_T}$wx_cv_wchar_t_is_separate_type" >&6; } + +if test "$wx_cv_wchar_t_is_separate_type" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxWCHAR_T_IS_SEPARATE_TYPE 1 +_ACEOF + +else + cat >>confdefs.h <<\_ACEOF +#define wxWCHAR_T_IS_SEPARATE_TYPE 0 +_ACEOF + +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -33652,156 +34325,251 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - WCSLEN_FOUND=1 -fi -done - - - if test "$WCSLEN_FOUND" = 0; then - if test "$TOOLKIT" = "MSW"; then - { echo "$as_me:$LINENO: checking for wcslen in -lmsvcrt" >&5 -echo $ECHO_N "checking for wcslen in -lmsvcrt... $ECHO_C" >&6; } -if test "${ac_cv_lib_msvcrt_wcslen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmsvcrt $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char wcslen (); -int -main () -{ -return wcslen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_msvcrt_wcslen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + WCSLEN_FOUND=1 +fi +done + + + if test "$WCSLEN_FOUND" = 0; then + if test "$TOOLKIT" = "MSW"; then + { echo "$as_me:$LINENO: checking for wcslen in -lmsvcrt" >&5 +echo $ECHO_N "checking for wcslen in -lmsvcrt... $ECHO_C" >&6; } +if test "${ac_cv_lib_msvcrt_wcslen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmsvcrt $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char wcslen (); +int +main () +{ +return wcslen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_msvcrt_wcslen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_msvcrt_wcslen=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_msvcrt_wcslen" >&5 +echo "${ECHO_T}$ac_cv_lib_msvcrt_wcslen" >&6; } +if test $ac_cv_lib_msvcrt_wcslen = yes; then + WCHAR_OK=1 +fi + + else + { echo "$as_me:$LINENO: checking for wcslen in -lw" >&5 +echo $ECHO_N "checking for wcslen in -lw... $ECHO_C" >&6; } +if test "${ac_cv_lib_w_wcslen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lw $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char wcslen (); +int +main () +{ +return wcslen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_w_wcslen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_w_wcslen=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_w_wcslen" >&5 +echo "${ECHO_T}$ac_cv_lib_w_wcslen" >&6; } +if test $ac_cv_lib_w_wcslen = yes; then + + WCHAR_LINK=" -lw" + WCSLEN_FOUND=1 + +fi + + fi + fi + + if test "$WCSLEN_FOUND" = 1; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_WCSLEN 1 +_ACEOF + + fi + + +for ac_func in wcsdup +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* 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 +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF - ac_cv_lib_msvcrt_wcslen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_msvcrt_wcslen" >&5 -echo "${ECHO_T}$ac_cv_lib_msvcrt_wcslen" >&6; } -if test $ac_cv_lib_msvcrt_wcslen = yes; then - WCHAR_OK=1 -fi - - else - { echo "$as_me:$LINENO: checking for wcslen in -lw" >&5 -echo $ECHO_N "checking for wcslen in -lw... $ECHO_C" >&6; } -if test "${ac_cv_lib_w_wcslen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lw $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char wcslen (); -int -main () -{ -return wcslen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_w_wcslen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_w_wcslen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_w_wcslen" >&5 -echo "${ECHO_T}$ac_cv_lib_w_wcslen" >&6; } -if test $ac_cv_lib_w_wcslen = yes; then - - WCHAR_LINK=" -lw" - WCSLEN_FOUND=1 - -fi - - fi - fi - - if test "$WCSLEN_FOUND" = 1; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_WCSLEN 1 -_ACEOF +done - fi if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS" @@ -34973,6 +35741,12 @@ _ACEOF fi +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + for wx_func in round do @@ -35021,7 +35795,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then @@ -35054,6 +35828,12 @@ _ACEOF fi done +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "$TOOLKIT" != "MSW"; then @@ -37561,12 +38341,14 @@ echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;} THREAD_OPTS="-pthread" + if test "x$SUNCXX" = xyes; then + THREAD_OPTS="-mt lthread $THREAD_OPTS" + fi + case "${host}" in *-*-solaris2* | *-*-sunos4* ) if test "x$GCC" = "xyes"; then THREAD_OPTS="-pthreads $THREAD_OPTS" - else - THREAD_OPTS="-mt $THREAD_OPTS" fi ;; *-*-freebsd*) @@ -37826,6 +38608,12 @@ if test "${wx_cv_func_pthread_cleanup+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -37861,7 +38649,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then @@ -37878,6 +38666,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi { echo "$as_me:$LINENO: result: $wx_cv_func_pthread_cleanup" >&5 @@ -39263,6 +40057,7 @@ echo $ECHO_N "checking how many arguments gethostbyname_r() takes... $ECHO_C" >& else +################################################################ ac_cv_func_which_gethostbyname_r=unknown @@ -39492,6 +40287,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +################################################################ fi @@ -39619,115 +40415,40 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_func_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_gethostbyname=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } -if test $ac_cv_func_gethostbyname = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_GETHOSTBYNAME 1 -_ACEOF - -fi - - fi - { echo "$as_me:$LINENO: checking for getservbyname_r" >&5 -echo $ECHO_N "checking for getservbyname_r... $ECHO_C" >&6; } -if test "${ac_cv_func_which_getservbyname_r+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -{ echo "$as_me:$LINENO: checking for getservbyname_r" >&5 -echo $ECHO_N "checking for getservbyname_r... $ECHO_C" >&6; } -if test "${ac_cv_func_getservbyname_r+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define getservbyname_r to an innocuous variant, in case declares getservbyname_r. - For example, HP-UX 11i declares gettimeofday. */ -#define getservbyname_r innocuous_getservbyname_r - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getservbyname_r (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef getservbyname_r - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char getservbyname_r (); -/* 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_getservbyname_r || defined __stub___getservbyname_r -choke me -#endif - -int -main () -{ -return getservbyname_r (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_getservbyname_r=yes + ac_cv_func_gethostbyname=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_getservbyname_r=no + ac_cv_func_gethostbyname=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_getservbyname_r" >&5 -echo "${ECHO_T}$ac_cv_func_getservbyname_r" >&6; } -if test $ac_cv_func_getservbyname_r = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } +if test $ac_cv_func_gethostbyname = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_GETHOSTBYNAME 1 +_ACEOF + +fi + + fi + +{ echo "$as_me:$LINENO: checking how many arguments getservbyname_r() takes" >&5 +echo $ECHO_N "checking how many arguments getservbyname_r() takes... $ECHO_C" >&6; } +if test "${ac_cv_func_which_getservbyname_r+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -39735,20 +40456,17 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -# include - +#include int main () { - - char *name; - char *proto; - struct servent *se; - struct servent_data data; - (void) getservbyname_r(name, proto, se, &data); - + char *name; + char *proto; + struct servent *se, *res; + char buffer[2048]; + int buflen = 2048; + (void) getservbyname_r(name, proto, se, buffer, buflen, &res) ; return 0; @@ -39768,34 +40486,32 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_func_which_getservbyname_r=four + ac_cv_func_which_getservbyname_r=six else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -# include - +#include int main () { - char *name; - char *proto; - struct servent *se, *res; - char buffer[2048]; - int buflen = 2048; - (void) getservbyname_r(name, proto, se, buffer, buflen, &res) + char *name; + char *proto; + struct servent *se; + char buffer[2048]; + int buflen = 2048; + (void) getservbyname_r(name, proto, se, buffer, buflen) ; return 0; @@ -39815,34 +40531,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_func_which_getservbyname_r=six + ac_cv_func_which_getservbyname_r=five else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -# include - +#include int main () { - char *name; - char *proto; - struct servent *se; - char buffer[2048]; - int buflen = 2048; - (void) getservbyname_r(name, proto, se, buffer, buflen) + char *name; + char *proto; + struct servent *se; + struct servent_data data; + (void) getservbyname_r(name, proto, se, &data); ; return 0; @@ -39862,22 +40575,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_func_which_getservbyname_r=five + ac_cv_func_which_getservbyname_r=four else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_which_getservbyname_r=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -39886,10 +40598,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + -else - ac_cv_func_which_getservbyname_r=no -fi fi { echo "$as_me:$LINENO: result: $ac_cv_func_which_getservbyname_r" >&5 @@ -39910,7 +40625,6 @@ elif test $ac_cv_func_which_getservbyname_r = four; then #define HAVE_FUNC_GETSERVBYNAME_R_4 1 _ACEOF - fi @@ -40790,6 +41504,13 @@ _ACEOF fi +if test "$wxUSE_EXTENDED_RTTI" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_EXTENDED_RTTI 1 +_ACEOF + +fi + if test "$wxUSE_APPLE_IEEE" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_APPLE_IEEE 1 @@ -41957,16 +42678,18 @@ _ACEOF fi +if test "$wxUSE_OBJC_UNIQUIFYING" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_OBJC_UNIQUIFYING 1 +_ACEOF +fi -if test "$wxUSE_DATETIME" = "yes"; then -for ac_func in strptime -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +if test "$wxUSE_DATETIME" = "yes"; then + { echo "$as_me:$LINENO: checking for strptime" >&5 +echo $ECHO_N "checking for strptime... $ECHO_C" >&6; } +if test "${ac_cv_func_strptime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -41975,12 +42698,12 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. +/* Define strptime to an innocuous variant, in case declares strptime. For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func +#define strptime innocuous_strptime /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. + which can conflict with char strptime (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ @@ -41990,7 +42713,7 @@ cat >>conftest.$ac_ext <<_ACEOF # include #endif -#undef $ac_func +#undef strptime /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -41998,18 +42721,18 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char $ac_func (); +char strptime (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func +#if defined __stub_strptime || defined __stub___strptime choke me #endif int main () { -return $ac_func (); +return strptime (); ; return 0; } @@ -42032,27 +42755,19 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" + ac_cv_func_strptime=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" + ac_cv_func_strptime=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done +{ echo "$as_me:$LINENO: result: $ac_cv_func_strptime" >&5 +echo "${ECHO_T}$ac_cv_func_strptime" >&6; } if test "$ac_cv_func_strptime" = "yes"; then { echo "$as_me:$LINENO: checking for strptime declaration" >&5 @@ -42131,6 +42846,78 @@ echo "${ECHO_T}$wx_cv_func_strptime_decl" >&6; } #define HAVE_STRPTIME_DECL 1 _ACEOF + else + wx_strptime_decl="extern char *strptime(const char *, const char *, struct tm *);" + fi + if test "$ac_cv_func_strptime" = "yes"; then + { echo "$as_me:$LINENO: checking whether strptime() fails on invalid strings" >&5 +echo $ECHO_N "checking whether strptime() fails on invalid strings... $ECHO_C" >&6; } +if test "${wx_cv_func_strptime_ok+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + wx_cv_func_strptime_ok=no + +else + cat >conftest.$ac_ext <<_ACEOF + + #include + #include + #include "confdefs.h" + + $wx_strptime_decl + + int main() + { + struct tm t; + return !!strptime("", "%x", &t); + } + +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + wx_cv_func_strptime_ok=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +wx_cv_func_strptime_ok=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_func_strptime_ok" >&5 +echo "${ECHO_T}$wx_cv_func_strptime_ok" >&6; } + + if test "$wx_cv_func_strptime_ok" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_STRPTIME 1 +_ACEOF + + fi fi { echo "$as_me:$LINENO: checking for timezone variable in " >&5 @@ -43551,6 +44338,20 @@ fi fi fi +if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_UNICODE_UTF8 1 +_ACEOF + + + if test "$wxUSE_UNICODE_UTF8_LOCALE" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_UTF8_LOCALE_ONLY 1 +_ACEOF + + fi +fi + if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_EXPERIMENTAL_PRINTF 1 @@ -44160,6 +44961,15 @@ echo "$as_me: WARNING: wxListCtrl requires wxImageList and won't be compiled wit fi fi +if test "$wxUSE_EDITABLELISTBOX" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_EDITABLELISTBOX 1 +_ACEOF + + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS editlbox" +fi + if test "$wxUSE_NOTEBOOK" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_NOTEBOOK 1 @@ -45136,14 +45946,6 @@ fi if test "$wxUSE_GSTREAMER" = "yes"; then - case "${host}" in - *-*-solaris2* ) - if "$GCC" = yes; then - GST_CFLAGS=`echo $GST_CFLAGS | sed 's/-mt//'` - GST_LIBS=`echo $GST_LIBS | sed 's/-mt//'` - fi - esac - CPPFLAGS="$GST_CFLAGS $CPPFLAGS" LIBS="$GST_LIBS $LIBS" @@ -45302,7 +46104,7 @@ CPPFLAGS=`echo $WXCONFIG_CPPFLAGS \ C_AND_CXX_FLAGS="$DEBUG_CFLAGS $PROFILE_FLAGS $OPTIMISE_CFLAGS" CFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $CFLAGS ` -CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $CXXWARNINGS $C_AND_CXX_FLAGS $CXXFLAGS ` +CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $CXXFLAGS ` WXCONFIG_CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $WXCONFIG_ONLY_CPPFLAGS` @@ -45441,6 +46243,7 @@ fi + TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"` @@ -46188,10 +46991,7 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6; } PLATFORM_BEOS=1 ;; * ) - { { echo "$as_me:$LINENO: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&5 -echo "$as_me: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&2;} - { (exit 1); exit 1; }; } - ;; + ;; esac fi @@ -46334,71 +47134,17 @@ fi ;; *-*-linux* ) - if test "x$GCC" != "xyes"; then - { echo "$as_me:$LINENO: checking for Intel compiler" >&5 -echo $ECHO_N "checking for Intel compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_prog_icc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - #ifndef __INTEL_COMPILER - This is not ICC - #endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - bakefile_cv_prog_icc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - bakefile_cv_prog_icc=no - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_prog_icc" >&5 -echo "${ECHO_T}$bakefile_cv_prog_icc" >&6; } - if test "$bakefile_cv_prog_icc" = "yes"; then - PIC_FLAG="-KPIC" - fi + if test "$INTELCC" = "yes"; then + PIC_FLAG="-KPIC" + elif test "x$SUNCXX" = "xyes"; then + SHARED_LD_CC="${CC} -G -o" + SHARED_LD_CXX="${CXX} -G -o" + PIC_FLAG="-KPIC" fi ;; *-*-solaris2* ) - if test "x$GCC" != xyes ; then + if test "x$SUNCXX" = xyes ; then SHARED_LD_CC="${CC} -G -o" SHARED_LD_CXX="${CXX} -G -o" PIC_FLAG="-KPIC" @@ -47188,7 +47934,11 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;} case "${BAKEFILE_HOST}" in *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu ) - SONAME_FLAG="-Wl,-soname," + if test "x$SUNCXX" = "xyes"; then + SONAME_FLAG="-h " + else + SONAME_FLAG="-Wl,-soname," + fi USE_SOVERSION=1 USE_SOVERLINUX=1 USE_SOSYMLINKS=1 @@ -48485,6 +49235,11 @@ EOF COND_USE_GUI_1="" fi + COND_USE_GUI_1_USE_OPENGL_1="#" + if test "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then + COND_USE_GUI_1_USE_OPENGL_1="" + fi + COND_USE_GUI_1_WXUNIV_0="#" if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then COND_USE_GUI_1_WXUNIV_0="" @@ -48708,6 +49463,25 @@ fi WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS" + +case "${host}" in + *-*-solaris2* ) + if "$GCC" = yes; then + CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//'` + LIBS=`echo $LIBS | sed 's/-mt//'` + EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//'` + fi + ;; + + *-*-linux* ) + if test "x$SUNCXX" = xyes; then + CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//'` + LIBS=`echo $LIBS | sed 's/-pthread//'` + EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//'` + fi + ;; +esac + SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`" @@ -48930,21 +49704,10 @@ echo "${ECHO_T}no" >&6; } cppunit_major_min=`echo $cppunit_version_min | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - if test "x${cppunit_major_min}" = "x" ; then - cppunit_major_min=0 - fi - cppunit_minor_min=`echo $cppunit_version_min | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - if test "x${cppunit_minor_min}" = "x" ; then - cppunit_minor_min=0 - fi - cppunit_micro_min=`echo $cppunit_version_min | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x${cppunit_micro_min}" = "x" ; then - cppunit_micro_min=0 - fi cppunit_version_proper=`expr \ $cppunit_major_version \> $cppunit_major_min \| \ @@ -49822,6 +50585,7 @@ WX_LIB_FLAVOUR!$WX_LIB_FLAVOUR$ac_delim WXUNIV!$WXUNIV$ac_delim MONOLITHIC!$MONOLITHIC$ac_delim USE_PLUGINS!$USE_PLUGINS$ac_delim +CXXWARNINGS!$CXXWARNINGS$ac_delim EXTRALIBS!$EXTRALIBS$ac_delim EXTRALIBS_XML!$EXTRALIBS_XML$ac_delim EXTRALIBS_HTML!$EXTRALIBS_HTML$ac_delim @@ -49891,7 +50655,6 @@ COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_deli COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim COND_BUILD_RELEASE!$COND_BUILD_RELEASE$ac_delim -COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT!$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -49933,6 +50696,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT!$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT$ac_delim COND_BUILD_RELEASE_UNICODE_0!$COND_BUILD_RELEASE_UNICODE_0$ac_delim COND_BUILD_RELEASE_UNICODE_1!$COND_BUILD_RELEASE_UNICODE_1$ac_delim COND_DEBUG_FLAG_1!$COND_DEBUG_FLAG_1$ac_delim @@ -50029,7 +50793,6 @@ COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim -COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -50071,6 +50834,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim @@ -50104,6 +50868,7 @@ COND_USE_EXCEPTIONS_0!$COND_USE_EXCEPTIONS_0$ac_delim COND_USE_EXCEPTIONS_1!$COND_USE_EXCEPTIONS_1$ac_delim COND_USE_GUI_0!$COND_USE_GUI_0$ac_delim COND_USE_GUI_1!$COND_USE_GUI_1$ac_delim +COND_USE_GUI_1_USE_OPENGL_1!$COND_USE_GUI_1_USE_OPENGL_1$ac_delim COND_USE_GUI_1_WXUNIV_0!$COND_USE_GUI_1_WXUNIV_0$ac_delim COND_USE_GUI_1_WXUNIV_1!$COND_USE_GUI_1_WXUNIV_1$ac_delim COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim @@ -50166,8 +50931,6 @@ SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim LDFLAGS_GL!$LDFLAGS_GL$ac_delim OPENGL_LIBS!$OPENGL_LIBS$ac_delim DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim -WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim -RESCOMP!$RESCOMP$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -50209,6 +50972,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim +RESCOMP!$RESCOMP$ac_delim RESFLAGS!$RESFLAGS$ac_delim RESPROGRAMOBJ!$RESPROGRAMOBJ$ac_delim WX_RESOURCES_MACOSX_ASCII!$WX_RESOURCES_MACOSX_ASCII$ac_delim @@ -50222,7 +50987,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -50855,7 +51620,16 @@ echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITH echo " Should wxWidgets be compiled in debug mode? ${wxUSE_DEBUG:-no}" echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}" -echo " Should wxWidgets be compiled in Unicode mode? ${wxUSE_UNICODE:-no}" +echo -n " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}" +if test "$wxUSE_UNICODE" = "yes"; then + if test "$wxUSE_UNICODE_UTF8" = "yes"; then + echo " (using UTF-8)" + else + echo " (using wchar_t)" + fi +else + echo +fi echo " What level of wxWidgets compatibility should be enabled?" echo " wxWidgets 2.6 ${WXWIN_COMPATIBILITY_2_6:-no}"