Mercurial > mxe-octave

changeset 1947:bd2c578f0833

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package qt: handle gnutls dependency introduced by freetds
author Mark Brand <mabrand@mabrand.nl>
date Wed, 17 Aug 2011 10:14:00 +0200
parents c6831f324cc3
children 5e36c7b9112f
files src/qt-test.pro src/qt.mk
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt-test.pro	Mon Aug 15 12:40:35 2011 +0200
+++ b/src/qt-test.pro	Wed Aug 17 10:14:00 2011 +0200
@@ -2,5 +2,6 @@
 # See doc/index.html for further information.
 
 TARGET   = test-qt
+QT += network sql
 SOURCES += qt-test.cpp
 FORMS   += qt-test.ui
--- a/src/qt.mk	Mon Aug 15 12:40:35 2011 +0200
+++ b/src/qt.mk	Wed Aug 17 10:14:00 2011 +0200
@@ -28,7 +28,7 @@
     cd '$(1)' && \
         OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \
         PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl` -lws2_32" \
-        SYBASE_LIBS="-lsybdb -liconv -lws2_32" \
+        SYBASE_LIBS="-lsybdb -liconv -lws2_32 `'$(TARGET)-pkg-config' --libs-only-l gnutls`" \
         ./configure \
         -opensource \
         -confirm-license \