Connector/ODBC 5 commit: r793 - trunk

[pharvey]

Modified:
   trunk/odbc.pri
Log:
build against unixODBC


Modified: trunk/odbc.pri
===================================================================
--- trunk/odbc.pri	2007-02-11 23:39:42 UTC (rev 792)
+++ trunk/odbc.pri	2007-02-12 08:03:46 UTC (rev 793)
@@ -28,12 +28,37 @@
 # #########################################################
 mac {
 } else:unix {
-    INCLUDEPATH += $(ODBC_DIR)/include
-    ODBCLIBS = -L$(ODBC_DIR)/lib -liodbc -liodbcinst
-    ODBCINST = -L$(ODBC_DIR)/lib -liodbcinst
 
-    #ODBCLIBS += -L$(ODBC_DIR)/lib -lodbc -lodbcinst
-    #ODBCINST = -L$(ODBC_DIR)/lib -lodbcinst
+#
+#    iODBC
+#
+
+#    INCLUDEPATH += $(ODBC_DIR)/include
+#    ODBCLIBS = -L$(ODBC_DIR)/lib -liodbc -liodbcinst
+#    ODBCINST = -L$(ODBC_DIR)/lib -liodbcinst
+
+#
+#   unixODBC
+#
+#   unixODBC versions older than 2.2.12 may not have some of 
+#   the 'wide char' stuff for the installer API. For example;
+#   in SuSE 10.1. In such a case one should;
+#
+#   1. ensure any existing unixODBC/iODBC is removed from sys
+#   2. download latest source tar-ball from www.unixodbc.org
+#   3. configure/make/install
+#
+#   NOTE: unixODBC does not, at this time, support Qt4 so one
+#         must build with Qt3 or disable-gui with configure.
+#
+    INCLUDEPATH     += $$system(odbc_config --include-prefix)
+    LIBS            += $$system(odbc_config --libs)
+    LIBS            += -lodbcinst
+    QMAKE_CFLAGS    += $$system(odbc_config --cflags)
+    QMAKE_CXXFLAGS  += $$system(odbc_config --cflags)
+
+#   ODBCLIBS += -L$(ODBC_DIR)/lib -lodbc -lodbcinst
+#   ODBCINST = -L$(ODBC_DIR)/lib -lodbcinst
 }
 
 # #########################################################