mirror of
https://github.com/samba-team/samba.git
synced 2025-02-28 01:58:17 +03:00
Reorder pthread mutex check so that it doesn't output its result
in the middle of the output for the winbind nss check. (This used to be commit 1eddefa72cefd0c6836ddbe8eaef074ce732b0d9)
This commit is contained in:
parent
5e8086e9a2
commit
e5fe5a569f
@ -5973,18 +5973,6 @@ case "$host_os" in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
AC_CHECK_LIB(pthread, pthread_mutex_lock, [WINBIND_NSS_PTHREAD="-lpthread"
|
|
||||||
AC_DEFINE(HAVE_PTHREAD, 1, [whether pthread exists])])
|
|
||||||
AC_SUBST(WINBIND_NSS_PTHREAD)
|
|
||||||
AC_SUBST(WINBIND_NSS)
|
|
||||||
AC_SUBST(WINBIND_WINS_NSS)
|
|
||||||
AC_SUBST(WINBIND_NSS_LDSHFLAGS)
|
|
||||||
AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
|
|
||||||
AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
|
|
||||||
AC_SUBST(NSSSONAMEVERSIONSUFFIX)
|
|
||||||
|
|
||||||
AC_SUBST(WINBIND_KRB5_LOCATOR)
|
|
||||||
|
|
||||||
# Check the setting of --with-winbind
|
# Check the setting of --with-winbind
|
||||||
|
|
||||||
AC_ARG_WITH(winbind,
|
AC_ARG_WITH(winbind,
|
||||||
@ -6036,6 +6024,19 @@ else
|
|||||||
AC_MSG_RESULT(no$winbind_no_reason)
|
AC_MSG_RESULT(no$winbind_no_reason)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_CHECK_LIB(pthread, pthread_mutex_lock, [WINBIND_NSS_PTHREAD="-lpthread"
|
||||||
|
AC_DEFINE(HAVE_PTHREAD, 1, [whether pthread exists])])
|
||||||
|
|
||||||
|
AC_SUBST(WINBIND_NSS_PTHREAD)
|
||||||
|
AC_SUBST(WINBIND_NSS)
|
||||||
|
AC_SUBST(WINBIND_WINS_NSS)
|
||||||
|
AC_SUBST(WINBIND_NSS_LDSHFLAGS)
|
||||||
|
AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
|
||||||
|
AC_SUBST(WINBIND_NSS_EXTRA_LIBS)
|
||||||
|
AC_SUBST(NSSSONAMEVERSIONSUFFIX)
|
||||||
|
|
||||||
|
AC_SUBST(WINBIND_KRB5_LOCATOR)
|
||||||
|
|
||||||
# Solaris 10 does have new member in nss_XbyY_key
|
# Solaris 10 does have new member in nss_XbyY_key
|
||||||
AC_CHECK_MEMBER(union nss_XbyY_key.ipnode.af_family,
|
AC_CHECK_MEMBER(union nss_XbyY_key.ipnode.af_family,
|
||||||
AC_DEFINE(HAVE_NSS_XBYY_KEY_IPNODE, 1, [Defined if union nss_XbyY_key has ipnode field]),,
|
AC_DEFINE(HAVE_NSS_XBYY_KEY_IPNODE, 1, [Defined if union nss_XbyY_key has ipnode field]),,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user