diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-28 05:25:13 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-28 05:25:13 +0000 |
| commit | ebdfae2d4ea386b947a7b28d160c6b9abdcd8dd7 (patch) | |
| tree | 008d82834f36aa6c100395ab67a4becb7adc2f24 | |
| parent | 56ed03b7341e1cf22ac5e43030a8d3c6a7373145 (diff) | |
| download | tdelibs-ebdfae2d4ea386b947a7b28d160c6b9abdcd8dd7.tar.gz tdelibs-ebdfae2d4ea386b947a7b28d160c6b9abdcd8dd7.zip | |
More FTBFS fixes for Slackware
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1169004 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kdeprint/management/kmmainview.cpp | 1 | ||||
| -rw-r--r-- | kioslave/http/Makefile.am | 2 | ||||
| -rw-r--r-- | kioslave/http/configure.in.in | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/kdeprint/management/kmmainview.cpp b/kdeprint/management/kmmainview.cpp index 0e53f2757..f422832cc 100644 --- a/kdeprint/management/kmmainview.cpp +++ b/kdeprint/management/kmmainview.cpp @@ -55,6 +55,7 @@ #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <kapplication.h> +#include <kprocess.h> #undef m_manager #define m_manager KMFactory::self()->manager() diff --git a/kioslave/http/Makefile.am b/kioslave/http/Makefile.am index 71ca1e1dd..3a185f356 100644 --- a/kioslave/http/Makefile.am +++ b/kioslave/http/Makefile.am @@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = kio_http.la kio_http_la_SOURCES = http.cc kio_http_la_METASOURCES = AUTO kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(LIB_QT) $(LIB_KDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/kio/misc/kntlm/libkntlm.la -kio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) -lgssapi_krb5 +kio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS) kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp kio_http_cache_cleaner_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la diff --git a/kioslave/http/configure.in.in b/kioslave/http/configure.in.in index 14f79ddc6..a7d1ca7cf 100644 --- a/kioslave/http/configure.in.in +++ b/kioslave/http/configure.in.in @@ -57,7 +57,7 @@ if test "x$with_gssapi" = "xCHECK" ; then GSSAPI_LIBS="-L$gssapi_libdir " test "$USE_RPATH" = yes && GSSAPI_RPATH="-R $gssapi_libdir" fi - GSSAPI_LIBS="${GSSAPI_LIBS}-lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt ${LIBRESOLV}" + GSSAPI_LIBS="${GSSAPI_LIBS} -lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt ${LIBRESOLV}" with_gssapi=FOUND gssapi_flavor=HEIMDAL break |