[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/2.2.9-3-13-g7a762a4

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 862eef99ed56a30f7aee2e13d5e28c36a1f0d42b
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Mon Sep 8 21:55:44 2008 +0200

    force major version for apache to 2
    
    rationale: in Debian we currently only build against apache 2, and
    forcing it enables relaxing the build-dependency against
    apache2-mpm-worker (one of the packages shipping /usr/sbin/apache2)

diff --git a/configure b/configure
index cd6295f..933680c 100755
--- a/configure
+++ b/configure
@@ -658,8 +658,8 @@ if [ $enable_apache -gt 0 ]; then
 	apache=`get_path apache`
     fi
 
-    if [ -x "$apxs" ] && [ -x "$apache" ]; then
-	apache_major=`$apache -v | head -n1 | sed -e "s,.*/\([1-9]\).*,\1,"`
+    if [ -x "$apxs" ] ; then
+	apache_major=2
 	apache_libdir="`$apxs -q LIBEXECDIR`"
 	apache_incdir="`$apxs -q INCLUDEDIR`"
 	apache_confdir="`$apxs -q SYSCONFDIR`"

-- 
ocamlnet packaging