X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=configure.in;h=097c7427149c78dd634e1d22c722e5108c8e5111;hb=e762b1bf39c1080e4155e0a592f22452130bdfc6;hp=c332e04555bced23c743035f3272ae329707b5b5;hpb=6315e1a380ecdb706d4f6518d2e8c7eb0db8fbe2;p=ncurses.git diff --git a/configure.in b/configure.in index c332e045..097c7427 100644 --- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.757 2023/02/25 19:50:10 tom Exp $ +dnl $Id: configure.in,v 1.764 2023/05/06 19:40:40 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl For additional information, see @@ -38,7 +38,7 @@ dnl https://invisible-island.net/autoconf/my-autoconf.html dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20210101) -AC_REVISION($Revision: 1.757 $) +AC_REVISION($Revision: 1.764 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -186,22 +186,6 @@ AC_ARG_WITH(progs, [cf_with_progs=yes]) AC_MSG_RESULT($cf_with_progs) -if test -f "$srcdir/tack/tack.h" ; then - if test "x$cross_compiling" = xyes ; then - CF_VERBOSE(ignoring tack because we are cross-compiling) - cf_with_tack=no - else - AC_MSG_CHECKING(if you want to build the tack program) - AC_ARG_WITH(tack, - [ --without-tack suppress build/install with tack program], - [cf_with_tack=$withval], - [cf_with_tack=$cf_with_progs]) - AC_MSG_RESULT($cf_with_tack) - fi -else - cf_with_tack=no -fi - AC_MSG_CHECKING(if you want to build test-programs) AC_ARG_WITH(tests, [ --without-tests suppress build/install with test-programs], @@ -218,7 +202,6 @@ AC_MSG_RESULT($with_curses_h) modules_to_build="ncurses" test "X$cf_with_progs" != Xno && modules_to_build="$modules_to_build progs" -test "X$cf_with_tack" != Xno && modules_to_build="$modules_to_build tack" modules_to_build="$modules_to_build panel menu form" AC_ARG_PROGRAM @@ -872,16 +855,24 @@ AC_ARG_ENABLE(root-environ, [with_root_environ=$enableval], [with_root_environ=yes]) AC_MSG_RESULT($with_root_environ) -test "x$with_root_environ" = xyes && AC_DEFINE(USE_ROOT_ENVIRON,1,[Define to 1 if root is allowed to use ncurses environment]) +test "x$with_root_environ" = xyes && AC_DEFINE(USE_ROOT_ENVIRON,1,[Define to 1 if root/setuid application is allowed to use ncurses environment]) AC_MSG_CHECKING(if you want to permit setuid programs to access all files) -AC_ARG_ENABLE(root-environ, +AC_ARG_ENABLE(root-access, [ --disable-root-access restrict file-access when running setuid], [with_root_access=$enableval], [with_root_access=yes]) AC_MSG_RESULT($with_root_access) test "x$with_root_access" = xyes && AC_DEFINE(USE_ROOT_ACCESS,1,[Define to 1 if setuid is allowed all file-access]) +AC_MSG_CHECKING(if you want to permit setuid use of ncurses environment variables) +AC_ARG_ENABLE(setuid-environ, + [ --disable-setuid-environ restrict setuid use of ncurses environment variables], + [with_setuid_environ=$enableval], + [with_setuid_environ=$with_root_environ]) +AC_MSG_RESULT($with_setuid_environ) +test "x$with_setuid_environ" = xyes && AC_DEFINE(USE_SETUID_ENVIRON,1,[Define to 1 if setuid/setgid application is allowed to use ncurses environment]) + ### Use option --enable-symlinks to make tic use symlinks, not hard links ### to reduce storage requirements for the terminfo database. CF_LINK_FUNCS @@ -1178,7 +1169,6 @@ if test "x$with_ext_funcs" = xyes ; then AC_DEFINE(HAVE_RESIZE_TERM,1,[Define to 1 to enable resize_term() function in test-programs]) AC_DEFINE(HAVE_TERM_ENTRY_H,1,[Define to 1 to enable term_entry() function in test-programs]) AC_DEFINE(HAVE_USE_DEFAULT_COLORS,1,[Define to 1 to enable use_default_colors() function in test-programs]) - AC_DEFINE(HAVE_USE_EXTENDED_NAMES,1,[Define to 1 to enable use_extended_names() function in test-programs]) AC_DEFINE(HAVE_USE_SCREEN,1,[Define to 1 to enable use_screen() function in test-programs]) AC_DEFINE(HAVE_USE_WINDOW,1,[Define to 1 to enable use_window() function in test-programs]) AC_DEFINE(HAVE_WRESIZE,1,[Define to 1 to enable wresize() function in test-programs]) @@ -1272,17 +1262,13 @@ if test "x$with_ext_mouse" = xyes ; then CF_NCURSES_ABI_6 fi -case $cf_cv_abi_default in -(5) +if test $cf_cv_abi_default -le 5 ; then NCURSES_MOUSE_VERSION=1 - ;; -(6) +elif test $cf_cv_abi_default -le 6 ; then NCURSES_MOUSE_VERSION=2 - ;; -([[789]]) +else NCURSES_MOUSE_VERSION=3 - ;; -esac +fi AC_SUBST(NCURSES_MOUSE_VERSION) @@ -1322,7 +1308,10 @@ AC_ARG_ENABLE(tcap-names, [with_tcap_names=$with_ext_funcs]) AC_MSG_RESULT($with_tcap_names) NCURSES_XNAMES=0 -test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1 +if test "x$with_tcap_names" = xyes; then + NCURSES_XNAMES=1 + AC_DEFINE(NCURSES_XNAMES,1,[Define to 1 to compile with user-definable terminal capabilities]) +fi AC_SUBST(NCURSES_XNAMES) ############################################################################## @@ -1768,6 +1757,7 @@ limits.h \ locale.h \ math.h \ poll.h \ +sys/auxv.h \ sys/ioctl.h \ sys/param.h \ sys/poll.h \ @@ -1827,9 +1817,11 @@ CF_FUNC_GETTIME AC_CHECK_FUNCS( \ fpathconf \ getcwd \ +getauxval \ getegid \ geteuid \ getopt \ +getuid \ issetugid \ localeconv \ poll \ @@ -2344,10 +2336,6 @@ AC_SUBST(TICS_LIST) AC_SUBST(TINFO_LIST) AC_SUBST(SHLIB_LIST) -# used to separate tack out of the tree -NCURSES_TREE= -AC_SUBST(NCURSES_TREE) - ### predefined stuff for the test programs AC_DEFINE(HAVE_SLK_COLOR,1,[Define to 1 if we have slk_color for test-programs]) @@ -2539,8 +2527,6 @@ AC_SUBST(PRIVATE_LIBS) # This is used for the *-config script and *.pc data files. CF_LD_SEARCHPATH -AC_DEFINE(HAVE_CURSES_DATA_BOOLNAMES,1,[definition needed for in-tree build of tack]) - AC_OUTPUT( \ include/MKterm.h.awk \ include/curses.head:include/curses.h.in \