OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Mar-2003 13:52:33
Branch: HEAD Handle: 2003030712523200
Modified files:
openpkg-src/openldap openldap.spec
Log:
make SASL support an option
Summary:
Revision Changes Path
1.54 +26 -4 openpkg-src/openldap/openldap.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.53 -r1.54 openldap.spec
--- openpkg-src/openldap/openldap.spec 7 Mar 2003 11:44:53 -0000 1.53
+++ openpkg-src/openldap/openldap.spec 7 Mar 2003 12:52:32 -0000 1.54
@@ -39,11 +39,18 @@
Source0:
ftp://ftp.openldap.org/pub/openldap/openldap-release/openldap-%{version}.tgz
Source1: rc.openldap
+# package options
+%option with_sasl no
+
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, sasl, openssl, db >= 4.1.24, make, gcc
-PreReq: OpenPKG, openpkg >= 20020206, sasl
+BuildPreReq: OpenPKG, openpkg >= 20020206, openssl, db >= 4.1.24, make, gcc
+PreReq: OpenPKG, openpkg >= 20020206
+%if "%{with_sasl}" == "yes"
+BuildPreReq: sasl
+PreReq: sasl
+%endif
AutoReq: no
AutoReqProv: no
@@ -58,9 +65,18 @@
%setup -q
%build
+%if "%{with_sasl}" == "yes"
+ # hard-code configure to use SASL2 library
+ %{l_shtool} subst \
+ -e '4s/.*/ac_cv_lib_sasl2_sasl_client_init=yes/' \
+ configure
+ cf="%{l_cppflags sasl}"
+%else
+ cf="%{l_cppflags}"
+%endif
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="%{l_cppflags sasl}" \
+ CPPFLAGS="$cf" \
LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
@@ -69,9 +85,15 @@
--with-ldbm-api=berkeley \
--with-ldbm-module=static \
--with-ldbm-type=btree \
- --enable-slurpd \
+%if "%{with_sasl}" == "yes"
+ --with-cyrus-sasl=%{l_prefix} \
+ --enable-spasswd \
+%else
--without-cyrus-sasl \
--disable-spasswd \
+%else
+%endif
+ --enable-slurpd \
--disable-shared
%{l_make} %{l_mflags}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
