summaryrefslogtreecommitdiffstats
path: root/redhat/libraries
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2017-06-24 20:48:45 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2017-06-24 20:54:25 +0200
commitd640e1e7f363f7391558b124e299ffbe9f3a452c (patch)
treeda9ccb448f3c7781e00fb78c5c86e2248659371a /redhat/libraries
parent3b001808e2317dc346815536ff8245327ced8b40 (diff)
downloadtde-packaging-d640e1e7f363f7391558b124e299ffbe9f3a452c.tar.gz
tde-packaging-d640e1e7f363f7391558b124e299ffbe9f3a452c.zip
RPM: fix LDAP related packages FTBFS on newer distributions
Diffstat (limited to 'redhat/libraries')
-rw-r--r--redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec23
1 files changed, 15 insertions, 8 deletions
diff --git a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec
index 458cf9646..c13dbe2ae 100644
--- a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec
+++ b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec
@@ -163,6 +163,19 @@ libtdeldap-trinity-dev contains development files and documentation.
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} \
@@ -179,14 +192,8 @@ export PATH="%{tde_bindir}:${PATH}"
--enable-rpath \
--disable-gcc-hidden-visibility \
\
-%if 0%{?rhel} == 5
- --with-extra-includes=%{_includedir}/openldap24 \
- --with-extra-libs=%{_libdir}/openldap24 \
-%endif
-%if 0%{?rhel} >= 6
- --with-extra-includes=%{_includedir}/heimdal \
- --with-extra-libs=%{_libdir}/heimdal \
-%endif
+ --with-extra-includes=${extra_includes} \
+ --with-extra-libs=${extra_libs} \
%__make %{?_smp_mflags}