[gtk-osx] Force libxml2 to install its python module, and to do so in $PREFIX.

[John Ralls <jralls src gnome org>]

commit 71b50801df7b2542a129bf56c4e06eb3d1d43d17
Author: John Ralls <jralls ceridwen us>
Date:   Fri Feb 14 15:52:46 2014 -0800

    Force libxml2 to install its python module, and to do so in $PREFIX.

 jhbuildrc-gtk-osx                             |    1 +
 modulesets-stable/gtk-osx-bootstrap.modules   |    2 +-
 modulesets-unstable/gtk-osx-bootstrap.modules |    5 +++--
 modulesets/gtk-osx-bootstrap.modules          |    2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 537a1cc..97e3dfa 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -661,6 +661,7 @@ prependpath('PYTHONPATH', os.path.join(prefix , 'lib',  _version, 'site-packages
 prependpath('PYTHONPATH', os.path.join(prefix , 'lib',  _version))
 prependpath('PERL5LIB', prefix + '/lib/perl5/vendor_perl')
 prependpath('PERL5LIB', prefix + '/lib/perl5/site_perl')
+os.environ['PYTHON_SITE_PACKAGES'] = os.path.join(prefix, 'lib', _version, 'site-packages')
 
 # Point gtk-doc and other xsltproc users to our XML catalog.
 #
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index f95ec3b..e7e4a6f 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -62,7 +62,7 @@
        module won't link. In case you're wondering, gnome-doc-utils
        needs libxml2's python module. -->
 
-  <autotools id="libxml2" autogen-sh="configure">
+  <autotools id="libxml2" autogen-sh="configure" autogenargs="--with-python">
     <branch version="2.9.0" module="libxml2-2.9.0.tar.gz"
            repo="xmlsoft.org">
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/libxml2-Bug-686118-pthreads_once_init.patch"; 
strip="1"/>
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 8eb5d3f..7ccb222 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -66,7 +66,7 @@
            repo="xmlsoft.org">
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/libxml2-Bug-686118-pthreads_once_init.patch"; 
strip="1"/>
     </branch-->
-  <autotools id="libxml2">
+  <autotools id="libxml2" autogenargs="--with-python">
     <branch repo="git.gnome.org"/>
     <after>
       <dep package="python2.7"/>
@@ -89,7 +89,8 @@
 <!-- This has python bits that don't work in a separate build
      dir. Until a better solution is found, just copy the source int
      the build and try again. -->
-  <autotools id="gnome-doc-utils" autogenargs="--disable-scrollkeeper" >
+  <autotools id="gnome-doc-utils" autogenargs="--disable-scrollkeeper"
+            supports-non-srcdir-builds="no">
     <branch repo="git.gnome.org"/>
     <dependencies>
       <dep package="libxslt"/>
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 5e8a6ba..429dd90 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -62,7 +62,7 @@
        module won't link. In case you're wondering, gnome-doc-utils
        needs libxml2's python module. -->
 
-  <autotools id="libxml2" autogen-sh="configure">
+  <autotools id="libxml2" autogen-sh="configure" autogenargs="--with-python">
     <branch version="2.9.0" module="libxml2-2.9.0.tar.gz"
            repo="xmlsoft.org">
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/libxml2-Bug-686118-pthreads_once_init.patch"; 
strip="1"/>