diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:52:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:52:17 -0600 |
| commit | 50c595422f05af2f2e1457ee3d27f8e5ce1ab35d (patch) | |
| tree | 67924810cf234a8e0b5355a570abd753ef10c66e | |
| parent | 39466b7b95f25a3e0f6da52b156b194b10cbac9d (diff) | |
| download | admin-50c595422f05af2f2e1457ee3d27f8e5ce1ab35d.tar.gz admin-50c595422f05af2f2e1457ee3d27f8e5ce1ab35d.zip | |
Rename additional header files to avoid conflicts with KDE4
| -rw-r--r-- | acinclude.m4.in | 4 | ||||
| -rw-r--r-- | am_edit | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in index 001c447..f46a898 100644 --- a/acinclude.m4.in +++ b/acinclude.m4.in @@ -2319,7 +2319,7 @@ if test $kde_qtver = 4; then AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KABC, "-lkabc") + AC_SUBST(LIB_KABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") @@ -2345,7 +2345,7 @@ elif test $kde_qtver = 3; then AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KABC, "-lkabc") + AC_SUBST(LIB_KABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") @@ -1363,7 +1363,7 @@ sub tag_UIFILES () $dep_lines .= "\trm -f $source.$cxxsuffix\n"; if (!$kdeopts{"qtonly"}) { $dep_lines .= "\techo '#include <kdialog.h>' > $source.$cxxsuffix\n"; - $dep_lines .= "\techo '#include <klocale.h>' >> $source.$cxxsuffix\n"; + $dep_lines .= "\techo '#include <tdelocale.h>' >> $source.$cxxsuffix\n"; my ($mangled_source) = $source; $mangled_source =~ s/[^A-Za-z0-9]/_/g; # get rid of garbage $dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n"; |