Contrary to what I had thought, the addSubview and replaceSubview:with:

[wxWidgets.git] / configure

diff --git a/configure b/configure
index de2ca6861609fa0e8d8b369a30551801c2bf9b8a..e214a94960ac61c8e1c29e532e45ec630a6e6ff4 100755 (executable)
--- a/configure
+++ b/configure
@@ -2114,7 +2114,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_ICO_CUR=no
   DEFAULT_wxUSE_ACCESSIBILITY=no
 
-  DEFAULT_wxUSE_MONOLITHIC=yes
+  DEFAULT_wxUSE_MONOLITHIC=no
   DEFAULT_wxUSE_OFFICIAL_BUILD=no
 else
   DEFAULT_wxUSE_UNIVERSAL=no
@@ -2290,7 +2290,7 @@ else
   DEFAULT_wxUSE_ICO_CUR=yes
   DEFAULT_wxUSE_ACCESSIBILITY=no
 
-  DEFAULT_wxUSE_MONOLITHIC=yes
+  DEFAULT_wxUSE_MONOLITHIC=no
   DEFAULT_wxUSE_OFFICIAL_BUILD=no
 fi
 
@@ -25194,7 +25194,7 @@ _ACEOF
 #define wxUSE_GLCANVAS 1
 _ACEOF
 
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl opengl/cube opengl/penguin opengl/isosurf"
     fi
 fi
 
@@ -33425,8 +33425,9 @@ CORE_GUI_LIBS="adv core"
 if test "$wxUSE_XML" = "yes" ; then
     CORE_BASE_LIBS="xml $CORE_BASE_LIBS"
 fi
-if test "$wxUSE_ODBC" = "yes" ; then
-    CORE_GUI_LIBS="odbc $CORE_GUI_LIBS"
+if test "$wxUSE_ODBC" != "no" ; then
+    CORE_BASE_LIBS="odbc $CORE_BASE_LIBS"
+    CORE_GUI_LIBS="dbgrid $CORE_GUI_LIBS"
 fi
 if test "$wxUSE_HTML" = "yes" ; then
     CORE_GUI_LIBS="html $CORE_GUI_LIBS"