diff options
| author | James Peach <jpeach@samba.org> | 2007-10-22 22:03:40 -0700 |
|---|---|---|
| committer | James Peach <jpeach@samba.org> | 2007-10-22 22:03:40 -0700 |
| commit | e5fe5a569f5797a1b8528e836cd5b8f428840cee (patch) | |
| tree | 8347c539f85a8c7bbe12b369abce8305253bd1fb /source3 | |
| parent | 5e8086e9a2c6bc2d68b06d7c70261bf0f75636db (diff) | |
| download | samba-e5fe5a569f5797a1b8528e836cd5b8f428840cee.tar.gz samba-e5fe5a569f5797a1b8528e836cd5b8f428840cee.tar.bz2 samba-e5fe5a569f5797a1b8528e836cd5b8f428840cee.zip | |
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)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/configure.in | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/source3/configure.in b/source3/configure.in index a96e2d91f6..90c61c7152 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -5973,18 +5973,6 @@ case "$host_os" in ;; 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 AC_ARG_WITH(winbind, @@ -6036,6 +6024,19 @@ else AC_MSG_RESULT(no$winbind_no_reason) 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 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]),, |