[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  6bade10... s3: get pthread detection also on HP-UX right
      from  dffb5ad... Implemented net fsmo command for transferring fsmo roles

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


- Log -----------------------------------------------------------------
commit 6bade10a1eb21689613770f9a54e0a080663029c
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Jan 27 18:54:55 2010 +0100

    s3: get pthread detection also on HP-UX right

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

Summary of changes:
 source3/configure.in |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index a5d0b06..2766d07 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6361,17 +6361,28 @@ if test "x$PTHREAD_LDFLAGS" = xerror; then
 		 PTHREAD_LDFLAGS="-lpthread" ])
 fi
 
+# especially for HP-UX, where the AC_CHECK_FUNC macro fails to test for
+# pthread_attr_init. On pthread_mutex_lock it works there...
+if test "x$PTHREAD_LDFLAGS" = xerror; then
+   AC_CHECK_LIB(pthread, pthread_mutex_lock, [
+		PTHREAD_CFLAGS=="-D_REENTRANT"
+		PTHREAD_LDFLAGS="-lpthread" ])
+fi
+
 AC_SUBST(PTHREAD_CFLAGS)
 AC_SUBST(PTHREAD_LDFLAGS)
 
 samba_cv_HAVE_PTHREAD=no
 if test x"$PTHREAD_CFLAGS" != xerror -a x"$PTHREAD_LDFLAGS" != xerror; then
 	samba_cv_HAVE_PTHREAD=yes
-	# now check for pthread.h with pthread-correct CFLAGS:
+	# now check for pthread.h with pthread-correct CFLAGS and LDFLAGS:
 	ac_save_CFLAGS=$CFLAGS
 	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+	ac_save_LDFLAGS=$LDFLAGS
+	LDFLAGS="$LDFLAGS $PTHREAD_LDFLAGS"
 	AC_CHECK_HEADERS(pthread.h)
 	CFLAGS=$ac_save_CFLAGS
+	LDFLAGS=$ac_save_LDFLAGS
 fi
 
 #################################################


-- 
Samba Shared Repository