X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6d984e2f022b3eca98c3600557f5f0d329a842f..a90280fe1ac7b78563d44afffd1d3b0b521b5cd6:/configure diff --git a/configure b/configure index 9fbca53ce4..c0fba3772b 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 57865 2009-01-06 22:28:16Z VS . +# From configure.in Id: configure.in 58155 2009-01-16 19:03:26Z VZ . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # @@ -1805,6 +1805,7 @@ Optional Features: --enable-fontpicker use wxFontPickerCtrl class --enable-gauge use wxGauge class --enable-grid use wxGrid class + --enable-headerctrl use wxHeaderCtrl class --enable-hyperlink use wxHyperlinkCtrl class --enable-imaglist use wxImageList class --enable-listbook use wxListbook class @@ -3214,6 +3215,10 @@ fi echo "${ECHO_T}$result" >&6; } +if test "$wxUSE_ALL_FEATURES" = "no"; then + DEFAULT_wxUSE_MEDIACTRL=no +fi + if test "$wxUSE_GUI" = "yes"; then @@ -5434,6 +5439,11 @@ fi echo "${ECHO_T}$result" >&6; } +cat >>confdefs.h <<\_ACEOF +#define wxEVENTS_COMPATIBILITY_2_8 0 +_ACEOF + + enablestring=disable defaultval= @@ -9440,6 +9450,7 @@ if test "$wxUSE_CONTROLS" = "no"; then 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 @@ -10616,6 +10627,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}-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_headerctrl='wxUSE_HEADERCTRL=yes' + else + wx_cv_use_headerctrl='wxUSE_HEADERCTRL=no' + fi + +else + + wx_cv_use_headerctrl='wxUSE_HEADERCTRL=${'DEFAULT_wxUSE_HEADERCTRL":-$defaultval}" + +fi + + + eval "$wx_cv_use_headerctrl" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_HEADERCTRL = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_HEADERCTRL + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -34904,7 +34959,11 @@ _ACEOF fi -for ac_func in wcsdup + + + + +for ac_func in wcsdup strnlen wcsnlen wcscasecmp wcsncasecmp do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -45814,6 +45873,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