summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2016-03-16 10:46:21 +0100
committerMichele Calgaro <[email protected]>2016-03-16 10:46:21 +0100
commit5207ad8904c322cfe04ffb0d2ecb011ca4444dd3 (patch)
tree7a5caaa7e45e80d66ecc55e0f84c67f04bd0175a /src
parente850ed29f0767f07eb8b18ee6271cd6f5aa514c8 (diff)
downloadkcmldapcontroller-5207ad8904c322cfe04ffb0d2ecb011ca4444dd3.tar.gz
kcmldapcontroller-5207ad8904c322cfe04ffb0d2ecb011ca4444dd3.zip
Fix krb5 library detection. This resolves FTBFS with heimdal-krb5.
Based on similar patch for libraries/libtdeldap from Slavek Banko. Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am4
-rw-r--r--src/primaryrealmwizard/Makefile.am2
-rw-r--r--src/secondaryrealmwizard/Makefile.am2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index e0e84a3..a859966 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) $(KDE_INCLUDES)/tde
+INCLUDES = $(all_includes) $(KDE_INCLUDES)/tde $(KRB5_CFLAGS)
METASOURCES = AUTO
SUBDIRS = primaryrealmwizard secondaryrealmwizard
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kcm_ldapcontroller.la
kcm_ldapcontroller_la_SOURCES = ldapcontroller.cpp ldapcontrollerconfigbase.ui processingdialog.cpp sha1.cc multimasterreplicationconfigbase.ui multimasterreplicationconfigdlg.cpp
kcm_ldapcontroller_la_LIBADD = primaryrealmwizard/libprimaryrealmwizard.la secondaryrealmwizard/libsecondaryrealmwizard.la $(LIB_TDEIO) $(LIB_TDEUI) -ltdeldap
-kcm_ldapcontroller_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
+kcm_ldapcontroller_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) $(KRB5_LIBS)
xdg_apps_DATA = ldapcontroller.desktop
diff --git a/src/primaryrealmwizard/Makefile.am b/src/primaryrealmwizard/Makefile.am
index 8f61131..05d02e5 100644
--- a/src/primaryrealmwizard/Makefile.am
+++ b/src/primaryrealmwizard/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) $(KDE_INCLUDES)/tde -I$(top_srcdir)/src
+INCLUDES = $(all_includes) $(KDE_INCLUDES)/tde -I$(top_srcdir)/src $(KRB5_CFLAGS)
METASOURCES = AUTO
noinst_LTLIBRARIES = libprimaryrealmwizard.la
diff --git a/src/secondaryrealmwizard/Makefile.am b/src/secondaryrealmwizard/Makefile.am
index 883f260..62223f4 100644
--- a/src/secondaryrealmwizard/Makefile.am
+++ b/src/secondaryrealmwizard/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) $(KDE_INCLUDES)/tde -I$(top_srcdir)/src
+INCLUDES = $(all_includes) $(KDE_INCLUDES)/tde -I$(top_srcdir)/src $(KRB5_CFLAGS)
METASOURCES = AUTO
noinst_LTLIBRARIES = libsecondaryrealmwizard.la