diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:15:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:15:15 -0600 |
| commit | 06ad876fe1444e1263c2eeaf4864eaf15718797b (patch) | |
| tree | 78ef2ab30e3733ced3989d29017e44387e0c2e0b /kuser | |
| parent | fadf12ddbd394c32ecb6fb46ef230f08875c1fec (diff) | |
| download | tdeadmin-06ad876fe1444e1263c2eeaf4864eaf15718797b.tar.gz tdeadmin-06ad876fe1444e1263c2eeaf4864eaf15718797b.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kuser')
| -rw-r--r-- | kuser/Makefile.am | 4 | ||||
| -rw-r--r-- | kuser/kuserldap.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
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" |