summaryrefslogtreecommitdiffstats
path: root/configure.py
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-22 13:01:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-22 13:01:20 -0600
commit84d71f5e86ee57a0e482e6a6121101e6369a2196 (patch)
treec75c55b620041ee0d19050cdf7d824139abec350 /configure.py
parentd245ee56d77a64fc7849a6db3cfe50924075b320 (diff)
downloadpytde-84d71f5e86ee57a0e482e6a6121101e6369a2196.tar.gz
pytde-84d71f5e86ee57a0e482e6a6121101e6369a2196.zip
Fix FTBFS
Diffstat (limited to 'configure.py')
-rw-r--r--configure.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/configure.py b/configure.py
index fe43051..314da5f 100644
--- a/configure.py
+++ b/configure.py
@@ -96,7 +96,7 @@ opt_dep_warnings = 0
opt_libdir = "lib"
opt_dist_name = ""
-pytde_modules = ["dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tderesources", "kabc", "tdeutils", "tdefile", "tdeparts",\
+pytde_modules = ["dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tderesources", "tdeabc", "tdeutils", "tdefile", "tdeparts",\
"tdehtml", "tdespell", "tdeprint", "tdemdi"] #, "tdespell2"]
pytde_imports = {
@@ -107,7 +107,7 @@ pytde_imports = {
"tdeui": ["qt", "qtxml", "dcop", "tdecore", "tdefx"],
"tdeio": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"],
"tderesources": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
- "kabc": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tderesources"],
+ "tdeabc": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tderesources"],
"tdeutils": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
"tdefile": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
"tdeparts": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
@@ -126,7 +126,7 @@ kde_includes = {
"tdeui": None,
"tdeio": ["tdeio"],
"tderesources": ["tdeio", "../tdeio", "tderesources"],
- "kabc": ["tdeio", "../tdeio", "tderesources", "tdeabc"],
+ "tdeabc": ["tdeio", "../tdeio", "tderesources", "tdeabc"],
"tdefile": ["tdeio", "../tdeio"],
"tdeparts": ["tdeio", "../tdeio", "tdeparts"],
"tdehtml": ["tdeio", "../tdeio", "tdeparts", "dom"],
@@ -146,7 +146,7 @@ postProcess = {
"tdefx": None,
"tdeui": None, #[["-p ", "tdeui", "-o", "shpix", "siptdeuiTDESharedPixmap.cpp"]],
"tderesources": None,
- "kabc": None,
+ "tdeabc": None,
"tdeio": None,
"tdefile": None,
"tdeparts": None,
@@ -474,7 +474,7 @@ def create_top_level (mname):
elif string.find (line, "@mark@") == 0:
for p in plus:
sipout.write (p)
- elif mname == "kabc" and kde_version < 0x030200 and string.find (line, "tderesourcesmod.sip") >= 0:
+ elif mname == "tdeabc" and kde_version < 0x030200 and string.find (line, "tderesourcesmod.sip") >= 0:
pass
else:
sipout.write (line)
@@ -757,7 +757,7 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e
makefile.extra_libs.append ("tdecore")
if extra_lib == "tdespell":
makefile.extra_libs.append ("tdeui")
- if extra_lib == "kabc" and kde_version >= 0x030200:
+ if extra_lib == "tdeabc" and kde_version >= 0x030200:
makefile.extra_libs.append ("tdeabc_file")
if extra_lib == "tdeparts" and kde_version >= 0x030500:
makefile.extra_lib_dirs.append (os.path.join (opt_kdelibdir, "trinity"))
@@ -896,8 +896,8 @@ def main(argv):
if kde_version < 0x030200:
pytde_modules.remove ("tdemdi")
pytde_modules.remove ("tderesources")
- pytde_imports ["kabc"].remove ("tderesources")
- kde_includes ["kabc"].remove ("tderesources")
+ pytde_imports ["tdeabc"].remove ("tderesources")
+ kde_includes ["tdeabc"].remove ("tderesources")
if kde_version < 0x030300:
pytde_modules.remove ("tdeutils")