From c8c53e2812bb2aa52eeb174af5b2054a8f96dad8 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Mon, 23 Jul 2007 09:48:51 +0000 Subject: [PATCH] - Use pkgconfig for GNU common c++ --- configure | 6 +++--- qcm/libcommoncpp2.qcm | 6 +++--- src/src.pro | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index ca03fa2ed..5de2f94aa 100755 --- a/configure +++ b/configure @@ -427,7 +427,7 @@ public: QString s; s = conf->getenv("QC_WITH_LIBCOMMONCPP2_INC"); if(!s.isEmpty()) { - if(!conf->checkHeader(s, "cc++/common.h")) { + if(!conf->checkHeader(s, "cc++/url.h")) { return false; } }else{ @@ -436,7 +436,7 @@ public: sl << "/usr/local/include"; bool found = false; foreach(s, sl){ - if(conf->checkHeader(s, "cc++/common.h")){ + if(conf->checkHeader(s, "cc++/url.h")){ found = true; break; } @@ -470,7 +470,7 @@ public: if(!found) return false; conf->addLib(QString("-L") + s); } - conf->addLib("-lccext2 -lccgnu2"); + //conf->addLib("-lccext2 -lccgnu2"); return true; } }; diff --git a/qcm/libcommoncpp2.qcm b/qcm/libcommoncpp2.qcm index 23408efa2..8b5e856a7 100644 --- a/qcm/libcommoncpp2.qcm +++ b/qcm/libcommoncpp2.qcm @@ -15,7 +15,7 @@ public: QString s; s = conf->getenv("QC_WITH_LIBCOMMONCPP2_INC"); if(!s.isEmpty()) { - if(!conf->checkHeader(s, "cc++/common.h")) { + if(!conf->checkHeader(s, "cc++/url.h")) { return false; } }else{ @@ -24,7 +24,7 @@ public: sl << "/usr/local/include"; bool found = false; foreach(s, sl){ - if(conf->checkHeader(s, "cc++/common.h")){ + if(conf->checkHeader(s, "cc++/url.h")){ found = true; break; } @@ -58,7 +58,7 @@ public: if(!found) return false; conf->addLib(QString("-L") + s); } - conf->addLib("-lccext2 -lccgnu2"); + //conf->addLib("-lccext2 -lccgnu2"); return true; } }; diff --git a/src/src.pro b/src/src.pro index 0e2d01ea6..4302cadad 100644 --- a/src/src.pro +++ b/src/src.pro @@ -29,7 +29,7 @@ QMAKE_CXXFLAGS_RELEASE += -fwrapv QMAKE_CXXFLAGS_DEBUG += -fwrapv CONFIG += link_pkgconfig -PKGCONFIG += libtorrent +PKGCONFIG += libtorrent libccext2 libccgnu2 QT += network xml DEFINES += QT_NO_CAST_TO_ASCII