From 1529791969580c0ae20258cf4f320a07e3e1670d Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Tue, 12 Jun 2012 14:10:04 -0400 Subject: [PATCH] gtx: add configure switch to force not building allow gtx and associated software to be turned off. Reviewed-on: http://gerrit.openafs.org/7552 Tested-by: BuildBot Reviewed-by: Derrick Brashear (cherry picked from commit 5d53c12b95c6ffac6c00e4fec6138a51b6185dd7) Change-Id: I79e3e2116dd244f4561be841beecb7c24eb59a18 Reviewed-on: http://gerrit.openafs.org/12095 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk Reviewed-by: Stephan Wiesand Tested-by: Stephan Wiesand --- acinclude.m4 | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index af56ea4de..7a27f1b23 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -80,6 +80,8 @@ AC_ARG_ENABLE([pam], [AS_HELP_STRING([--disable-pam], [disable PAM support])], , [enable_pam="yes"]) +AC_ARG_ENABLE([gtx], + AS_HELP_STRING([--disable-gtx], [disable gtx curses-based terminal tools])) AC_ARG_ENABLE([namei-fileserver], [AS_HELP_STRING([--enable-namei-fileserver], [force compilation of namei fileserver in preference to inode @@ -1439,16 +1441,16 @@ dnl see what struct stat has for timestamps AC_CHECK_MEMBERS([struct stat.st_ctimespec, struct stat.st_ctimensec]) dnl check for curses-lib -save_LIBS=$LIBS -AC_CHECK_LIB( [ncurses], [setupterm], -[LIB_curses=-lncurses], - [AC_CHECK_LIB([Hcurses], [setupterm], [LIB_curses=-lHcurses], - [AC_CHECK_LIB([curses], [setupterm], [LIB_curses=-lcurses]) - ]) -]) -LIBS=$save_LIBS -AC_SUBST(LIB_curses) - +AS_IF([test "x$enable_gtx" != "xno"], + [save_LIBS=$LIBS + AC_CHECK_LIB( [ncurses], [setupterm], + [LIB_curses=-lncurses], + [AC_CHECK_LIB([Hcurses], [setupterm], [LIB_curses=-lHcurses], + [AC_CHECK_LIB([curses], [setupterm], [LIB_curses=-lcurses])]) + ]) + LIBS=$save_LIBS + AC_SUBST(LIB_curses)]) + OPENAFS_TEST_PACKAGE(libintl,[#include ],[-lintl],,,INTL) dnl Don't build PAM on IRIX; the interface doesn't work for us. -- 2.39.5