--- configure.in.old	2009-04-28 05:38:49.000000000 +0200
+++ configure.in	2009-09-18 14:11:18.000000000 +0200
@@ -4152,16 +4152,22 @@
         dnl This is not ideal we really ough to use the unixodbc-config
         dnl  or iodbc-config if they exist.
 
+        save_CPPFLAGS="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS -I/usr/include/iodbc"
+        AC_CHECK_HEADER([sql.h], [found_sql_h=1],, [])
+        CPPFLAGS="$save_CPPFLAGS"
+        if test "x$found_sql_h" = "x1" ; then
+            WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -I/usr/include/iodbc"
+            AC_CHECK_LIB(iodbc, SQLAllocEnv, ODBC_LINK=" -liodbc")
+        else
         AC_CHECK_HEADER([sql.h], [found_sql_h=1],, [ ])
         if test "x$found_sql_h" = "x1" ; then
-            AC_CHECK_LIB(iodbc, SQLAllocEnv, ODBC_LINK=" -liodbc",
+            AC_CHECK_LIB(unixodbc, SQLAllocEnv, ODBC_LINK=" -lunixodbc",
             [
-                AC_CHECK_LIB(unixodbc, SQLAllocEnv, ODBC_LINK=" -lunixodbc",
-                [
-                    AC_CHECK_LIB(odbc, SQLAllocEnv, ODBC_LINK=" -lodbc")
-                ])
+                AC_CHECK_LIB(odbc, SQLAllocEnv, ODBC_LINK=" -lodbc")
             ])
         fi
+        fi
         if test "x$ODBC_LINK" = "x" ; then
             if test "$wxUSE_ODBC" = "sys" ; then
                 AC_MSG_ERROR([system ODBC library not found! Use --with-odbc=builtin to use built-in version])