DEVEL15-no-unconditional-pthreaded-ubik-20080718
authorRuss Allbery <rra@stanford.edu>
Sat, 19 Jul 2008 04:31:17 +0000 (04:31 +0000)
committerRuss Allbery <rra@stanford.edu>
Sat, 19 Jul 2008 04:31:17 +0000 (04:31 +0000)
LICENSE BSD

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

(cherry picked from commit d811361ce9b64938c0eeb4ab4ca7ad77f6502c60)

Makefile.in

index 30258b0..95f3668 100644 (file)
@@ -189,7 +189,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]) \
@@ -206,7 +206,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]) \
@@ -264,7 +264,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]) \