From: Ken Raeburn <raeburn@mit.edu>
Date: Sun, 11 Jul 2004 20:17:45 +0000 (+0000)
Subject: * aclocal.m4 (KRB5_AC_ENABLE_THREADS): Fix typo that caused some code to be
X-Git-Tag: krb5-1.4-beta1~223
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2cc791edb53dd12e95ad56fd522c17ef7eb16ede;p=krb5.git

* aclocal.m4 (KRB5_AC_ENABLE_THREADS): Fix typo that caused some code to be
omitted.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16584 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 282b79520..44e51373b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,7 +2,8 @@
 
 	* aclocal.m4 (KRB5_AC_ENABLE_THREADS): Use PTHREAD_CFLAGS and
 	PTHREAD_LIBS when checking for pthread_mutexattr_setrobust_np
-	availability with thread support enabled.
+	availability with thread support enabled.  Fix typo that caused
+	some code to be omitted.
 
 2004-07-09  Ken Raeburn  <raeburn@mit.edu>
 
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 8fce1c966..a0691cf8d 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -142,17 +142,17 @@ if test "$enable_thread_support" = yes ; then
 fi
 dnl Maybe this should be inside the conditional above?  Doesn't cache....
 if test "$enable_thread_support" = yes; then
-ACX_PTHREAD(,[AC_MSG_ERROR([cannot determine options for enabling thread support])])
-AC_MSG_NOTICE(PTHREAD_CC = $PTHREAD_CC)
-AC_MSG_NOTICE(PTHREAD_CFLAGS = $PTHREAD_CFLAGS)
-AC_MSG_NOTICE(PTHREAD_LIBS = $PTHREAD_LIBS)
-dnl Not really needed -- if pthread.h isn't found, ACX_PTHREAD will fail.
-dnl AC_CHECK_HEADERS(pthread.h)
-# AIX and Tru64 don't support weak references, and don't have
-# stub versions of the pthread code in libc.
-case "${host_os}" in
-  aix* | osf*) LIBS="$LIBS $PTHREAD_LIBS" ;;
-esac
+  ACX_PTHREAD(,[AC_MSG_ERROR([cannot determine options for enabling thread support])])
+  AC_MSG_NOTICE(PTHREAD_CC = $PTHREAD_CC)
+  AC_MSG_NOTICE(PTHREAD_CFLAGS = $PTHREAD_CFLAGS)
+  AC_MSG_NOTICE(PTHREAD_LIBS = $PTHREAD_LIBS)
+  dnl Not really needed -- if pthread.h isn't found, ACX_PTHREAD will fail.
+  dnl AC_CHECK_HEADERS(pthread.h)
+  # AIX and Tru64 don't support weak references, and don't have
+  # stub versions of the pthread code in libc.
+  case "${host_os}" in
+    aix* | osf*) LIBS="$LIBS $PTHREAD_LIBS" ;;
+  esac
 fi
 dnl We want to know where these routines live, so on systems with weak
 dnl reference support we can figure out whether or not the pthread library
@@ -170,11 +170,10 @@ LIBS="$PTHREAD_LIBS $LIBS"
 AC_MSG_NOTICE(rechecking with PTHREAD_... options)
 AC_CHECK_LIB(c, pthread_mutexattr_setrobust_np,
   [AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_SETROBUST_NP_IN_THREAD_LIB,1,[Define if pthread_mutexattr_setrobust_np is provided in the thread library.])])
-])
 LIBS="$old_LIBS"
 CC="$old_CC"
 CFLAGS="$old_CFLAGS"
-fi
+])
 
 dnl This is somewhat gross and should go away when the build system
 dnl is revamped. -- tlyu