diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
| commit | dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 (patch) | |
| tree | c297348a55df66c571de4525646e0b9762427353 /kio/kssl | |
| parent | b7658a0d5eca24a9d37c6e04f88298ef02389db0 (diff) | |
| download | tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.tar.gz tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kio/kssl')
| -rw-r--r-- | kio/kssl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kio/kssl/Makefile.am | 2 | ||||
| -rw-r--r-- | kio/kssl/ksslkeygen.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kio/kssl/CMakeLists.txt b/kio/kssl/CMakeLists.txt index 377cd9d01..a2c9f00d6 100644 --- a/kio/kssl/CMakeLists.txt +++ b/kio/kssl/CMakeLists.txt @@ -21,7 +21,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdecore/network ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kwallet/client + ${CMAKE_SOURCE_DIR}/tdewallet/client ) diff --git a/kio/kssl/Makefile.am b/kio/kssl/Makefile.am index 54f2fc6f5..5d57ab7ab 100644 --- a/kio/kssl/Makefile.am +++ b/kio/kssl/Makefile.am @@ -3,7 +3,7 @@ # somewhere else. Another option for the future (needs testing) would be to # change SSL_INCLUDES to .../include/openssl and make the source use #include <foo.h> # instead of #include <openssl/foo.h> -INCLUDES=-I$(top_srcdir)/tdecore/network -I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES) +INCLUDES=-I$(top_srcdir)/tdecore/network -I$(top_srcdir)/tdewallet/client $(all_includes) $(SSL_INCLUDES) noinst_LTLIBRARIES = libkssl.la KSSLVERSION= 3.0.0 diff --git a/kio/kssl/ksslkeygen.cc b/kio/kssl/ksslkeygen.cc index a34773989..403632b3a 100644 --- a/kio/kssl/ksslkeygen.cc +++ b/kio/kssl/ksslkeygen.cc @@ -31,7 +31,7 @@ #include <kprogress.h> #include <kstandarddirs.h> #include <ktempfile.h> -#include <kwallet.h> +#include <tdewallet.h> #include <tqlineedit.h> #include <tqpushbutton.h> |