[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-730-g6b595a9

Jelmer Vernooij jelmer at samba.org
Sat Sep 26 05:54:25 MDT 2009


The branch, master has been updated
       via  6b595a93c1eb380ef6120dbbcc0c6e6bb7092deb (commit)
      from  8940e42d0ab129317d4c505ed2a401c3f5f9b5f9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6b595a93c1eb380ef6120dbbcc0c6e6bb7092deb
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Sep 26 13:53:27 2009 +0200

    ldb: Check for talloc using pkg-config before checking manually, so we
    find version errors.

-----------------------------------------------------------------------

Summary of changes:
 source4/lib/ldb/external/libtalloc.m4 |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/external/libtalloc.m4 b/source4/lib/ldb/external/libtalloc.m4
index b681541..8c63fcc 100644
--- a/source4/lib/ldb/external/libtalloc.m4
+++ b/source4/lib/ldb/external/libtalloc.m4
@@ -2,6 +2,7 @@ AC_SUBST(TALLOC_OBJ)
 AC_SUBST(TALLOC_CFLAGS)
 AC_SUBST(TALLOC_LIBS)
 
-AC_CHECK_HEADER(talloc.h,
-   [AC_CHECK_LIB(talloc, talloc_init, [TALLOC_LIBS="-ltalloc"]) ],
-   [PKG_CHECK_MODULES(TALLOC, talloc >= 2.0.0)])
+PKG_CHECK_MODULES(TALLOC, talloc >= 2.0.0,
+	[ ],
+	[ AC_CHECK_HEADER(talloc.h, 
+		[ AC_CHECK_LIB(talloc, talloc_init, [TALLOC_LIBS="-ltalloc"])])])


-- 
Samba Shared Repository


More information about the samba-cvs mailing list