From a08604b78f82ae2adf57b7a30bd8c80a11223b0d Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Tue, 12 Jun 2012 14:23:12 -0400 Subject: [PATCH] uss: allow disabling by configure switch provide an option to disable building uss. current heimdal when built static can leak symbol names for its flex/bison parser causing symbol conflicts. this is but a workaround, but sites not needing uss can at least use it. Change-Id: Ibab1dd189e7fbc41ca01e7ef7479421c056999f5 Reviewed-on: http://gerrit.openafs.org/7553 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- Makefile.in | 6 +++++- acinclude.m4 | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 714f2f60b..072dfdd55 100644 --- a/Makefile.in +++ b/Makefile.in @@ -348,7 +348,11 @@ scout: cmd comerr gtx fsprobe fi uss: hcrypto kauth cmd comerr rx vlserver vol volser - +${COMPILE_PART1} uss ${COMPILE_PART2} + +if test "@BUILD_USS@" = "yes"; then \ + ${COMPILE_PART1} uss ${COMPILE_PART2} ; \ + else \ + echo Not building uss. ; \ + fi bozo: cmd comerr audit auth kauth volser +${COMPILE_PART1} bozo ${COMPILE_PART2} diff --git a/acinclude.m4 b/acinclude.m4 index 085cfba02..f3ccfe080 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -81,6 +81,8 @@ AC_ARG_ENABLE([pam], [enable_pam="yes"]) AC_ARG_ENABLE([gtx], AS_HELP_STRING([--disable-gtx], [disable gtx curses-based terminal tools])) +AC_ARG_ENABLE([uss], + AS_HELP_STRING([--disable-uss], [disable uss bulk creation tool])) AC_ARG_ENABLE([namei-fileserver], [AS_HELP_STRING([--enable-namei-fileserver], [force compilation of namei fileserver in preference to inode @@ -1407,6 +1409,13 @@ else fi AC_SUBST(BUILD_LOGIN) +if test "$enable_uss" = yes; then + BUILD_USS="yes" +else + BUILD_USS="no" +fi +AC_SUBST(BUILD_USS) + AC_CHECK_FUNCS([ \ arc4random \ fcntl \ -- 2.39.5