added opengl samples

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 8f6cc5104f37743fd8a74d0dbb4747d3b1c8cb6b..4a508717c37ca29ec2faa19aceec4a08b6af326d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -503,7 +503,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
@@ -679,7 +679,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
 
@@ -2980,7 +2980,7 @@ if test "$wxUSE_OPENGL" = "yes"; then
         USE_OPENGL=1
         AC_DEFINE(wxUSE_OPENGL)
         AC_DEFINE(wxUSE_GLCANVAS)
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl opengl/cube opengl/penguin opengl/isosurf"
     fi
 fi
 
@@ -5402,8 +5402,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"