s3: get pthread detection also on HP-UX right

diff --git a/source3/configure.in b/source3/configure.in
index a5d0b0669bed0fd583a2067e8d0ed33bce655da9..2766d07d18b719d6947882d2a52d810f93c2a109 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6361,17 +6361,28 @@ if test "x$PTHREAD_LDFLAGS" = xerror; then
                 PTHREAD_LDFLAGS="-lpthread" ])
 fi
 
                 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
 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_CFLAGS=$CFLAGS
        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"

+       ac_save_LDFLAGS=$LDFLAGS
+       LDFLAGS="$LDFLAGS $PTHREAD_LDFLAGS"

        AC_CHECK_HEADERS(pthread.h)
        CFLAGS=$ac_save_CFLAGS
        AC_CHECK_HEADERS(pthread.h)
        CFLAGS=$ac_save_CFLAGS

+       LDFLAGS=$ac_save_LDFLAGS

 fi
 
 #################################################
 fi
 
 #################################################