(cherry picked from commit e9402471a2)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 91ee6212ab
commit 0350ba0db0

@ -103,13 +103,8 @@ def detect_kde(env):
env['KDEDIR'] = os.popen('kde-config -prefix').read().strip() env['KDEDIR'] = os.popen('kde-config -prefix').read().strip()
print "Checking for kde version : ", print "Checking for kde version : ",
kde_version = os.popen("kde-config --version|grep KDE").read().strip().split()[1] kde_version = os.popen("kde-config --version|grep KDE|sed 's/R//g'").read().strip().split()[1]
if int(kde_version[0]) != 3 or int(kde_version[2]) < 2: print GREEN+kde_version+NORMAL
print RED+kde_version
print RED+"Your kde version can be too old"+NORMAL
print RED+"Please make sure kde is at least 3.2"+NORMAL
else:
print GREEN+kde_version+NORMAL
## Detect the qt library ## Detect the qt library
print "Checking for the qt library : ", print "Checking for the qt library : ",
@ -158,6 +153,9 @@ def detect_kde(env):
moc = os.popen("which moc 2>/dev/null").read().strip() moc = os.popen("which moc 2>/dev/null").read().strip()
if len(moc): if len(moc):
print YELLOW + "moc was found as " + moc + NORMAL print YELLOW + "moc was found as " + moc + NORMAL
elif os.path.isfile("/usr/share/tqt3/bin/moc"):
moc = "/usr/share/tqt3/bin/moc"
print YELLOW + "moc was found as " + moc + NORMAL
elif os.path.isfile("/usr/share/qt3/bin/moc"): elif os.path.isfile("/usr/share/qt3/bin/moc"):
moc = "/usr/share/qt3/bin/moc" moc = "/usr/share/qt3/bin/moc"
print YELLOW + "moc was found as " + moc + NORMAL print YELLOW + "moc was found as " + moc + NORMAL
@ -176,6 +174,10 @@ def detect_kde(env):
# Automatic detection # Automatic detection
print GREEN + "ok " + qtdir + "/include/ " + NORMAL print GREEN + "ok " + qtdir + "/include/ " + NORMAL
qtincludes = qtdir + "/include/" qtincludes = qtdir + "/include/"
elif os.path.isfile("/usr/include/tqt3/qlayout.h"):
# Debian probably
print YELLOW + "the native tqt headers were found in /usr/include/tqt3/ " + NORMAL
qtincludes = "/usr/include/tqt3"
elif os.path.isfile("/usr/include/qt3/qlayout.h"): elif os.path.isfile("/usr/include/qt3/qlayout.h"):
# Debian probably # Debian probably
print YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL print YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL

@ -16,6 +16,9 @@
Import( 'env' ) Import( 'env' )
myenv=env.Clone() myenv=env.Clone()
import os
from SCons.Script.SConscript import SConsEnvironment
############################# #############################
## the programs to build ## the programs to build
@ -66,7 +69,11 @@ myenv.Append(CXXFLAGS = '-Wno-non-virtual-dtor -I/usr/include/tqt -include tqt.h
myenv.KDEaddpaths_includes('#/src/ #/') myenv.KDEaddpaths_includes('#/src/ #/')
## Necessary libraries to link against ## Necessary libraries to link against
myenv.KDEaddlibs( 'qt-mt tqt kio kdecore kdeprint kdeui DCOP' ) ## FIXME
if os.path.isfile("/usr/include/tqt3/qlayout.h"):
myenv.KDEaddlibs( 'tqt-mt tqt kio kdecore kdeprint kdeui DCOP' )
else:
myenv.KDEaddlibs( 'qt-mt tqt kio kdecore kdeprint kdeui DCOP' )
############################# #############################
## Data to install ## Data to install

Loading…
Cancel
Save