uss: always build uss
authorChas Williams (CONTRACTOR) <chas@cmf.nrl.navy.mil>
Mon, 5 Jan 2015 15:41:53 +0000 (10:41 -0500)
committerDaria Brashear <shadow@your-file-system.com>
Wed, 7 Jan 2015 17:37:41 +0000 (12:37 -0500)
Revert change Ibab1dd189e7fbc41ca01e7ef7479421c056999f5 since uss
should always be safe to build now that its parser symbols are private.

Change-Id: I65fd2008b037dd36a2c7d3ef8817d4d7dda689d7
Reviewed-on: http://gerrit.openafs.org/11653
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Daria Brashear <shadow@your-file-system.com>

Makefile.in
acinclude.m4

index 88fde2a..673e942 100644 (file)
@@ -355,11 +355,7 @@ scout: cmd comerr gtx fsprobe
        fi
 
 uss: hcrypto kauth cmd comerr rx vlserver vol volser
-       +if test "@BUILD_USS@" = "yes"; then \
-               ${COMPILE_PART1} uss ${COMPILE_PART2} ; \
-       else \
-               echo Not building uss. ; \
-       fi
+       +${COMPILE_PART1} uss ${COMPILE_PART2}
 
 bozo: cmd comerr audit auth kauth volser
        +${COMPILE_PART1} bozo ${COMPILE_PART2}
index 24d0721..c760eb6 100644 (file)
@@ -79,8 +79,6 @@ dnl General feature options.
 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
@@ -1539,13 +1537,6 @@ else
 fi
 AC_SUBST(BUILD_LOGIN)
 
-if test "$enable_uss" = yes; then
-       BUILD_USS="yes"
-else
-       BUILD_USS="no"
-fi
-AC_SUBST(BUILD_USS)
-
 if test "$enable_kauth" = yes; then
        INSTALL_KAUTH="yes"
 else