build mod_python for people who would rather not use wsgi

diff --git a/lxc-tags.mk b/lxc-tags.mk
index 4a7fbbf..01b2125 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -23,6 +23,7 @@ vsys-scripts-GITPATH            := git://git.planet-lab.org/vsys-scripts.git@vsy
 bind_public-GITPATH             := git://git.planet-lab.org/bind_public.git@bind_public-0.1-2
 sliver-openvswitch-GITPATH      := git://git.onelab.eu/sliver-openvswitch.git@sliver-openvswitch-1.10.90-2
 plcapi-GITPATH                  := git://git.planet-lab.org/plcapi.git@master
 bind_public-GITPATH             := git://git.planet-lab.org/bind_public.git@bind_public-0.1-2
 sliver-openvswitch-GITPATH      := git://git.onelab.eu/sliver-openvswitch.git@sliver-openvswitch-1.10.90-2
 plcapi-GITPATH                  := git://git.planet-lab.org/plcapi.git@master

+mod_python-GITPATH             := git://git.onelab.eu/od_python.git@master

 drupal-GITPATH                  := git://git.planet-lab.org/drupal.git@drupal-4.7-15
 plewww-GITPATH                  := git://git.planet-lab.org/plewww.git@plewww-5.2-2
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
 drupal-GITPATH                  := git://git.planet-lab.org/drupal.git@drupal-4.7-15
 plewww-GITPATH                  := git://git.planet-lab.org/plewww.git@plewww-5.2-2
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5

diff --git a/lxc.mk b/lxc.mk
index baac873..02a5e37 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -260,7 +260,21 @@ plcapi-SPEC := plcapi.spec
 ALL += plcapi
 IN_MYPLC += plcapi
 
 ALL += plcapi
 IN_MYPLC += plcapi
 

-
+#
+# mod_python
+# 
+# this was dropped in fedora18, at which point the intention has been to
+# move to wsgi instead; however our using wsgi currently looks unstable
+# so you have the option to install this manually, in which case myplc will 
+# swap to using mod_python - see plc.d/httpd
+ifeq "$DISTRO" "Fedora"
+ifneq "$(DISTRONAME)" "f16"
+mod_python-MODULES := mod_python
+mod_python-SPEC        := mod_python.spec
+mod_python-BUILD-FROM-SRPM := yes
+ALL += mod_python
+endif
+endif

 
 #
 # drupal
 
 #
 # drupal