From: Russ Allbery <rra@stanford.edu>
Date: Sat, 19 Jul 2008 04:27:33 +0000 (+0000)
Subject: no-unconditional-pthreaded-ubik-20080718
X-Git-Tag: openafs-devel-1_5_61~957
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d811361ce9b64938c0eeb4ab4ca7ad77f6502c60;p=packages%2Fo%2Fopenafs.git

no-unconditional-pthreaded-ubik-20080718

LICENSE BSD

Don't compile pthreaded Ubik by default and instead actually require the
--enable-pthreaded-ubik flag.
---

diff --git a/Makefile.in b/Makefile.in
index abe2b80e7..3c4299181 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -188,7 +188,7 @@ ubik: cmd comerr auth ubik_depinstall
 	${COMPILE_PART1} ubik ${COMPILE_PART2}
 
 tubik: ubik libafsrpc
-	case ${SYS_NAME} in \
+	[ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \
 	alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \
 		${COMPILE_PART1} tubik ${COMPILE_PART2} ;; \
 	*_darwin_[1-6][0-9]) \
@@ -205,7 +205,7 @@ ptserver: cmd comerr ubik cmd comerr auth audit ptserver_depinstall
 	${COMPILE_PART1} ptserver ${COMPILE_PART2}
 
 tptserver: cmd comerr ptserver tubik libafsrpc libafsauthent
-	case ${SYS_NAME} in \
+	[ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \
 	alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \
 		${COMPILE_PART1} tptserver ${COMPILE_PART2} ;; \
 	*_darwin_[1-6][0-9]) \
@@ -260,7 +260,7 @@ vlserver: cmd comerr vol audit vlserver_depinstall
 	${COMPILE_PART1} vlserver ${COMPILE_PART2}
 
 tvlserver: cmd comerr vol audit tubik libafsrpc libafsauthent tvlserver_depinstall
-	case ${SYS_NAME} in \
+	[ yes != "$(ENABLE_PTHREADED_UBIK)" ] || case ${SYS_NAME} in \
 	alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*[of]bsd*|*nbsd[234]*) \
 		${COMPILE_PART1} tvlserver ${COMPILE_PART2} ;; \
 	*_darwin_[1-6][0-9]) \