summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-28 10:22:21 -0600
committerTimothy Pearson <[email protected]>2013-01-28 10:22:21 -0600
commit86e5bd197118d37158fe26da7c92502732c0b5fe (patch)
treed0daf3c75d95fdd7ab95fddac6cf80d3dc7b7995
parent3e27c70b049094101e209099d5f66effb096b4f1 (diff)
downloadtdeio-apt-86e5bd197118d37158fe26da7c92502732c0b5fe.tar.gz
tdeio-apt-86e5bd197118d37158fe26da7c92502732c0b5fe.zip
Fix up remaining references to -lkio
-rw-r--r--acinclude.m48
m---------admin0
-rw-r--r--src/Makefile.am2
3 files changed, 5 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 0a829c4..fb24d6a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2070,7 +2070,7 @@ if 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")
@@ -2086,12 +2086,12 @@ if 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, "-ltdefile")
diff --git a/admin b/admin
-Subproject b6d5b675493a44e3e789cc914da0d18914d2bb3
+Subproject b2340915fde2845f481d9aad9e5e89820fbfedc
diff --git a/src/Makefile.am b/src/Makefile.am
index 182ad40..28261f8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
kio_apt_la_SOURCES = aptcache.cpp apt.cpp regexps.cpp packagemanager.cpp dpkg.cpp
-kio_apt_la_LIBADD = $(top_builddir)/src/parsers/libparsers.la -lkio
+kio_apt_la_LIBADD = $(top_builddir)/src/parsers/libparsers.la -ltdeio
kio_apt_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KURL)
protocoldir = $(kde_servicesdir)