X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3dcef0170f330d675b172fa36b28fd88eb3edcd..84cae69a8b6530450d37bd25e5190e8f963750bb:/configure diff --git a/configure b/configure index 3a6cdf673a..7cfe3dba7c 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 56928 2008-11-23 01:53:24Z VZ . +# From configure.in Id: configure.in 58060 2009-01-12 23:25:39Z FM . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # @@ -661,10 +661,6 @@ host host_cpu host_vendor host_os -target -target_cpu -target_vendor -target_os wx_top_builddir CC CFLAGS @@ -756,6 +752,7 @@ TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK +HEADER_PAD_OPTION HOST_SUFFIX CPPUNIT_CFLAGS CPPUNIT_LIBS @@ -1644,7 +1641,6 @@ X features: System types: --build=BUILD configure for building on BUILD [guessed] --host=HOST cross-compile to build programs to run on HOST [BUILD] - --target=TARGET configure for building compilers for TARGET [HOST] _ACEOF fi @@ -1785,9 +1781,9 @@ Optional Features: --disable-controls disable compilation of all standard controls --enable-accel use accelerators --enable-animatectrl use wxAnimationCtrl class - --enable-button use wxButton class --enable-bmpbutton use wxBitmapButton class --enable-bmpcombobox use wxBitmapComboBox class + --enable-button use wxButton class --enable-calendar use wxCalendarCtrl class --enable-caret use wxCaret class --enable-checkbox use wxCheckBox class @@ -1798,17 +1794,18 @@ Optional Features: --enable-colourpicker use wxColourPickerCtrl class --enable-combobox use wxComboBox class --enable-comboctrl use wxComboCtrl class + --enable-dataviewctrl use wxDataViewCtrl class --enable-datepick use wxDatePickerCtrl class + --enable-detect_sm use code to detect X11 session manager --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-filectrl use wxFileCtrl class + --enable-filepicker use wxFilePickerCtrl class --enable-fontpicker use wxFontPickerCtrl class --enable-gauge use wxGauge class --enable-grid use wxGrid class - --enable-dataviewctrl use wxDataViewCtrl class + --enable-headerctrl use wxHeaderCtrl class --enable-hyperlink use wxHyperlinkCtrl class --enable-imaglist use wxImageList class --enable-listbook use wxListbook class @@ -1817,8 +1814,10 @@ Optional Features: --enable-notebook use wxNotebook class --enable-notifmsg use wxNotificationMessage class --enable-odcombobox use wxOwnerDrawnComboBox class + --enable-popupwin use wxPopUpWindow class --enable-radiobox use wxRadioBox class --enable-radiobtn use wxRadioButton class + --enable-rearrangectrl use wxRearrangeList/Ctrl/Dialog --enable-sash use wxSashWindow class --enable-scrollbar use wxScrollBar class and scrollable windows --enable-searchctrl use wxSearchCtrl class @@ -1831,17 +1830,15 @@ Optional Features: --enable-statline use wxStaticLine class --enable-stattext use wxStaticText class --enable-statusbar use wxStatusBar class - --enable-tabdialog use wxTabControl class --enable-taskbaricon use wxTaskBarIcon class + --enable-tbarnative use native wxToolBar class --enable-textctrl use wxTextCtrl class + --enable-tipwindow use wxTipWindow class --enable-togglebtn use wxToggleButton class --enable-toolbar use wxToolBar class - --enable-tbarnative use native wxToolBar class - --enable-treebook use wxTreebook class --enable-toolbook use wxToolbook class + --enable-treebook use wxTreebook class --enable-treectrl use wxTreeCtrl class - --enable-tipwindow use wxTipWindow class - --enable-popupwin use wxPopUpWindow class --enable-commondlg use all common dialogs --enable-aboutdlg use wxAboutBox --enable-choicedlg use wxChoiceDialog @@ -2537,49 +2534,6 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ echo "$as_me:$LINENO: checking target system type" >&5 -echo $ECHO_N "checking target system type... $ECHO_C" >&6; } -if test "${ac_cv_target+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "x$target_alias" = x; then - ac_cv_target=$ac_cv_host -else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} - { (exit 1); exit 1; }; } -fi - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -echo "${ECHO_T}$ac_cv_target" >&6; } -case $ac_cv_target in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -echo "$as_me: error: invalid value of canonical target" >&2;} - { (exit 1); exit 1; }; };; -esac -target=$ac_cv_target -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_target -shift -target_cpu=$1 -target_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -target_os=$* -IFS=$ac_save_IFS -case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac - - -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -test -n "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- @@ -2958,16 +2912,16 @@ DEFAULT_wxUSE_LIBGNOMEVFS=no DEFAULT_wxUSE_LIBHILDON=no DEFAULT_wxUSE_LIBMSPACK=no DEFAULT_wxUSE_LIBSDL=no -DEFAULT_wxUSE_OPENGL=no DEFAULT_wxUSE_ACCESSIBILITY=no DEFAULT_wxUSE_GRAPHICS_CONTEXT=no DEFAULT_wxUSE_IPV6=no -DEFAULT_wxUSE_MEDIACTRL=no -DEFAULT_wxUSE_TAB_DIALOG=no DEFAULT_wxUSE_GSTREAMER8=no DEFAULT_wxUSE_UNICODE_UTF8=auto +DEFAULT_wxUSE_OPENGL=auto +DEFAULT_wxUSE_MEDIACTRL=auto + DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no DEFAULT_wxUSE_UNIVERSAL_BINARY=no @@ -5481,6 +5435,11 @@ fi echo "${ECHO_T}$result" >&6; } +cat >>confdefs.h <<\_ACEOF +#define wxEVENTS_COMPATIBILITY_2_8 0 +_ACEOF + + enablestring=disable defaultval= @@ -9462,114 +9421,61 @@ fi echo "${ECHO_T}$result" >&6; } -if test "$wxUSE_CONTROLS" = "yes"; then - DEFAULT_wxUSE_ACCEL=yes - DEFAULT_wxUSE_ANIMATIONCTRL=yes - DEFAULT_wxUSE_BMPBUTTON=yes - DEFAULT_wxUSE_BUTTON=yes - DEFAULT_wxUSE_CALCTRL=yes - DEFAULT_wxUSE_CARET=yes - DEFAULT_wxUSE_COMBOBOX=yes - DEFAULT_wxUSE_CHECKBOX=yes - DEFAULT_wxUSE_CHECKLISTBOX=yes - DEFAULT_wxUSE_CHOICE=yes - DEFAULT_wxUSE_CHOICEBOOK=yes - DEFAULT_wxUSE_COLLPANE=yes - DEFAULT_wxUSE_COLOURPICKERCTRL=yes - DEFAULT_wxUSE_COMBOBOX=yes - DEFAULT_wxUSE_DATEPICKCTRL=yes - DEFAULT_wxUSE_DISPLAY=yes - DEFAULT_wxUSE_DETECT_SM=yes - DEFAULT_wxUSE_DIRPICKERCTRL=yes - DEFAULT_wxUSE_FILECTRL=yes - DEFAULT_wxUSE_FILEPICKERCTRL=yes - DEFAULT_wxUSE_FONTPICKERCTRL=yes - DEFAULT_wxUSE_GAUGE=yes - DEFAULT_wxUSE_GRID=yes - DEFAULT_wxUSE_HYPERLINKCTRL=yes - DEFAULT_wxUSE_DATAVIEWCTRL=yes - DEFAULT_wxUSE_IMAGLIST=yes - DEFAULT_wxUSE_LISTBOOK=yes - DEFAULT_wxUSE_LISTBOX=yes - DEFAULT_wxUSE_LISTCTRL=yes - DEFAULT_wxUSE_NOTEBOOK=yes - DEFAULT_wxUSE_RADIOBOX=yes - DEFAULT_wxUSE_RADIOBTN=yes - DEFAULT_wxUSE_SASH=yes - DEFAULT_wxUSE_SCROLLBAR=yes - DEFAULT_wxUSE_SEARCHCTRL=yes - DEFAULT_wxUSE_SLIDER=yes - DEFAULT_wxUSE_SPINBTN=yes - DEFAULT_wxUSE_SPINCTRL=yes - DEFAULT_wxUSE_SPLITTER=yes - DEFAULT_wxUSE_STATBMP=yes - DEFAULT_wxUSE_STATBOX=yes - DEFAULT_wxUSE_STATLINE=yes - DEFAULT_wxUSE_STATUSBAR=yes - DEFAULT_wxUSE_TAB_DIALOG=yes - DEFAULT_wxUSE_TOGGLEBTN=yes - DEFAULT_wxUSE_TOOLBAR=yes - DEFAULT_wxUSE_TOOLBAR_NATIVE=yes - DEFAULT_wxUSE_TOOLTIPS=yes - DEFAULT_wxUSE_TREEBOOK=yes - DEFAULT_wxUSE_TOOLBOOK=yes - DEFAULT_wxUSE_TREECTRL=yes - DEFAULT_wxUSE_POPUPWIN=yes - DEFAULT_wxUSE_TIPWINDOW=yes -elif test "$wxUSE_CONTROLS" = "no"; then - DEFAULT_wxUSE_ACCEL=no - DEFAULT_wxUSE_ANIMATIONCTRL=no - DEFAULT_wxUSE_BMPBUTTON=no - DEFAULT_wxUSE_BUTTON=no - DEFAULT_wxUSE_CALCTRL=no - DEFAULT_wxUSE_CARET=no - DEFAULT_wxUSE_COLLPANE=no - DEFAULT_wxUSE_COMBOBOX=no - DEFAULT_wxUSE_CHECKBOX=no - DEFAULT_wxUSE_CHECKLISTBOX=no - DEFAULT_wxUSE_CHOICE=no - DEFAULT_wxUSE_CHOICEBOOK=no - DEFAULT_wxUSE_COLOURPICKERCTRL=no - DEFAULT_wxUSE_COMBOBOX=no - DEFAULT_wxUSE_DATEPICKCTRL=no - DEFAULT_wxUSE_DISPLAY=no - DEFAULT_wxUSE_DETECT_SM=no - DEFAULT_wxUSE_DIRPICKERCTRL=no - DEFAULT_wxUSE_FILECTRL=no - DEFAULT_wxUSE_FILEPICKERCTRL=no - DEFAULT_wxUSE_FONTPICKERCTRL=no - DEFAULT_wxUSE_GAUGE=no - DEFAULT_wxUSE_GRID=no - DEFAULT_wxUSE_HYPERLINKCTRL=no - DEFAULT_wxUSE_DATAVIEWCTRL=no - DEFAULT_wxUSE_IMAGLIST=no - DEFAULT_wxUSE_LISTBOOK=no - DEFAULT_wxUSE_LISTBOX=no - DEFAULT_wxUSE_LISTCTRL=no - DEFAULT_wxUSE_NOTEBOOK=no - DEFAULT_wxUSE_RADIOBOX=no - DEFAULT_wxUSE_RADIOBTN=no - DEFAULT_wxUSE_SASH=no - DEFAULT_wxUSE_SCROLLBAR=no - DEFAULT_wxUSE_SEARCHCTRL=no - DEFAULT_wxUSE_SLIDER=no - DEFAULT_wxUSE_SPINBTN=no - DEFAULT_wxUSE_SPINCTRL=no - DEFAULT_wxUSE_SPLITTER=no - DEFAULT_wxUSE_STATBMP=no - DEFAULT_wxUSE_STATBOX=no - DEFAULT_wxUSE_STATLINE=no - DEFAULT_wxUSE_STATUSBAR=no - DEFAULT_wxUSE_TAB_DIALOG=no - DEFAULT_wxUSE_TOGGLEBTN=no - DEFAULT_wxUSE_TOOLBAR=no - DEFAULT_wxUSE_TOOLBAR_NATIVE=no - DEFAULT_wxUSE_TOOLTIPS=no - DEFAULT_wxUSE_TREEBOOK=no - DEFAULT_wxUSE_TOOLBOOK=no - DEFAULT_wxUSE_TREECTRL=no - DEFAULT_wxUSE_POPUPWIN=no - DEFAULT_wxUSE_TIPWINDOW=no +if test "$wxUSE_CONTROLS" = "no"; then + DEFAULT_wxUSE_ACCEL=no + DEFAULT_wxUSE_ANIMATIONCTRL=no + DEFAULT_wxUSE_BMPBUTTON=no + DEFAULT_wxUSE_BUTTON=no + DEFAULT_wxUSE_CALCTRL=no + DEFAULT_wxUSE_CARET=no + DEFAULT_wxUSE_CHECKBOX=no + DEFAULT_wxUSE_CHECKLISTBOX=no + DEFAULT_wxUSE_CHOICE=no + DEFAULT_wxUSE_CHOICEBOOK=no + DEFAULT_wxUSE_COLLPANE=no + DEFAULT_wxUSE_COLOURPICKERCTRL=no + DEFAULT_wxUSE_COMBOBOX=no + DEFAULT_wxUSE_COMBOBOX=no + DEFAULT_wxUSE_DATAVIEWCTRL=no + DEFAULT_wxUSE_DATEPICKCTRL=no + DEFAULT_wxUSE_DETECT_SM=no + DEFAULT_wxUSE_DIRPICKERCTRL=no + DEFAULT_wxUSE_DISPLAY=no + DEFAULT_wxUSE_FILECTRL=no + DEFAULT_wxUSE_FILEPICKERCTRL=no + DEFAULT_wxUSE_FONTPICKERCTRL=no + DEFAULT_wxUSE_GAUGE=no + DEFAULT_wxUSE_GRID=no + DEFAULT_wxUSE_HEADERCTRL=no + DEFAULT_wxUSE_HYPERLINKCTRL=no + DEFAULT_wxUSE_IMAGLIST=no + DEFAULT_wxUSE_LISTBOOK=no + DEFAULT_wxUSE_LISTBOX=no + DEFAULT_wxUSE_LISTCTRL=no + DEFAULT_wxUSE_NOTEBOOK=no + DEFAULT_wxUSE_POPUPWIN=no + DEFAULT_wxUSE_RADIOBOX=no + DEFAULT_wxUSE_RADIOBTN=no + DEFAULT_wxUSE_REARRANGECTRL=no + DEFAULT_wxUSE_SASH=no + DEFAULT_wxUSE_SCROLLBAR=no + DEFAULT_wxUSE_SEARCHCTRL=no + DEFAULT_wxUSE_SLIDER=no + DEFAULT_wxUSE_SPINBTN=no + DEFAULT_wxUSE_SPINCTRL=no + DEFAULT_wxUSE_SPLITTER=no + DEFAULT_wxUSE_STATBMP=no + DEFAULT_wxUSE_STATBOX=no + DEFAULT_wxUSE_STATLINE=no + DEFAULT_wxUSE_STATUSBAR=no + DEFAULT_wxUSE_TIPWINDOW=no + DEFAULT_wxUSE_TOGGLEBTN=no + DEFAULT_wxUSE_TOOLBAR=no + DEFAULT_wxUSE_TOOLBAR_NATIVE=no + DEFAULT_wxUSE_TOOLBOOK=no + DEFAULT_wxUSE_TOOLTIPS=no + DEFAULT_wxUSE_TREEBOOK=no + DEFAULT_wxUSE_TREECTRL=no fi @@ -9671,34 +9577,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-button" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6; } - # Check whether --enable-button was given. -if test "${enable_button+set}" = set; then - enableval=$enable_button; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpbutton" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6; } + # Check whether --enable-bmpbutton was given. +if test "${enable_bmpbutton+set}" = set; then + enableval=$enable_bmpbutton; if test "$enableval" = yes; then - wx_cv_use_button='wxUSE_BUTTON=yes' + wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes' else - wx_cv_use_button='wxUSE_BUTTON=no' + wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no' fi else - wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}" + wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}" fi - eval "$wx_cv_use_button" + eval "$wx_cv_use_bmpbutton" if test x"$enablestring" = xdisable; then - if test $wxUSE_BUTTON = yes; then + if test $wxUSE_BMPBUTTON = yes; then result=no else result=yes fi else - result=$wxUSE_BUTTON + result=$wxUSE_BMPBUTTON fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -9715,34 +9621,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpbutton" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6; } - # Check whether --enable-bmpbutton was given. -if test "${enable_bmpbutton+set}" = set; then - enableval=$enable_bmpbutton; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpcombobox" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6; } + # Check whether --enable-bmpcombobox was given. +if test "${enable_bmpcombobox+set}" = set; then + enableval=$enable_bmpcombobox; if test "$enableval" = yes; then - wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes' + wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes' else - wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no' + wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no' fi else - wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}" + wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}" fi - eval "$wx_cv_use_bmpbutton" + eval "$wx_cv_use_bmpcombobox" if test x"$enablestring" = xdisable; then - if test $wxUSE_BMPBUTTON = yes; then + if test $wxUSE_BITMAPCOMBOBOX = yes; then result=no else result=yes fi else - result=$wxUSE_BMPBUTTON + result=$wxUSE_BITMAPCOMBOBOX fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -9759,34 +9665,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpcombobox" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6; } - # Check whether --enable-bmpcombobox was given. -if test "${enable_bmpcombobox+set}" = set; then - enableval=$enable_bmpcombobox; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-button" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6; } + # Check whether --enable-button was given. +if test "${enable_button+set}" = set; then + enableval=$enable_button; if test "$enableval" = yes; then - wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes' + wx_cv_use_button='wxUSE_BUTTON=yes' else - wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no' + wx_cv_use_button='wxUSE_BUTTON=no' fi else - wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}" + wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}" fi - eval "$wx_cv_use_bmpcombobox" + eval "$wx_cv_use_button" if test x"$enablestring" = xdisable; then - if test $wxUSE_BITMAPCOMBOBOX = yes; then + if test $wxUSE_BUTTON = yes; then result=no else result=yes fi else - result=$wxUSE_BITMAPCOMBOBOX + result=$wxUSE_BUTTON fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10233,6 +10139,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataviewctrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6; } + # Check whether --enable-dataviewctrl was given. +if test "${enable_dataviewctrl+set}" = set; then + enableval=$enable_dataviewctrl; + if test "$enableval" = yes; then + wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes' + else + wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no' + fi + +else + + wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}" + +fi + + + eval "$wx_cv_use_dataviewctrl" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_DATAVIEWCTRL = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_DATAVIEWCTRL + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -10287,34 +10237,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirpicker" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6; } - # Check whether --enable-dirpicker was given. -if test "${enable_dirpicker+set}" = set; then - enableval=$enable_dirpicker; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-detect_sm" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6; } + # Check whether --enable-detect_sm was given. +if test "${enable_detect_sm+set}" = set; then + enableval=$enable_detect_sm; if test "$enableval" = yes; then - wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes' + wx_cv_use_detect_sm='wxUSE_DETECT_SM=yes' else - wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no' + wx_cv_use_detect_sm='wxUSE_DETECT_SM=no' fi else - wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}" + wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}" fi - eval "$wx_cv_use_dirpicker" + eval "$wx_cv_use_detect_sm" if test x"$enablestring" = xdisable; then - if test $wxUSE_DIRPICKERCTRL = yes; then + if test $wxUSE_DETECT_SM = yes; then result=no else result=yes fi else - result=$wxUSE_DIRPICKERCTRL + result=$wxUSE_DETECT_SM fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10331,34 +10281,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-display" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6; } - # Check whether --enable-display was given. -if test "${enable_display+set}" = set; then - enableval=$enable_display; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirpicker" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6; } + # Check whether --enable-dirpicker was given. +if test "${enable_dirpicker+set}" = set; then + enableval=$enable_dirpicker; if test "$enableval" = yes; then - wx_cv_use_display='wxUSE_DISPLAY=yes' + wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes' else - wx_cv_use_display='wxUSE_DISPLAY=no' + wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no' fi else - wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}" + wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}" fi - eval "$wx_cv_use_display" + eval "$wx_cv_use_dirpicker" if test x"$enablestring" = xdisable; then - if test $wxUSE_DISPLAY = yes; then + if test $wxUSE_DIRPICKERCTRL = yes; then result=no else result=yes fi else - result=$wxUSE_DISPLAY + result=$wxUSE_DIRPICKERCTRL fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10375,34 +10325,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-detect_sm" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6; } - # Check whether --enable-detect_sm was given. -if test "${enable_detect_sm+set}" = set; then - enableval=$enable_detect_sm; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-display" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6; } + # Check whether --enable-display was given. +if test "${enable_display+set}" = set; then + enableval=$enable_display; if test "$enableval" = yes; then - wx_cv_use_detect_sm='wxUSE_DETECT_SM=yes' + wx_cv_use_display='wxUSE_DISPLAY=yes' else - wx_cv_use_detect_sm='wxUSE_DETECT_SM=no' + wx_cv_use_display='wxUSE_DISPLAY=no' fi else - wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}" + wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}" fi - eval "$wx_cv_use_detect_sm" + eval "$wx_cv_use_display" if test x"$enablestring" = xdisable; then - if test $wxUSE_DETECT_SM = yes; then + if test $wxUSE_DISPLAY = yes; then result=no else result=yes fi else - result=$wxUSE_DETECT_SM + result=$wxUSE_DISPLAY fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10463,34 +10413,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6; } - # Check whether --enable-filepicker was given. -if test "${enable_filepicker+set}" = set; then - enableval=$enable_filepicker; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filectrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-filectrl... $ECHO_C" >&6; } + # Check whether --enable-filectrl was given. +if test "${enable_filectrl+set}" = set; then + enableval=$enable_filectrl; if test "$enableval" = yes; then - wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes' + wx_cv_use_filectrl='wxUSE_FILECTRL=yes' else - wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no' + wx_cv_use_filectrl='wxUSE_FILECTRL=no' fi else - wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}" + wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}" fi - eval "$wx_cv_use_filepicker" + eval "$wx_cv_use_filectrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_FILEPICKERCTRL = yes; then + if test $wxUSE_FILECTRL = yes; then result=no else result=yes fi else - result=$wxUSE_FILEPICKERCTRL + result=$wxUSE_FILECTRL fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10507,34 +10457,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filectrl" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-filectrl... $ECHO_C" >&6; } - # Check whether --enable-filectrl was given. -if test "${enable_filectrl+set}" = set; then - enableval=$enable_filectrl; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6; } + # Check whether --enable-filepicker was given. +if test "${enable_filepicker+set}" = set; then + enableval=$enable_filepicker; if test "$enableval" = yes; then - wx_cv_use_filectrl='wxUSE_FILECTRL=yes' + wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes' else - wx_cv_use_filectrl='wxUSE_FILECTRL=no' + wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no' fi else - wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}" + wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}" fi - eval "$wx_cv_use_filectrl" + eval "$wx_cv_use_filepicker" if test x"$enablestring" = xdisable; then - if test $wxUSE_FILECTRL = yes; then + if test $wxUSE_FILEPICKERCTRL = yes; then result=no else result=yes fi else - result=$wxUSE_FILECTRL + result=$wxUSE_FILEPICKERCTRL fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10683,34 +10633,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataviewctrl" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6; } - # Check whether --enable-dataviewctrl was given. -if test "${enable_dataviewctrl+set}" = set; then - enableval=$enable_dataviewctrl; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-headerctrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-headerctrl... $ECHO_C" >&6; } + # Check whether --enable-headerctrl was given. +if test "${enable_headerctrl+set}" = set; then + enableval=$enable_headerctrl; if test "$enableval" = yes; then - wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes' + wx_cv_use_headerctrl='wxUSE_HEADERCTRL=yes' else - wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no' + wx_cv_use_headerctrl='wxUSE_HEADERCTRL=no' fi else - wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}" + wx_cv_use_headerctrl='wxUSE_HEADERCTRL=${'DEFAULT_wxUSE_HEADERCTRL":-$defaultval}" fi - eval "$wx_cv_use_dataviewctrl" + eval "$wx_cv_use_headerctrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_DATAVIEWCTRL = yes; then + if test $wxUSE_HEADERCTRL = yes; then result=no else result=yes fi else - result=$wxUSE_DATAVIEWCTRL + result=$wxUSE_HEADERCTRL fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -11069,6 +11019,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-popupwin" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6; } + # Check whether --enable-popupwin was given. +if test "${enable_popupwin+set}" = set; then + enableval=$enable_popupwin; + if test "$enableval" = yes; then + wx_cv_use_popupwin='wxUSE_POPUPWIN=yes' + else + wx_cv_use_popupwin='wxUSE_POPUPWIN=no' + fi + +else + + wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}" + +fi + + + eval "$wx_cv_use_popupwin" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_POPUPWIN = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_POPUPWIN + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -11157,6 +11151,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-rearrangectrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-rearrangectrl... $ECHO_C" >&6; } + # Check whether --enable-rearrangectrl was given. +if test "${enable_rearrangectrl+set}" = set; then + enableval=$enable_rearrangectrl; + if test "$enableval" = yes; then + wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=yes' + else + wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=no' + fi + +else + + wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=${'DEFAULT_wxUSE_REARRANGECTRL":-$defaultval}" + +fi + + + eval "$wx_cv_use_rearrangectrl" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_REARRANGECTRL = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_REARRANGECTRL + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -11685,50 +11723,6 @@ fi echo "${ECHO_T}$result" >&6; } - enablestring= - defaultval=$wxUSE_ALL_FEATURES - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tabdialog" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-tabdialog... $ECHO_C" >&6; } - # Check whether --enable-tabdialog was given. -if test "${enable_tabdialog+set}" = set; then - enableval=$enable_tabdialog; - if test "$enableval" = yes; then - wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=yes' - else - wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=no' - fi - -else - - wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}" - -fi - - - eval "$wx_cv_use_tabdialog" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_TAB_DIALOG = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_TAB_DIALOG - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -11783,34 +11777,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textctrl" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6; } - # Check whether --enable-textctrl was given. -if test "${enable_textctrl+set}" = set; then - enableval=$enable_textctrl; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarnative" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6; } + # Check whether --enable-tbarnative was given. +if test "${enable_tbarnative+set}" = set; then + enableval=$enable_tbarnative; if test "$enableval" = yes; then - wx_cv_use_textctrl='wxUSE_TEXTCTRL=yes' + wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes' else - wx_cv_use_textctrl='wxUSE_TEXTCTRL=no' + wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no' fi else - wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}" + wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}" fi - eval "$wx_cv_use_textctrl" + eval "$wx_cv_use_tbarnative" if test x"$enablestring" = xdisable; then - if test $wxUSE_TEXTCTRL = yes; then + if test $wxUSE_TOOLBAR_NATIVE = yes; then result=no else result=yes fi else - result=$wxUSE_TEXTCTRL + result=$wxUSE_TOOLBAR_NATIVE fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -11827,34 +11821,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-togglebtn" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6; } - # Check whether --enable-togglebtn was given. -if test "${enable_togglebtn+set}" = set; then - enableval=$enable_togglebtn; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textctrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6; } + # Check whether --enable-textctrl was given. +if test "${enable_textctrl+set}" = set; then + enableval=$enable_textctrl; if test "$enableval" = yes; then - wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes' + wx_cv_use_textctrl='wxUSE_TEXTCTRL=yes' else - wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no' + wx_cv_use_textctrl='wxUSE_TEXTCTRL=no' fi else - wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}" + wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}" fi - eval "$wx_cv_use_togglebtn" + eval "$wx_cv_use_textctrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_TOGGLEBTN = yes; then + if test $wxUSE_TEXTCTRL = yes; then result=no else result=yes fi else - result=$wxUSE_TOGGLEBTN + result=$wxUSE_TEXTCTRL fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -11871,34 +11865,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbar" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6; } - # Check whether --enable-toolbar was given. -if test "${enable_toolbar+set}" = set; then - enableval=$enable_toolbar; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipwindow" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6; } + # Check whether --enable-tipwindow was given. +if test "${enable_tipwindow+set}" = set; then + enableval=$enable_tipwindow; if test "$enableval" = yes; then - wx_cv_use_toolbar='wxUSE_TOOLBAR=yes' + wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes' else - wx_cv_use_toolbar='wxUSE_TOOLBAR=no' + wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no' fi else - wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}" + wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}" fi - eval "$wx_cv_use_toolbar" + eval "$wx_cv_use_tipwindow" if test x"$enablestring" = xdisable; then - if test $wxUSE_TOOLBAR = yes; then + if test $wxUSE_TIPWINDOW = yes; then result=no else result=yes fi else - result=$wxUSE_TOOLBAR + result=$wxUSE_TIPWINDOW fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -11915,34 +11909,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarnative" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6; } - # Check whether --enable-tbarnative was given. -if test "${enable_tbarnative+set}" = set; then - enableval=$enable_tbarnative; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-togglebtn" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6; } + # Check whether --enable-togglebtn was given. +if test "${enable_togglebtn+set}" = set; then + enableval=$enable_togglebtn; if test "$enableval" = yes; then - wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes' + wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes' else - wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no' + wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no' fi else - wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}" + wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}" fi - eval "$wx_cv_use_tbarnative" + eval "$wx_cv_use_togglebtn" if test x"$enablestring" = xdisable; then - if test $wxUSE_TOOLBAR_NATIVE = yes; then + if test $wxUSE_TOGGLEBTN = yes; then result=no else result=yes fi else - result=$wxUSE_TOOLBAR_NATIVE + result=$wxUSE_TOGGLEBTN fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -11959,34 +11953,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treebook" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6; } - # Check whether --enable-treebook was given. -if test "${enable_treebook+set}" = set; then - enableval=$enable_treebook; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbar" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6; } + # Check whether --enable-toolbar was given. +if test "${enable_toolbar+set}" = set; then + enableval=$enable_toolbar; if test "$enableval" = yes; then - wx_cv_use_treebook='wxUSE_TREEBOOK=yes' + wx_cv_use_toolbar='wxUSE_TOOLBAR=yes' else - wx_cv_use_treebook='wxUSE_TREEBOOK=no' + wx_cv_use_toolbar='wxUSE_TOOLBAR=no' fi else - wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}" + wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}" fi - eval "$wx_cv_use_treebook" + eval "$wx_cv_use_toolbar" if test x"$enablestring" = xdisable; then - if test $wxUSE_TREEBOOK = yes; then + if test $wxUSE_TOOLBAR = yes; then result=no else result=yes fi else - result=$wxUSE_TREEBOOK + result=$wxUSE_TOOLBAR fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -12047,78 +12041,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treectrl" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6; } - # Check whether --enable-treectrl was given. -if test "${enable_treectrl+set}" = set; then - enableval=$enable_treectrl; - if test "$enableval" = yes; then - wx_cv_use_treectrl='wxUSE_TREECTRL=yes' - else - wx_cv_use_treectrl='wxUSE_TREECTRL=no' - fi - -else - - wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}" - -fi - - - eval "$wx_cv_use_treectrl" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_TREECTRL = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_TREECTRL - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - - enablestring= - defaultval=$wxUSE_ALL_FEATURES - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipwindow" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6; } - # Check whether --enable-tipwindow was given. -if test "${enable_tipwindow+set}" = set; then - enableval=$enable_tipwindow; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treebook" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6; } + # Check whether --enable-treebook was given. +if test "${enable_treebook+set}" = set; then + enableval=$enable_treebook; if test "$enableval" = yes; then - wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes' + wx_cv_use_treebook='wxUSE_TREEBOOK=yes' else - wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no' + wx_cv_use_treebook='wxUSE_TREEBOOK=no' fi else - wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}" + wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}" fi - eval "$wx_cv_use_tipwindow" + eval "$wx_cv_use_treebook" if test x"$enablestring" = xdisable; then - if test $wxUSE_TIPWINDOW = yes; then + if test $wxUSE_TREEBOOK = yes; then result=no else result=yes fi else - result=$wxUSE_TIPWINDOW + result=$wxUSE_TREEBOOK fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -12135,34 +12085,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-popupwin" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6; } - # Check whether --enable-popupwin was given. -if test "${enable_popupwin+set}" = set; then - enableval=$enable_popupwin; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treectrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6; } + # Check whether --enable-treectrl was given. +if test "${enable_treectrl+set}" = set; then + enableval=$enable_treectrl; if test "$enableval" = yes; then - wx_cv_use_popupwin='wxUSE_POPUPWIN=yes' + wx_cv_use_treectrl='wxUSE_TREECTRL=yes' else - wx_cv_use_popupwin='wxUSE_POPUPWIN=no' + wx_cv_use_treectrl='wxUSE_TREECTRL=no' fi else - wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}" + wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}" fi - eval "$wx_cv_use_popupwin" + eval "$wx_cv_use_treectrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_POPUPWIN = yes; then + if test $wxUSE_TREECTRL = yes; then result=no else result=yes fi else - result=$wxUSE_POPUPWIN + result=$wxUSE_TREECTRL fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -33127,16 +33077,15 @@ fi USE_OPENGL=0 -if test "$wxUSE_OPENGL" = "yes"; then - if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then - { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5 -echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;} - wxUSE_OPENGL="no" - elif test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then +if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then + + + if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then OPENGL_LIBS="-framework OpenGL -framework AGL" elif test "$wxUSE_MSW" = 1; then OPENGL_LIBS="-lopengl32 -lglu32" - else + elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK2" = 1 -o "$wxUSE_GTK" = 1; then + { echo "$as_me:$LINENO: checking for OpenGL headers" >&5 echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6; } @@ -33394,10 +33343,23 @@ fi if test "x$OPENGL_LIBS" = "x"; then - { { echo "$as_me:$LINENO: error: OpenGL libraries not available" >&5 + if test "$wxUSE_OPENGL" = "yes"; then + { { echo "$as_me:$LINENO: error: OpenGL libraries not available" >&5 echo "$as_me: error: OpenGL libraries not available" >&2;} { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&5 +echo "$as_me: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&2;} + wxUSE_OPENGL=no + USE_OPENGL=0 + fi + else + wxUSE_OPENGL=yes fi + else + { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5 +echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;} + wxUSE_OPENGL="no" fi if test "$wxUSE_OPENGL" = "yes"; then @@ -33931,6 +33893,8 @@ done EOF chmod +x change-install-names fi + + HEADER_PAD_OPTION="-headerpad_max_install_names" ;; *-*-cygwin* | *-*-mingw32* ) @@ -34000,7 +33964,12 @@ if test "$cross_compiling" = "yes"; then TOOLCHAIN_FULLNAME="${host_alias}-$TOOLCHAIN_FULLNAME" fi -WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" + +if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then + WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" +else + WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" +fi if test "${TOOLKIT_DIR}" = "os2"; then WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" else @@ -34986,7 +34955,9 @@ _ACEOF fi -for ac_func in wcsdup + + +for ac_func in wcsdup strnlen wcsnlen do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -45417,15 +45388,10 @@ echo "$as_me: WARNING: Cannot use wxHTML-based help without wxHTML so it won't b fi if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then - if test "$wxUSE_CONSTRAINTS" != "yes"; then - { echo "$as_me:$LINENO: WARNING: Printing support cannot be used without constraints so it won't be compiled without it" >&5 -echo "$as_me: WARNING: Printing support cannot be used without constraints so it won't be compiled without it" >&2;} - else - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define wxUSE_PRINTING_ARCHITECTURE 1 _ACEOF - fi SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing" fi @@ -45683,6 +45649,10 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" -o "$wxUSE_CLIPBOARD" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd" fi +if test "$wxUSE_CLIPBOARD" = "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS clipboard" +fi + if test "$wxUSE_SPLINES" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define wxUSE_SPLINES 1 @@ -45897,6 +45867,14 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid" fi +if test "$wxUSE_HEADERCTRL" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_HEADERCTRL 1 +_ACEOF + + USES_CONTROLS=1 +fi + if test "$wxUSE_HYPERLINKCTRL" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_HYPERLINKCTRL 1 @@ -46009,6 +45987,13 @@ _ACEOF USES_CONTROLS=1 fi +if test "$wxUSE_REARRANGECTRL" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_REARRANGECTRL 1 +_ACEOF + +fi + if test "$wxUSE_SASH" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_SASH 1 @@ -46023,7 +46008,7 @@ if test "$wxUSE_SCROLLBAR" = "yes"; then _ACEOF USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll" fi if test "$wxUSE_SEARCHCTRL" = "yes"; then @@ -46112,13 +46097,6 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar" fi -if test "$wxUSE_TAB_DIALOG" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_TAB_DIALOG 1 -_ACEOF - -fi - if test "$wxUSE_TEXTCTRL" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_TEXTCTRL 1 @@ -46646,15 +46624,10 @@ _ACEOF fi if test "$wxUSE_PROGRESSDLG" = "yes"; then - if test "$wxUSE_CONSTRAINTS" != "yes"; then - { echo "$as_me:$LINENO: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&5 -echo "$as_me: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&2;} - else - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define wxUSE_PROGRESSDLG 1 _ACEOF - fi fi if test "$wxUSE_SPLASH" = "yes"; then @@ -46666,15 +46639,10 @@ _ACEOF fi if test "$wxUSE_STARTUP_TIPS" = "yes"; then - if test "$wxUSE_CONSTRAINTS" != "yes"; then - { echo "$as_me:$LINENO: WARNING: Startup tips requires constraints and won't be compiled without them" >&5 -echo "$as_me: WARNING: Startup tips requires constraints and won't be compiled without them" >&2;} - else - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define wxUSE_STARTUP_TIPS 1 _ACEOF - fi fi if test "$wxUSE_TEXTDLG" = "yes"; then @@ -46857,7 +46825,7 @@ fi USE_MEDIA=0 -if test "$wxUSE_MEDIACTRL" = "yes"; then +if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then USE_MEDIA=1 if test "$wxUSE_GTK" = 1; then @@ -47053,6 +47021,15 @@ _ACEOF #define wxUSE_MEDIACTRL 1 _ACEOF + else + if test "$wxUSE_MEDIACTRL" = "yes"; then + { { echo "$as_me:$LINENO: error: GStreamer not available" >&5 +echo "$as_me: error: GStreamer not available" >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: WARNING: GStreamer not available... disabling wxMediaCtrl" >&5 +echo "$as_me: WARNING: GStreamer not available... disabling wxMediaCtrl" >&2;} + fi fi fi @@ -47463,6 +47440,7 @@ fi + case "$TOOLKIT" in GTK) TOOLKIT_DESC="GTK+" @@ -51853,10 +51831,6 @@ host!$host$ac_delim host_cpu!$host_cpu$ac_delim host_vendor!$host_vendor$ac_delim host_os!$host_os$ac_delim -target!$target$ac_delim -target_cpu!$target_cpu$ac_delim -target_vendor!$target_vendor$ac_delim -target_os!$target_os$ac_delim wx_top_builddir!$wx_top_builddir$ac_delim CC!$CC$ac_delim CFLAGS!$CFLAGS$ac_delim @@ -51905,6 +51879,10 @@ GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim HILDON_LIBS!$HILDON_LIBS$ac_delim +CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim +CAIRO_LIBS!$CAIRO_LIBS$ac_delim +GST_CFLAGS!$GST_CFLAGS$ac_delim +GST_LIBS!$GST_LIBS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51946,10 +51924,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim -CAIRO_LIBS!$CAIRO_LIBS$ac_delim -GST_CFLAGS!$GST_CFLAGS$ac_delim -GST_LIBS!$GST_LIBS$ac_delim ALL_WX_LIBS!$ALL_WX_LIBS$ac_delim BUILT_WX_LIBS!$BUILT_WX_LIBS$ac_delim STD_BASE_LIBS!$STD_BASE_LIBS$ac_delim @@ -51989,6 +51963,7 @@ TOOLKIT_LOWERCASE!$TOOLKIT_LOWERCASE$ac_delim TOOLKIT_VERSION!$TOOLKIT_VERSION$ac_delim SAMPLES_RPATH_FLAG!$SAMPLES_RPATH_FLAG$ac_delim SAMPLES_RPATH_POSTLINK!$SAMPLES_RPATH_POSTLINK$ac_delim +HEADER_PAD_OPTION!$HEADER_PAD_OPTION$ac_delim HOST_SUFFIX!$HOST_SUFFIX$ac_delim CPPUNIT_CFLAGS!$CPPUNIT_CFLAGS$ac_delim CPPUNIT_LIBS!$CPPUNIT_LIBS$ac_delim @@ -52043,6 +52018,9 @@ SETFILE!$SETFILE$ac_delim OBJCXXFLAGS!$OBJCXXFLAGS$ac_delim GCC_PCH!$GCC_PCH$ac_delim ICC_PCH!$ICC_PCH$ac_delim +ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim +ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$ac_delim +BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -52084,9 +52062,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim -ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$ac_delim -BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim @@ -52181,6 +52156,9 @@ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_de COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim +COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim +COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim +COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -52222,9 +52200,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim -COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim -COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim COND_SHARED_0_wxUSE_ZLIB_builtin!$COND_SHARED_0_wxUSE_ZLIB_builtin$ac_delim COND_SHARED_1!$COND_SHARED_1$ac_delim COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim @@ -52319,6 +52294,9 @@ WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim USE_GUI!$USE_GUI$ac_delim AFMINSTALL!$AFMINSTALL$ac_delim WIN32INSTALL!$WIN32INSTALL$ac_delim +TOOLKIT!$TOOLKIT$ac_delim +TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim +TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -52360,9 +52338,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -TOOLKIT!$TOOLKIT$ac_delim -TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim -TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim cross_compiling!$cross_compiling$ac_delim WIDGET_SET!$WIDGET_SET$ac_delim @@ -52400,7 +52375,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` = 38; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5