don't allow setting readonly combobox value to a string which is not one of the valid...

[wxWidgets.git] / configure

diff --git a/configure b/configure
index 9fbca53ce483f88bcda26c34812234355710a9bb..dbf683d8bc1a11592401742470457ae41c0aaec8 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Id: configure.in 57865 2009-01-06 22:28:16Z VS .
+# From configure.in Id: configure.in 58985 2009-02-18 11:05:38Z FM .

 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
 # 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-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
   --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; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 

+if test "$wxUSE_ALL_FEATURES" = "no"; then
+                    DEFAULT_wxUSE_MEDIACTRL=no
+fi
+

 
 if test "$wxUSE_GUI" = "yes"; then
 
 
 if test "$wxUSE_GUI" = "yes"; then
 


@@ -5434,6 +5439,11 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 

+cat >>confdefs.h <<\_ACEOF
+#define wxEVENTS_COMPATIBILITY_2_8 0
+_ACEOF
+
+

 
           enablestring=disable
           defaultval=
 
           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_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_HYPERLINKCTRL=no
     DEFAULT_wxUSE_IMAGLIST=no
     DEFAULT_wxUSE_LISTBOOK=no


@@ -10616,6 +10627,50 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
 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
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then


@@ -34904,7 +34959,11 @@ _ACEOF
     fi
 
 
     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
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5


@@ -41356,7 +41415,10 @@ _ACEOF
 fi
 
 DEBUG_CFLAGS=
 fi
 
 DEBUG_CFLAGS=

-if test "$wxUSE_DEBUG_INFO" = "yes" ; then
+if `echo $CXXFLAGS $CFLAGS | grep " -g" >/dev/null`; then
+                    { echo "$as_me:$LINENO: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&5
+echo "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&2;}
+elif test "$wxUSE_DEBUG_INFO" = "yes" ; then

     DEBUG_CFLAGS="-g"
 fi
 
     DEBUG_CFLAGS="-g"
 fi
 


@@ -41428,22 +41490,27 @@ if test "$GCC" = "yes" ; then
 fi
 
 OPTIMISE_CFLAGS=
 fi
 
 OPTIMISE_CFLAGS=

-if test "$wxUSE_OPTIMISE" = "no" ; then
-    if test "$GCC" = yes ; then
-                        OPTIMISE_CFLAGS="-O0"
-    fi
+if `echo $CXXFLAGS $CFLAGS | grep " -O" >/dev/null`; then
+                    { echo "$as_me:$LINENO: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&5
+echo "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&2;}

 else
 else

-    if test "$GCC" = yes ; then
-        case "${host}" in
-            *-pc-os2_emx | *-pc-os2-emx )
-                                                OPTIMISE_CFLAGS="-O2"
-            ;;
-            *)
-                                                                OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing"
-            ;;
-        esac
+    if test "$wxUSE_OPTIMISE" = "no" ; then
+        if test "$GCC" = yes ; then
+                                    OPTIMISE_CFLAGS="-O0"
+        fi

     else
     else

-        OPTIMISE_CFLAGS="-O"
+        if test "$GCC" = yes ; then
+            case "${host}" in
+                *-pc-os2_emx | *-pc-os2-emx )
+                                                            OPTIMISE_CFLAGS="-O2"
+                ;;
+                *)
+                                                                                OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing"
+                ;;
+            esac
+        else
+            OPTIMISE_CFLAGS="-O"
+        fi

     fi
 fi
 
     fi
 fi
 


@@ -45814,6 +45881,14 @@ _ACEOF
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi
 
   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
 if test "$wxUSE_HYPERLINKCTRL" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
 #define wxUSE_HYPERLINKCTRL 1


@@ -45882,7 +45957,6 @@ if test "$wxUSE_EDITABLELISTBOX" = "yes"; then
 _ACEOF
 
     USES_CONTROLS=1
 _ACEOF
 
     USES_CONTROLS=1

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS editlbox"

 fi
 
 if test "$wxUSE_NOTEBOOK" = "yes"; then
 fi
 
 if test "$wxUSE_NOTEBOOK" = "yes"; then


@@ -47082,9 +47156,8 @@ if test "$wxUSE_GUI" = "yes"; then
 
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
 
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \

-                     erase event exec font image minimal mobile \
-                     mobile/wxedit mobile/styles render \
-                     shaped svg taborder vscroll widgets"
+                     erase event exec font image minimal render \
+                     shaped svg taborder vscroll widgets wrapsizer"

 
     if test "$wxUSE_MONOLITHIC" != "yes"; then
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
 
     if test "$wxUSE_MONOLITHIC" != "yes"; then
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"