[Pkg-ocaml-maint-commits] r3683 - in /trunk/packages/ocamlnet/trunk/debian: control rules

[zack at users.alioth.debian.org]

Author: zack
Date: Wed Apr 11 19:10:48 2007
New Revision: 3683

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3683
Log:
disabled building of the apache connector against apache2 (currently not working upstream)

Modified:
    trunk/packages/ocamlnet/trunk/debian/control
    trunk/packages/ocamlnet/trunk/debian/rules

Modified: trunk/packages/ocamlnet/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/control?rev=3683&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/control (original)
+++ trunk/packages/ocamlnet/trunk/debian/control Wed Apr 11 19:10:48 2007
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 5.0.0), dpatch, cdbs, ocaml-nox (>= 3.09.2-7), ocaml-findlib, libpcre-ocaml-dev (>= 5.11.1), liblablgtk2-ocaml-dev, libcryptgps-ocaml-dev, libssl-ocaml-dev, apache2-mpm-worker, apache2-prefork-dev
+Build-Depends: debhelper (>> 5.0.0), dpatch, cdbs, ocaml-nox (>= 3.09.2-7), ocaml-findlib, libpcre-ocaml-dev (>= 5.11.1), liblablgtk2-ocaml-dev, libcryptgps-ocaml-dev, libssl-ocaml-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlnet
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/

Modified: trunk/packages/ocamlnet/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/rules?rev=3683&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/rules (original)
+++ trunk/packages/ocamlnet/trunk/debian/rules Wed Apr 11 19:10:48 2007
@@ -21,13 +21,21 @@
 DEB_STRIP_EXCLUDE += usr/bin/netplex-admin	# OCaml custom bytecode binaries can't be striped
 DEB_STRIP_EXCLUDE += usr/bin/ocamlrpcgen
 
+CFGFLAGS =
+CFGFLAGS += -enable-gtk2 -enable-ssl
+CFGFLAGS += -with-nethttpd -prefer-netcgi2 -with-rpc-auth-dh
+CFGFLAGS += -bindir /usr/bin -datadir /usr/share/ocamlnet
+
+# To enable the apache connector and build it against apache2 (currently
+# b0rk3d) uncomment the following line.  Note that in order to support the
+# apache connector in a proper debian package adding "apache2-mpm-worker" (for
+# /usr/sbin/apache2) and "apache2-prefork-dev" (for /usr/bin/apxs2) as
+# build-deps to debian/control is needed as well.
+#CFGFLAGS += -enable-apache -apache /usr/sbin/apache2 -apxs /usr/bin/apxs2
+
 configure/$(PKGNAME):: debian/configure-stamp
 debian/configure-stamp:
-	./configure \
-		-enable-gtk2 -enable-ssl -enable-apache \
-		-with-nethttpd -prefer-netcgi2 -with-rpc-auth-dh \
-		-apache /usr/sbin/apache2 -apxs /usr/bin/apxs2 \
-		-bindir /usr/bin -datadir /usr/share/ocamlnet
+	./configure $(CFGFLAGS)
 	touch debian/configure-stamp
 clean::
 	rm -f debian/configure-stamp