From d640e1e7f363f7391558b124e299ffbe9f3a452c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sat, 24 Jun 2017 20:48:45 +0200
Subject: RPM: fix LDAP related packages FTBFS on newer distributions

---
 redhat/applications/kcmldap/kcmldap-14.0.0.spec | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'redhat/applications/kcmldap')

diff --git a/redhat/applications/kcmldap/kcmldap-14.0.0.spec b/redhat/applications/kcmldap/kcmldap-14.0.0.spec
index 48b9724f4..24ccd2b46 100644
--- a/redhat/applications/kcmldap/kcmldap-14.0.0.spec
+++ b/redhat/applications/kcmldap/kcmldap-14.0.0.spec
@@ -177,6 +177,19 @@ This is a small daemon which keeps the LDAP root certificate up to date with the
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
+extra_includes="%{_includedir}"
+extra_libs="%{_libdir}"
+
+if [ -d "%{_includedir}/openldap24" ]; then
+  extra_includes="%{_includedir}/openldap24:${extra_includes}"
+  extra_libs="%{_libdir}/openldap24:${extra_libs}"
+fi
+
+if [ -d "%{_includedir}/heimdal" ]; then
+  extra_includes="%{_includedir}/heimdal:${extra_includes}"
+  extra_libs="%{_libdir}/heimdal:${extra_libs}"
+fi
+
 %configure \
   --prefix=%{tde_prefix} \
   --exec-prefix=%{tde_prefix} \
@@ -194,10 +207,8 @@ export PATH="%{tde_bindir}:${PATH}"
   --enable-rpath \
   --disable-gcc-hidden-visibility \
   \
-%if 0%{?rhel} == 5
-  --with-extra-includes=/usr/include/openldap24 \
-  --with-extra-libs=%{_libdir}/openldap24 \
-%endif
+  --with-extra-includes=${extra_includes} \
+  --with-extra-libs=${extra_libs} \
 
 %__make %{?_smp_mflags}
 
-- 
cgit v1.2.3