[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-unstable-96-g1eddefa
James Peach
jpeach at samba.org
Tue Oct 23 05:05:30 GMT 2007
The branch, v3-2-test has been updated
via 1eddefa72cefd0c6836ddbe8eaef074ce732b0d9 (commit)
from 37ee6f498b175b8f3b7e75eba8dd7c709327384c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 1eddefa72cefd0c6836ddbe8eaef074ce732b0d9
Author: James Peach <jpeach at samba.org>
Date: Mon Oct 22 22:03:40 2007 -0700
Reorder pthread mutex check so that it doesn't output its result
in the middle of the output for the winbind nss check.
-----------------------------------------------------------------------
Summary of changes:
source/configure.in | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/configure.in b/source/configure.in
index a96e2d9..90c61c7 100644
--- a/source/configure.in
+++ b/source/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]),,
--
Samba Shared Repository
More information about the samba-cvs
mailing list