Rename additional header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 39466b7b95
commit 50c595422f

@ -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";

Loading…
Cancel
Save