OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Mar-2007 12:13:42
Branch: HEAD Handle: 2007030911134100
Modified files:
openpkg-src/apache apache.spec
Log:
add optional support for building against QDBM for NDBM support (not
storage compatible to GDBM's NDBM, of course)
Summary:
Revision Changes Path
1.385 +16 -2 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.384 -r1.385 apache.spec
--- openpkg-src/apache/apache.spec 6 Mar 2007 17:05:00 -0000 1.384
+++ openpkg-src/apache/apache.spec 9 Mar 2007 11:13:41 -0000 1.385
@@ -68,7 +68,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20070306
+Release: 20070309
# package options (suexec related)
%option with_suexec yes
@@ -153,6 +153,7 @@
# package options (braindead ones only)
%option with_gdbm_ndbm yes
+%option with_qdbm_ndbm no
%option with_shared_core no
%option with_shared_chain no
@@ -242,6 +243,10 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823
PreReq: OpenPKG, openpkg >= 20060823
+%if "%{with_qdbm_ndbm}" == "yes"
+BuildPreReq: qdbm
+PreReq: qdbm
+%endif
%if "%{with_gdbm_ndbm}" == "yes"
BuildPreReq: gdbm, gdbm::with_ndbm = yes
PreReq: gdbm, gdbm::with_ndbm = yes
@@ -1166,8 +1171,17 @@
ldflags="$ldflags %{l_ldflags}"
libs="$libs -lndbm -lgdbm"
%endif
+%if "%{with_qdbm_ndbm}" == "yes"
+ cflags="$cflags %{l_cppflags qdbm .}"
+ ldflags="$ldflags %{l_ldflags}"
+ libs="$libs -lqdbm"
+ %{l_shtool} subst \
+ -e 's;ndbm\.h;qdbm/relic.h;g' \
+ src/modules/standard/mod_auth_dbm.c \
+ src/modules/standard/mod_rewrite.c
+%endif
%if "%{with_mod_php}" == "yes" && "%{with_mod_php_mssql}" == "yes"
- ldflags="$ldflags %{l_ldflags freetds}"
+ ldflags="$ldflags %{l_ldflags freetds}"
%endif
%if "%{with_mod_php}" == "yes" && "%{with_mod_php_oci8}" == "yes"
# workaround Oracle inter-library depencency by explicitly
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
