--- configure.in	2013-06-18 12:22:10.000000000 +0000
+++ /usr/src/configure.in	2013-06-18 12:44:24.717897287 +0000
@@ -399,23 +399,7 @@
 AC_MSG_CHECKING([for ODBC headers and libraries])
 for i in $ODBC_DIR ; do
    if test -r "$i/include/iodbc/sql.h" -o -r "$i/include/sql.h" ; then
-      if test -r "$i/include/iodbc/iodbcinst.h" ; then
-         ODBC_FLAGS="-DHAVE_IODBC=1 -I$i/include/iodbc"
-         if test -r "$i/lib/libiodbcinst.la" ; then
-            ODBC_LIB="$i/lib/libiodbcinst.la"
-         else
-            ODBC_LIB=-liodbcinst
-         fi
-         break
-      elif test -r "$i/include/iodbcinst.h" ; then
-         ODBC_FLAGS="-DHAVE_IODBC=1 -I$i/include"
-         if test -r "$i/lib/libiodbcinst.la" ; then
-            ODBC_LIB="$i/lib/libiodbcinst.la"
-         else
-            ODBC_LIB=-liodbcinst
-         fi
-         break
-      elif test -r "$i/include/odbcinst.h" ; then
+      if test -r "$i/include/odbcinst.h" ; then
          ODBC_FLAGS="-DHAVE_UNIXODBC=1 -I$i/include"
          if test -r "$i/lib/libodbcinst.la" ; then
             ODBC_LIB="$i/lib/libodbcinst.la"
@@ -432,6 +416,22 @@
          fi
          break
       fi
+      elif test -r "$i/include/iodbc/iodbcinst.h" ; then
+         ODBC_FLAGS="-DHAVE_IODBC=1 -I$i/include/iodbc"
+         if test -r "$i/lib/libiodbcinst.la" ; then
+            ODBC_LIB="$i/lib/libiodbcinst.la"
+         else
+            ODBC_LIB=-liodbcinst
+         fi
+         break
+      elif test -r "$i/include/iodbcinst.h" ; then
+         ODBC_FLAGS="-DHAVE_IODBC=1 -I$i/include"
+         if test -r "$i/lib/libiodbcinst.la" ; then
+            ODBC_LIB="$i/lib/libiodbcinst.la"
+         else
+            ODBC_LIB=-liodbcinst
+         fi
+         break
    fi
 done
 if test "$ODBC_FLAGS" = "UNKNOWN" -o "$ODBC_LIB" = "UNKNOWN" ; then