SPECS: openldap.spec - more system_db

qboosh qboosh at pld-linux.org
Sat Nov 3 02:20:58 CET 2007


Author: qboosh                       Date: Sat Nov  3 01:20:58 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- more system_db

---- Files affected:
SPECS:
   openldap.spec (1.269 -> 1.270) 

---- Diffs:

================================================================
Index: SPECS/openldap.spec
diff -u SPECS/openldap.spec:1.269 SPECS/openldap.spec:1.270
--- SPECS/openldap.spec:1.269	Sat Nov  3 02:15:54 2007
+++ SPECS/openldap.spec	Sat Nov  3 02:20:52 2007
@@ -866,12 +866,14 @@
 
 cd %{name}-%{version}
 
-CPPFLAGS="-I${dbdir}/include -I/usr/include/ncurses"
+CPPFLAGS="%{!?with_system_db:-I${dbdir}/include }-I/usr/include/ncurses"
 CFLAGS="%{rpmcflags} $CPPFLAGS -D_REENTRANT -fPIC"
 CXXFLAGS="%{rpmcflags} $CPPFLAGS -D_REENTRANT -fPIC"
-LDFLAGS="%{rpmcflags} %{rpmldflags} -L${dbdir}/%{_lib}"
-LD_LIBRARY_PATH=${dbdir}/%{_lib}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-export CFLAGS CPPFLAGS CXXFLAGS LDFLAGS LD_LIBRARY_PATH
+LDFLAGS="%{rpmcflags} %{rpmldflags}%{!?with_system_db: -L${dbdir}/%{_lib}}"
+export CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+%if %{without system_db}
+export LD_LIBRARY_PATH=${dbdir}/%{_lib}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+%endif
 
 %{__libtoolize}
 %{__aclocal}
@@ -1565,6 +1567,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.270  2007/11/03 01:20:52  qboosh
+- more system_db
+
 Revision 1.269  2007/11/03 01:15:54  qboosh
 - -pie needs gcc 3.4
 
================================================================

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



More information about the pld-cvs-commit mailing list