SPECS: openldap.spec - don't build contrib if no sasl (sasl is used uncondi...

arekm arekm at pld-linux.org
Sat Nov 1 17:40:40 CET 2008


Author: arekm                        Date: Sat Nov  1 16:40:40 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't build contrib if no sasl (sasl is used unconditionally there)

---- Files affected:
SPECS:
   openldap.spec (1.294 -> 1.295) 

---- Diffs:

================================================================
Index: SPECS/openldap.spec
diff -u SPECS/openldap.spec:1.294 SPECS/openldap.spec:1.295
--- SPECS/openldap.spec:1.294	Sat Nov  1 16:58:55 2008
+++ SPECS/openldap.spec	Sat Nov  1 17:40:34 2008
@@ -979,6 +979,7 @@
 done
 
 __topdir=`pwd`
+%if %{without sasl}
 cd contrib/ldapc++
 %{__libtoolize}
 %{__aclocal}
@@ -988,6 +989,7 @@
 	--with-libldap=$__topdir/libs \
 	--with-ldap-includes=$__topdir/include
 %{__make}
+%endif
 
 %if %{with exchange}
 # Build evolution-specific clients just as we would normal clients,
@@ -1097,8 +1099,10 @@
 echo "# This is a good place to put your schema definitions " > \
 	$RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/local.schema
 
+%if %{without sasl}
 %{__make} -C contrib/ldapc++ install \
 	DESTDIR=$RPM_BUILD_ROOT
+%endif
 
 %if %{without system_db}
 find $RPM_BUILD_ROOT -name \*.la | xargs sed -i -e "s|-L${dbdir}/%{_lib}||g"
@@ -1646,6 +1650,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.295  2008/11/01 16:40:34  arekm
+- don't build contrib if no sasl (sasl is used unconditionally there)
+
 Revision 1.294  2008/11/01 15:58:55  arekm
 - BR libicu-devel for sasl
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openldap.spec?r1=1.294&r2=1.295&f=u



More information about the pld-cvs-commit mailing list