[gtk-osx] Fix berkeleydb config line

[John Ralls <jralls src gnome org>]

commit 56abfb05cc7fecd7943c29f092db15090b2805f1
Author: John Ralls <jralls ceridwen us>
Date:   Sat May 18 13:14:46 2013 -0700

    Fix berkeleydb config line
    
    Apparently jhbuild now ignores the first argument in autogen-template,
    so insert a sacrificial ';'

 modulesets-stable/gtk-osx-python.modules   |    5 +++--
 modulesets-unstable/gtk-osx-python.modules |    4 ++--
 modulesets/gtk-osx-python.modules          |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index 60bd96e..288c7a7 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -41,7 +41,7 @@
 
   <autotools id="berkeleydb" autogen-sh="configure"
             supports-non-srcdir-builds="no"  makeargs="-C build_unix"
-            autogen-template="cd build_unix; ../dist/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s"
+            autogen-template="; cd build_unix; ../dist/%(autogen-sh)s --prefix %(prefix)s --libdir 
%(libdir)s %(autogenargs)s"
             makeinstallargs="-C build_unix install">
 
     <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
@@ -71,6 +71,7 @@
     </dependencies>
     <after>
       <dep package="berkeleydb"/>
+      <dep package="berkeleydb-nonsrctree"/>
     </after>
   </autotools>
 
@@ -81,7 +82,7 @@
     </dependencies>
     <after>
       <dep package="berkeleydb"/>
-      <dep package="berkeleydb-insource"/>
+      <dep package="berkeleydb-nonsrctree"/>
     </after>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index 24da318..8c7236b 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -31,7 +31,7 @@
   </metamodule>
 
    <autotools id="berkeleydb4.8" autogen-sh="dist/configure"
-         autogen-template="cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" makeargs="-C build_unix"
+         autogen-template=";cd build_unix; ../%(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"
@@ -51,7 +51,7 @@
   </autotools>
 
    <autotools id="berkeleydb5.0" autogen-sh="dist/configure"
-         autogen-template="cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" makeargs="-C build_unix"
+         autogen-template=";cd build_unix; ../%(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-5.0.32.NC.tar.gz" version="5.0.32"
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index 738e980..a0b73d4 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -34,7 +34,7 @@
   </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"
+         autogen-template=";cd build_unix; ../%(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"