Various config.test fixes.

Last-Update: 2010-05-24

            Build ibase sql plugin against firebird.
            Add gstreamer include path.

Gbp-Pq: Name 10_config_tests_fixes.diff

diff --git a/config.tests/unix/gstreamer/gstreamer.pro b/config.tests/unix/gstreamer/gstreamer.pro
index 7d4aa8e2e5e3ba8e62158303b7a30cde3cbe22ca..d4e58aeebede707de6266ffc76b3a33ffeba2602 100644 (file)
--- a/config.tests/unix/gstreamer/gstreamer.pro
+++ b/config.tests/unix/gstreamer/gstreamer.pro
@@ -1,3 +1,4 @@
 SOURCES = gstreamer.cpp
 CONFIG -= qt
 LIBS += -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10
+INCLUDEPATH += /usr/include/gstreamer-0.10

diff --git a/config.tests/unix/ibase/ibase.pro b/config.tests/unix/ibase/ibase.pro
index 01e74297337b3ea1879bc66796786fef405549ce..415b51df59e05eac6fca8ca3b6b41489c16f2980 100644 (file)
--- a/config.tests/unix/ibase/ibase.pro
+++ b/config.tests/unix/ibase/ibase.pro
@@ -1,4 +1,4 @@
 SOURCES = ibase.cpp
 CONFIG -= qt dylib
 mac:CONFIG -= app_bundle
-LIBS += -lgds
+LIBS += -lfbclient

diff --git a/config.tests/unix/sqlite/sqlite.pro b/config.tests/unix/sqlite/sqlite.pro
index ba2cac1465505e9241694010a46dc7dddd33172d..81cb4dad2a044141bed84a9f489766e1651d45dd 100644 (file)
--- a/config.tests/unix/sqlite/sqlite.pro
+++ b/config.tests/unix/sqlite/sqlite.pro
@@ -1,3 +1,4 @@
 SOURCES = sqlite.cpp
 CONFIG -= qt dylib
 mac:CONFIG -= app_bundle
+LIBS += -ldl

diff --git a/src/sql/drivers/ibase/qsql_ibase.pri b/src/sql/drivers/ibase/qsql_ibase.pri
index 33fbb0de30dde4de709856849c5e24772db34e4e..05da731abc0d6b546975c9327617e1d55f6211a5 100644 (file)
--- a/src/sql/drivers/ibase/qsql_ibase.pri
+++ b/src/sql/drivers/ibase/qsql_ibase.pri
@@ -2,7 +2,7 @@ HEADERS += $$PWD/qsql_ibase.h
 SOURCES += $$PWD/qsql_ibase.cpp
 
 unix {
-    !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lgds
+    !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lfbclient
 } else {
     !contains(LIBS, .*gds.*):!contains(LIBS, .*fbclient.*) {
         win32-borland:LIBS += gds32.lib