[gtk-osx] Adjustments to support out-of-srcdir builds

[John Ralls <jralls src gnome org>]

commit 021d2f2e1a24f63369ea45d73d15f3a7f6b83f67
Author: John Ralls <jralls ceridwen us>
Date:   Fri May 3 10:59:25 2013 -0700

    Adjustments to support out-of-srcdir builds
    
    Mostly by flagging those modules for which it doesn't work.

 modulesets-stable/gtk-osx-bootstrap.modules   |    5 +++--
 modulesets-stable/gtk-osx-python.modules      |   16 +++++++++++++---
 modulesets-stable/gtk-osx-unsupported.modules |    3 ++-
 modulesets-unstable/gtk-osx-python.modules    |    3 ++-
 4 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 8f12db5..4f347e2 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -88,7 +88,7 @@
      dir. Until a better solution is found, just copy the source into
      the build and try again.-->
   <autotools id="gnome-doc-utils" autogenargs="--disable-scrollkeeper"
-            autogen-sh="configure" >
+            autogen-sh="configure" supports-non-srcdir-builds="no">
     <branch module="gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz"
            version="0.20.10" hash="sha256:cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6"/>
     <dependencies>
@@ -133,7 +133,8 @@
   </autotools>
 
 <!-- Another one that won't build in a separate directory -->
-  <autotools id="hicolor-icon-theme" autogen-sh="configure">
+  <autotools id="hicolor-icon-theme" autogen-sh="configure"
+            supports-non-srcdir-builds="no">
     <branch module="hicolor-icon-theme-0.11.tar.gz" repo="icon-theme"
            version="0.11" />
 
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index 1d0fc13..11094be 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -39,8 +39,16 @@
     </dependencies>
   </metamodule>
 
-  <autotools id="berkeleydb" autogen-sh="dist/configure"
-         autogen-template="cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" makeargs="-C build_unix"
+<!-- Berkeleydb requires out-of-srcdir builds. This setup assumes that you're doing that. Use 
berkeleydb-insource otherwise. -->
+  <autotools id="berkeleydb" autogen-sh="configure"
+         autogen-template="%(srcdir)s/dist/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" >
+
+    <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
+        repo="oracle" />
+  </autotools>
+
+  <autotools id="berkeleydb-insource" autogen-sh="configure"
+            autogen-template="cd build_unix; %(srcdir)s/dist/%(autogen-sh)s --prefix %(prefix)s --libdir 
%(libdir)s %(autogenargs)s" makeargs="-C build_unix"
          makeinstallargs="-C build_unix install">
 
     <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
@@ -67,6 +75,7 @@
     </dependencies>
     <after>
       <dep package="berkeleydb"/>
+      <dep package="berkeleydb-insource"/>
     </after>
   </autotools>
 
@@ -119,7 +128,8 @@
      installs as pygobject3. Introspection is disabled here, because
      gir-scanner isn't smart enough to co-install them. -->
   <autotools id="pygobject" autogen-sh="configure"
-            autogenargs="--disable-introspection">
+            autogenargs="--disable-introspection"
+            supports-non-srcdir-builds="no">
     <branch version="2.28.6" module="pygobject/2.28/pygobject-2.28.6.tar.bz2"
             hash="sha256:e4bfe017fa845940184c82a4d8949db3414cb29dfc84815fb763697dc85bdcee"/>
     <dependencies>
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index d8e2bc8..4bc305b 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -62,7 +62,8 @@
            repo="iso-codes" checkoutdir="iso-codes-3.41"/>
   </autotools>
 
-  <autotools id="zlib" autogen-sh="configure" skip-autogen="never">
+  <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
+            supports-non-srcdir-builds="no">
     <branch repo="sourceforge" version="1.2.7"
            module="libpng/zlib-1.2.7.tar.gz"/>
   </autotools>
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index 5f30ec8..24da318 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -94,7 +94,8 @@
     </after>
  </distutils>
 
-  <autotools id="pygobject" autogenargs="--disable-introspection">
+  <autotools id="pygobject" autogenargs="--disable-introspection"
+            supports-non-srcdir-builds="no">
     <branch revision="pygobject-2-28"/>
     <dependencies>
       <dep package="python2.7"/>