From 06ad876fe1444e1263c2eeaf4864eaf15718797b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:15:15 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kuser/Makefile.am   | 4 ++--
 kuser/kuserldap.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kuser')

diff --git a/kuser/Makefile.am b/kuser/Makefile.am
index 6f93a48..6b1222a 100644
--- a/kuser/Makefile.am
+++ b/kuser/Makefile.am
@@ -3,8 +3,8 @@ INCLUDES	= -I.. -I$(top_srcdir)/kuser $(all_includes)
 # May be -D_XU_QUOTA -D_XU_SHADOW
 #AM_CXXFLAGS = 	$(KU_NIS) $(KU_QUOTA) $(QUOTACTL) -D_KU_DEBUG
 
-kuser_LDFLAGS	=	$(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kuser_LDADD	=	$(LIB_TDEUI) $(LIBCRYPT) $(LIBSHADOW) $(LIBGEN) $(LIB_KABC) -lkntlm
+kuser_LDFLAGS	=	$(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kuser_LDADD	=	$(LIB_TDEUI) $(LIBCRYPT) $(LIBSHADOW) $(LIBGEN) $(LIB_KABC) -ltdentlm
 
 ####### Files
 
diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp
index de3aa9d..36de3b4 100644
--- a/kuser/kuserldap.cpp
+++ b/kuser/kuserldap.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <kmessagebox.h>
-#include <kio/kntlm.h>
+#include <kio/tdentlm.h>
 
 #include "kglobal_.h"
 #include "kuserldap.h"
-- 
cgit v1.2.3