Connector/ODBC 5 commit: r761 - in branches/feature-linux-port: . Driver/Driver/Tests SDK/Installer/Tests SDK/MYSQLPlus/Tests Tools/Installer Tools/Sh...

[jbalint]

Modified:
   branches/feature-linux-port/Driver/Driver/Tests/Tests.pro
   branches/feature-linux-port/SDK/Installer/Tests/Tests.pro
   branches/feature-linux-port/SDK/MYSQLPlus/Tests/Tests.pro
   branches/feature-linux-port/Tools/Installer/Installer.pro
   branches/feature-linux-port/Tools/Shell/Shell.pro
   branches/feature-linux-port/odbc.pri
Log:
link to odbc libs only when needed (especially not in driver)


Modified: branches/feature-linux-port/Driver/Driver/Tests/Tests.pro
===================================================================
--- branches/feature-linux-port/Driver/Driver/Tests/Tests.pro	2007-01-05 18:09:11 UTC (rev
760)
+++ branches/feature-linux-port/Driver/Driver/Tests/Tests.pro	2007-01-09 20:30:08 UTC (rev
761)
@@ -13,6 +13,7 @@
 LIBS		+= -lMYODBCTst
 
 include( ../../../odbc.pri )
+LIBS        += $$ODBCLIBS
 
 # #########################################################
 # WIN32

Modified: branches/feature-linux-port/SDK/Installer/Tests/Tests.pro
===================================================================
--- branches/feature-linux-port/SDK/Installer/Tests/Tests.pro	2007-01-05 18:09:11 UTC (rev
760)
+++ branches/feature-linux-port/SDK/Installer/Tests/Tests.pro	2007-01-09 20:30:08 UTC (rev
761)
@@ -16,6 +16,7 @@
 LIBS		+= -lMYODBCDbg
 LIBS		+= -lMYODBCC
 include( ../../../odbc.pri )
+LIBS        += $$ODBCLIBS
 
 # #########################################################
 # WIN

Modified: branches/feature-linux-port/SDK/MYSQLPlus/Tests/Tests.pro
===================================================================
--- branches/feature-linux-port/SDK/MYSQLPlus/Tests/Tests.pro	2007-01-05 18:09:11 UTC (rev
760)
+++ branches/feature-linux-port/SDK/MYSQLPlus/Tests/Tests.pro	2007-01-09 20:30:08 UTC (rev
761)
@@ -19,6 +19,7 @@
 LIBS		+= -lMYODBCDbg
 LIBS		+= -lMYODBCC
 include( ../../../mysql.pri )
+LIBS        += $$ODBCLIBS
 
 # #########################################################
 # WIN

Modified: branches/feature-linux-port/Tools/Installer/Installer.pro
===================================================================
--- branches/feature-linux-port/Tools/Installer/Installer.pro	2007-01-05 18:09:11 UTC (rev
760)
+++ branches/feature-linux-port/Tools/Installer/Installer.pro	2007-01-09 20:30:08 UTC (rev
761)
@@ -22,6 +22,7 @@
 LIBS            += -lMYODBCDbg
 LIBS            += -lMYODBCC
 include( ../../odbc.pri )
+LIBS            += $$ODBCLIBS
 
 # #########################################################
 # WIN

Modified: branches/feature-linux-port/Tools/Shell/Shell.pro
===================================================================
--- branches/feature-linux-port/Tools/Shell/Shell.pro	2007-01-05 18:09:11 UTC (rev 760)
+++ branches/feature-linux-port/Tools/Shell/Shell.pro	2007-01-09 20:30:08 UTC (rev 761)
@@ -22,6 +22,7 @@
 LIBS            += -lMYODBCDbg
 LIBS            += -lMYODBCC
 include( ../../odbc.pri )
+LIBS            += $$ODBCLIBS
 
 # #########################################################
 # WIN

Modified: branches/feature-linux-port/odbc.pri
===================================================================
--- branches/feature-linux-port/odbc.pri	2007-01-05 18:09:11 UTC (rev 760)
+++ branches/feature-linux-port/odbc.pri	2007-01-09 20:30:08 UTC (rev 761)
@@ -19,7 +19,7 @@
 # WIN32
 # #########################################################
 win32 {
-        LIBS            += odbc32.lib odbccp32.lib
+    ODBCLIBS += odbc32.lib odbccp32.lib
 }
 
 # #########################################################
@@ -28,14 +28,14 @@
 mac {
 } else:unix {
     INCLUDEPATH += $(ODBC_DIR)/include
-	LIBS        += -L$(ODBC_DIR)/lib -liodbc -liodbcinst
-    #LIBS       += -L$(ODBC_DIR)/lib -lodbc -lodbcinst
+    ODBCLIBS        += -L$(ODBC_DIR)/lib -liodbc -liodbcinst
+    #ODBCLIBS        += -L$(ODBC_DIR)/lib -lodbc -lodbcinst
 }
 
 # #########################################################
 # OSX
 # #########################################################
 mac {
-        LIBS    += -liodbc -liodbcinst
+    ODBCLIBS += -liodbc -liodbcinst
 }