Additional k => tde renaming and fixes

pull/1/head
Slávek Banko 11 years ago
parent c3dbcb16c8
commit 00687776d7

@ -158,10 +158,10 @@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_TDEHTML = @LIB_TDEHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMGIO = @LIB_KIMGIO@ LIB_KIMGIO = @LIB_KIMGIO@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
LIB_KPARTS = @LIB_KPARTS@ LIB_TDEPARTS = @LIB_TDEPARTS@
LIB_KSPELL = @LIB_KSPELL@ LIB_TDESPELL = @LIB_TDESPELL@
LIB_KSYCOCA = @LIB_KSYCOCA@ LIB_TDESYCOCA = @LIB_TDESYCOCA@
LIB_POLL = @LIB_POLL@ LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@ LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@ LIB_QT = @LIB_QT@

@ -1988,28 +1988,28 @@ AC_DEFUN(KDE_CREATE_LIBS_ALIASES,
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-ltdeabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-ltdeio") AC_SUBST(LIB_KFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")

16
aclocal.m4 vendored

@ -2000,28 +2000,28 @@ AC_DEFUN(KDE_CREATE_LIBS_ALIASES,
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-ltdeabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-ltdeio") AC_SUBST(LIB_KFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")

@ -1 +1 @@
Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461

@ -161,10 +161,10 @@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_TDEHTML = @LIB_TDEHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMGIO = @LIB_KIMGIO@ LIB_KIMGIO = @LIB_KIMGIO@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
LIB_KPARTS = @LIB_KPARTS@ LIB_TDEPARTS = @LIB_TDEPARTS@
LIB_KSPELL = @LIB_KSPELL@ LIB_TDESPELL = @LIB_TDESPELL@
LIB_KSYCOCA = @LIB_KSYCOCA@ LIB_TDESYCOCA = @LIB_TDESYCOCA@
LIB_POLL = @LIB_POLL@ LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@ LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@ LIB_QT = @LIB_QT@

@ -158,10 +158,10 @@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_TDEHTML = @LIB_TDEHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMGIO = @LIB_KIMGIO@ LIB_KIMGIO = @LIB_KIMGIO@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
LIB_KPARTS = @LIB_KPARTS@ LIB_TDEPARTS = @LIB_TDEPARTS@
LIB_KSPELL = @LIB_KSPELL@ LIB_TDESPELL = @LIB_TDESPELL@
LIB_KSYCOCA = @LIB_KSYCOCA@ LIB_TDESYCOCA = @LIB_TDESYCOCA@
LIB_POLL = @LIB_POLL@ LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@ LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@ LIB_QT = @LIB_QT@

@ -158,10 +158,10 @@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_TDEHTML = @LIB_TDEHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMGIO = @LIB_KIMGIO@ LIB_KIMGIO = @LIB_KIMGIO@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
LIB_KPARTS = @LIB_KPARTS@ LIB_TDEPARTS = @LIB_TDEPARTS@
LIB_KSPELL = @LIB_KSPELL@ LIB_TDESPELL = @LIB_TDESPELL@
LIB_KSYCOCA = @LIB_KSYCOCA@ LIB_TDESYCOCA = @LIB_TDESYCOCA@
LIB_POLL = @LIB_POLL@ LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@ LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@ LIB_QT = @LIB_QT@

@ -158,10 +158,10 @@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_TDEHTML = @LIB_TDEHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMGIO = @LIB_KIMGIO@ LIB_KIMGIO = @LIB_KIMGIO@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
LIB_KPARTS = @LIB_KPARTS@ LIB_TDEPARTS = @LIB_TDEPARTS@
LIB_KSPELL = @LIB_KSPELL@ LIB_TDESPELL = @LIB_TDESPELL@
LIB_KSYCOCA = @LIB_KSYCOCA@ LIB_TDESYCOCA = @LIB_TDESYCOCA@
LIB_POLL = @LIB_POLL@ LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@ LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@ LIB_QT = @LIB_QT@

@ -160,10 +160,10 @@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_TDEHTML = @LIB_TDEHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMGIO = @LIB_KIMGIO@ LIB_KIMGIO = @LIB_KIMGIO@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
LIB_KPARTS = @LIB_KPARTS@ LIB_TDEPARTS = @LIB_TDEPARTS@
LIB_KSPELL = @LIB_KSPELL@ LIB_TDESPELL = @LIB_TDESPELL@
LIB_KSYCOCA = @LIB_KSYCOCA@ LIB_TDESYCOCA = @LIB_TDESYCOCA@
LIB_POLL = @LIB_POLL@ LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@ LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@ LIB_QT = @LIB_QT@

@ -160,10 +160,10 @@ LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_TDEHTML = @LIB_TDEHTML@ LIB_TDEHTML = @LIB_TDEHTML@
LIB_KIMGIO = @LIB_KIMGIO@ LIB_KIMGIO = @LIB_KIMGIO@
LIB_KIO = @LIB_KIO@ LIB_TDEIO = @LIB_TDEIO@
LIB_KPARTS = @LIB_KPARTS@ LIB_TDEPARTS = @LIB_TDEPARTS@
LIB_KSPELL = @LIB_KSPELL@ LIB_TDESPELL = @LIB_TDESPELL@
LIB_KSYCOCA = @LIB_KSYCOCA@ LIB_TDESYCOCA = @LIB_TDESYCOCA@
LIB_POLL = @LIB_POLL@ LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@ LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@ LIB_QT = @LIB_QT@

Loading…
Cancel
Save