summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:56:44 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:56:44 -0600
commitb6d5b675493a44e3e789cc914da0d18914d2bb39 (patch)
tree26ac0919421350e5b155508ed4be1e41464ff5fa
parent38cacb89dda0605c17b203fa3a646b7f6469fd5c (diff)
downloadadmin-b6d5b675493a44e3e789cc914da0d18914d2bb39.tar.gz
admin-b6d5b675493a44e3e789cc914da0d18914d2bb39.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
-rw-r--r--acinclude.m4.in22
-rw-r--r--am_edit20
2 files changed, 21 insertions, 21 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in
index 024e82c..5c4a388 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -636,7 +636,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
if test -n "$trinity14ornewer"; then
- KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+ KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
AC_SUBST(MAKEKDEWIDGETS)
@@ -2007,7 +2007,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la"
else
kde_check_header="ksharedptr.h"
- kde_check_lib="libkio.la"
+ kde_check_lib="libtdeio.la"
fi
if test -z "$1"; then
@@ -2315,7 +2315,7 @@ if test $kde_qtver = 4; then
AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
- AC_SUBST(LIB_KIO, "-lkio")
+ AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
@@ -2331,8 +2331,8 @@ if test $kde_qtver = 4; then
AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility
- AC_SUBST(LIB_KSYCOCA, "-lkio")
- AC_SUBST(LIB_KFILE, "-lkio")
+ AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+ AC_SUBST(LIB_KFILE, "-ltdeio")
elif test $kde_qtver = 3; then
case $host in
*cygwin*) lib_kded="-ltdeinit_kded" ;;
@@ -2341,7 +2341,7 @@ elif test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
- AC_SUBST(LIB_KIO, "-lkio")
+ AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
@@ -2357,15 +2357,15 @@ elif test $kde_qtver = 3; then
AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility
- AC_SUBST(LIB_KSYCOCA, "-lkio")
- AC_SUBST(LIB_KFILE, "-lkio")
+ AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+ AC_SUBST(LIB_KFILE, "-ltdeio")
elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
- AC_SUBST(LIB_KIO, "-lkio")
+ AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
- AC_SUBST(LIB_KFILE, "-lkfile")
+ AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2375,7 +2375,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
- AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+ AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
])
diff --git a/am_edit b/am_edit
index a9a4c69..46ad438 100644
--- a/am_edit
+++ b/am_edit
@@ -395,21 +395,21 @@ sub processMakefile ($)
if ($MakefileData =~ /\n$lookup/) {
my $condition = $1;
my $depfiles = $2;
- my $workfiles;
+ my $wortdefiles;
if ($dep_finals) {
# Add the conditions on every line, since
# there may be line continuations in the list.
- $workfiles = "$dep_files $dep_finals $depfiles";
- $workfiles =~ s/\034/\034$condition\@KDE_USE_FINAL_TRUE\@\t/g;
- $lines = "$condition\@KDE_USE_FINAL_TRUE\@DEP_FILES = $workfiles\n";
- $workfiles = "$dep_files $depfiles";
- $workfiles =~ s/\034/\034$condition\@KDE_USE_FINAL_FALSE\@\t/g;
- $lines .= "$condition\@KDE_USE_FINAL_FALSE\@DEP_FILES = $workfiles";
+ $wortdefiles = "$dep_files $dep_finals $depfiles";
+ $wortdefiles =~ s/\034/\034$condition\@KDE_USE_FINAL_TRUE\@\t/g;
+ $lines = "$condition\@KDE_USE_FINAL_TRUE\@DEP_FILES = $wortdefiles\n";
+ $wortdefiles = "$dep_files $depfiles";
+ $wortdefiles =~ s/\034/\034$condition\@KDE_USE_FINAL_FALSE\@\t/g;
+ $lines .= "$condition\@KDE_USE_FINAL_FALSE\@DEP_FILES = $wortdefiles";
} else {
- $workfiles = "$dep_files $depfiles";
- $workfiles =~ s/\034/\034$condition\t/g;
- $lines = $condition . "DEP_FILES = $workfiles";
+ $wortdefiles = "$dep_files $depfiles";
+ $wortdefiles =~ s/\034/\034$condition\t/g;
+ $lines = $condition . "DEP_FILES = $wortdefiles";
}
substituteLine($lookup, $lines);
}