jhbuild r2687 - in trunk: . modulesets patches

[tkaroonb svn gnome org]

Author: tkaroonb
Date: Tue Feb  3 09:53:28 2009
New Revision: 2687
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2687&view=rev

Log:
2009-02-03  Theppitak Karoonboonyanan  <thep linux thai net>

	More fix for Bug #569778.

	* patches/samba.configure-for-libs.patch: Adjusted to allow
	non-source-dir configuration via autogen.sh.
	* modulesets/gnome-external-deps-2.26.modules: tdb, talloc and tevent
	now support non-source-dir builds.



Modified:
   trunk/ChangeLog
   trunk/modulesets/gnome-external-deps-2.26.modules
   trunk/patches/samba.configure-for-libs.patch

Modified: trunk/modulesets/gnome-external-deps-2.26.modules
==============================================================================
--- trunk/modulesets/gnome-external-deps-2.26.modules	(original)
+++ trunk/modulesets/gnome-external-deps-2.26.modules	Tue Feb  3 09:53:28 2009
@@ -725,7 +725,8 @@
   </autotools>
 
   <autotools id="talloc"
-             supports-non-srcdir-builds="no">
+	    makeargs="tallocdir='$(srcdir)'"
+	    makeinstallargs="install tallocdir='$(srcdir)'">
     <branch repo="samba.org"
             module="samba4/samba-4.0.0alpha6.tar.gz" version="4.0.0alpha6"
             size="11797312" md5sum="2f6e52349eebabe83ed3cf207a8739f3"
@@ -734,8 +735,7 @@
     </branch>
   </autotools>
 
-  <autotools id="tdb"
-             supports-non-srcdir-builds="no">
+  <autotools id="tdb">
     <branch repo="samba.org"
             module="samba4/samba-4.0.0alpha6.tar.gz" version="4.0.0alpha6"
             size="11797312" md5sum="2f6e52349eebabe83ed3cf207a8739f3"
@@ -744,8 +744,7 @@
     </branch>
   </autotools>
 
-  <autotools id="tevent"
-             supports-non-srcdir-builds="no">
+  <autotools id="tevent">
     <branch repo="samba.org"
             module="samba4/samba-4.0.0alpha6.tar.gz" version="4.0.0alpha6"
             size="11797312" md5sum="2f6e52349eebabe83ed3cf207a8739f3"

Modified: trunk/patches/samba.configure-for-libs.patch
==============================================================================
--- trunk/patches/samba.configure-for-libs.patch	(original)
+++ trunk/patches/samba.configure-for-libs.patch	Tue Feb  3 09:53:28 2009
@@ -1,7 +1,7 @@
 diff -Naur samba-4.0.0alpha6.orig/lib/talloc/autogen.sh samba-4.0.0alpha6/lib/talloc/autogen.sh
---- samba-4.0.0alpha6.orig/lib/talloc/autogen.sh	2009-01-21 16:14:23.146538547 +0100
-+++ samba-4.0.0alpha6/lib/talloc/autogen.sh	2009-01-21 16:17:00.855537827 +0100
-@@ -1,5 +1,13 @@
+--- samba-4.0.0alpha6.orig/lib/talloc/autogen.sh	2009-02-03 11:09:21.000000000 +0700
++++ samba-4.0.0alpha6/lib/talloc/autogen.sh	2009-02-03 11:13:03.000000000 +0700
+@@ -1,5 +1,16 @@
  #!/bin/sh
  
 +ARGV0=$0
@@ -12,10 +12,13 @@
 +srcdir=`dirname $ARGV0`
 +test -z "$srcdir" && srcdir=.
 +
++ORIGDIR=`pwd`
++cd $srcdir
++
  rm -rf autom4te.cache
  rm -f configure config.h.in
  
-@@ -9,6 +17,8 @@
+@@ -9,6 +20,8 @@
  
  rm -rf autom4te.cache
  
@@ -27,9 +30,9 @@
 +	echo "Now type \`make' to compile." || exit 1
  
 diff -Naur samba-4.0.0alpha6.orig/lib/tdb/autogen.sh samba-4.0.0alpha6/lib/tdb/autogen.sh
---- samba-4.0.0alpha6.orig/lib/tdb/autogen.sh	2009-01-21 16:14:23.165537336 +0100
-+++ samba-4.0.0alpha6/lib/tdb/autogen.sh	2009-01-21 16:17:39.882537381 +0100
-@@ -1,5 +1,13 @@
+--- samba-4.0.0alpha6.orig/lib/tdb/autogen.sh	2009-02-03 11:09:27.000000000 +0700
++++ samba-4.0.0alpha6/lib/tdb/autogen.sh	2009-02-03 11:13:45.000000000 +0700
+@@ -1,5 +1,16 @@
  #!/bin/sh
  
 +ARGV0=$0
@@ -40,10 +43,13 @@
 +srcdir=`dirname $ARGV0`
 +test -z "$srcdir" && srcdir=.
 +
++ORIGDIR=`pwd`
++cd $srcdir
++
  rm -rf autom4te.cache
  rm -f configure config.h.in
  
-@@ -9,6 +17,8 @@
+@@ -9,6 +20,8 @@
  
  rm -rf autom4te.cache
  
@@ -55,9 +61,9 @@
 +	echo "Now type \`make' to compile." || exit 1
  
 diff -Naur samba-4.0.0alpha6.orig/lib/tevent/autogen.sh samba-4.0.0alpha6/lib/tevent/autogen.sh
---- samba-4.0.0alpha6.orig/lib/tevent/autogen.sh	2009-01-21 16:14:23.144537174 +0100
-+++ samba-4.0.0alpha6/lib/tevent/autogen.sh	2009-01-21 16:17:45.844538192 +0100
-@@ -1,14 +1,24 @@
+--- samba-4.0.0alpha6.orig/lib/tevent/autogen.sh	2009-02-03 11:09:37.000000000 +0700
++++ samba-4.0.0alpha6/lib/tevent/autogen.sh	2009-02-03 11:14:06.000000000 +0700
+@@ -1,14 +1,27 @@
  #!/bin/sh
  
 +ARGV0=$0
@@ -68,6 +74,9 @@
 +srcdir=`dirname $ARGV0`
 +test -z "$srcdir" && srcdir=.
 +
++ORIGDIR=`pwd`
++cd $srcdir
++
  rm -rf autom4te.cache
  rm -f configure config.h.in