builtin iODBC build fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

configure.in

@@ -2922,6 +2922,9 @@ if test "$TOOLKIT" != "MSW" ; then
     fi
     if test "$wxUSE_ODBC" != "no" ; then
         AC_DEFINE(wxUSE_ODBC)
+        if test "$wxUSE_ODBC" = "builtin" ; then
+            AC_DEFINE(wxUSE_BUILTIN_IODBC)
+        fi
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
     
         dnl is this still necessary in 2.5?

include/wx/db.h

@@ -81,10 +81,15 @@
         #include <windows.h>
         #include "wx/msw/winundef.h"
     #endif
-    // Use the ones from the library
     extern "C" {
+    #if defined(wxUSE_BUILTIN_IODBC) && wxUSE_BUILTIN_IODBC
+        // Use the ones from the library
+        #include "wx/isql.h"
+        #include "wx/isqlext.h"
+    #else
         #include <sql.h>
         #include <sqlext.h>
+    #endif
     }
 #endif
 

setup.h.in

@@ -198,6 +198,7 @@
  * Use iODBC
  */
 #define wxUSE_ODBC 0
+#define wxUSE_BUILTIN_IODBC 0
 #define wxODBC_FWD_ONLY_CURSORS 1
 #define wxODBC_BACKWARD_COMPATABILITY 0
 /*