Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

added patch from bNK to make glib include dir detected on all linux systems. Removed warnings about gpgme and gpg-error, which have no reason to stay now.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6084 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-01-22 20:43:48 +00:00
parent 138a35b2a2
commit 62a22fe0fe
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libretroshare/src/libretroshare.pro
View File

@ -118,9 +118,7 @@ linux-* {
isEmpty(LIB_DIR) { LIB_DIR = $${PREFIX}/lib/ } isEmpty(LIB_DIR) { LIB_DIR = $${PREFIX}/lib/ }
# These two lines fixe compilation on ubuntu natty. Probably a ubuntu packaging error. # These two lines fixe compilation on ubuntu natty. Probably a ubuntu packaging error.
INCLUDEPATH *= /usr/lib/x86_64-linux-gnu/glib-2.0/include/ INCLUDEPATH += $$system(pkg-config --cflags glib-2.0 | sed -e "s/-I//g")
INCLUDEPATH *= /usr/lib/arm-linux-gnueabi/glib-2.0/include/
INCLUDEPATH *= /usr/lib/i386-linux-gnu/glib-2.0/include/
OPENPGPSDK_DIR = ../../openpgpsdk/src OPENPGPSDK_DIR = ../../openpgpsdk/src
INCLUDEPATH *= $${OPENPGPSDK_DIR} ../openpgpsdk INCLUDEPATH *= $${OPENPGPSDK_DIR} ../openpgpsdk
@ -133,18 +131,6 @@ linux-* {
UPNP_DIR = /usr/include/upnp UPNP_DIR = /usr/include/upnp
INCLUDEPATH += . $${SSL_DIR} $${UPNP_DIR} INCLUDEPATH += . $${SSL_DIR} $${UPNP_DIR}
#gpg files
system(which gpg-error-config >/dev/null 2>&1) {
INCLUDEPATH += $$system(gpg-error-config --cflags | sed -e "s/-I//g")
} else {
message(Could not find gpg-error-config on your system, assuming gpg-error.h is in /usr/include)
}
system(which gpgme-config >/dev/null 2>&1) {
INCLUDEPATH += $$system(gpgme-config --cflags | sed -e "s/-I//g")
} else {
message(Could not find gpgme-config on your system, assuming gpgme.h is in /usr/include)
}
# where to put the shared library itself # where to put the shared library itself
target.path = $$LIB_DIR target.path = $$LIB_DIR
INSTALLS *= target INSTALLS *= target