Reverted wxMGL/OpenWatcom fix until some difficoulties will not be solved.

[wxWidgets.git] / configure

diff --git a/configure b/configure
index 8f2a3ced468928c1d022acf051b1ab130fbb7b25..c64fbeddbf2cbce97c840f8a600ad1ad503d148f 100755 (executable)
--- a/configure
+++ b/configure
@@ -967,6 +967,7 @@ Optional Features:
   --enable-checkbox       use wxCheckBox class
   --enable-checklst       use wxCheckListBox (listbox with checkboxes) class
   --enable-choice         use wxChoice class
+  --enable-choicebook     use wxChoicebook class
   --enable-combobox       use wxComboBox class
   --enable-display        use wxDisplay class
   --enable-gauge          use wxGauge class
@@ -2145,6 +2146,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_CHECKBOX=no
   DEFAULT_wxUSE_CHECKLST=no
   DEFAULT_wxUSE_CHOICE=no
+  DEFAULT_wxUSE_CHOICEBOOK=no
   DEFAULT_wxUSE_COMBOBOX=no
   DEFAULT_wxUSE_DISPLAY=no
   DEFAULT_wxUSE_GAUGE=no
@@ -2329,6 +2331,7 @@ else
   DEFAULT_wxUSE_CHECKBOX=yes
   DEFAULT_wxUSE_CHECKLST=yes
   DEFAULT_wxUSE_CHOICE=yes
+  DEFAULT_wxUSE_CHOICEBOOK=yes
   DEFAULT_wxUSE_COMBOBOX=yes
   DEFAULT_wxUSE_DISPLAY=yes
   DEFAULT_wxUSE_GAUGE=yes
@@ -6889,6 +6892,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_CHECKBOX=yes
   DEFAULT_wxUSE_CHECKLISTBOX=yes
   DEFAULT_wxUSE_CHOICE=yes
+  DEFAULT_wxUSE_CHOICEBOOK=yes
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes
   DEFAULT_wxUSE_IMAGLIST=yes
@@ -6927,6 +6931,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_CHECKBOX=no
   DEFAULT_wxUSE_CHECKLISTBOX=no
   DEFAULT_wxUSE_CHOICE=no
+  DEFAULT_wxUSE_CHOICEBOOK=no
   DEFAULT_wxUSE_GAUGE=no
   DEFAULT_wxUSE_GRID=no
   DEFAULT_wxUSE_IMAGLIST=no
@@ -7294,6 +7299,47 @@ echo "${ECHO_T}no" >&6
           fi
 
 
+         enablestring=
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicebook" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-choicebook... $ECHO_C" >&6
+          no_cache=0
+          # Check whether --enable-choicebook or --disable-choicebook was given.
+if test "${enable_choicebook+set}" = set; then
+  enableval="$enable_choicebook"
+
+                          if test "$enableval" = yes; then
+                            ac_cv_use_choicebook='wxUSE_CHOICEBOOK=yes'
+                          else
+                            ac_cv_use_choicebook='wxUSE_CHOICEBOOK=no'
+                          fi
+
+else
+
+                          LINE=`grep "wxUSE_CHOICEBOOK" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_choicebook='wxUSE_CHOICEBOOK='$DEFAULT_wxUSE_CHOICEBOOK
+
+fi;
+
+          eval "$ac_cv_use_choicebook"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_choicebook >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_CHOICEBOOK" = 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}-combobox" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-combobox... $ECHO_C" >&6
@@ -36273,6 +36319,14 @@ _ACEOF
   USES_CONTROLS=1
 fi
 
+if test "$wxUSE_CHOICEBOOK" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_CHOICEBOOK 1
+_ACEOF
+
+    USES_CONTROLS=1
+fi
+
 if test "$wxUSE_CHECKBOX" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
 #define wxUSE_CHECKBOX 1