X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=configure.in;h=4ad5523521c1906fa672ba04b83185d570c92ce5;hb=2035f48ed0fc56ec4e5caf9b7c10e00ba43e160f;hp=6a90e20f3a41f346918d3ab161d6dbcc1d5531ab;hpb=1a0bb95ebd085cdfd60b68c7b3cccbb31493d6d5;p=ncurses.git diff --git a/configure.in b/configure.in index 6a90e20f..4ad55235 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2021,2022 Thomas E. Dickey * +dnl Copyright 2018-2022,2023 Thomas E. Dickey * dnl Copyright 1998-2017,2018 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.750 2022/10/08 15:54:35 tom Exp $ +dnl $Id: configure.in,v 1.765 2023/07/22 17:20:35 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.750 $) +AC_REVISION($Revision: 1.765 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -61,6 +61,9 @@ CF_CFG_DEFAULTS ### Defaults for ncurses ABI CF_ABI_DEFAULTS +### override ABI version, e.g., packagers +CF_WITH_ABI_ALTERED + ### Checks for programs. AC_ARG_WITH(ada, [ --without-ada suppress check for Ada compiler, don't build demo], @@ -183,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], @@ -215,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 @@ -420,6 +406,10 @@ LIB_SUFFIX= AC_SUBST(LIB_SUFFIX) CF_PATHSEP +# headers needed for checks... +AC_CHECK_DECL(exit) +AC_HEADER_DIRENT + ############################################################################### AC_MSG_CHECKING(if you want to build a separate terminfo library) @@ -706,7 +696,7 @@ AC_MSG_CHECKING(if xterm backspace sends BS or DEL) AC_ARG_WITH(xterm-kbs, [ --with-xterm-kbs=XXX specify if xterm backspace sends BS or DEL], [with_xterm_kbs=$withval], - [with_xterm_kbs=BS]) + [with_xterm_kbs=auto]) case x$with_xterm_kbs in (xyes|xno|xBS|xbs|x8) with_xterm_kbs=BS @@ -714,6 +704,9 @@ case x$with_xterm_kbs in (xDEL|xdel|x127) with_xterm_kbs=DEL ;; +(xauto) + with_xterm_kbs=$want_xterm_kbs + ;; (*) with_xterm_kbs=$withval ;; @@ -724,7 +717,7 @@ AC_SUBST(XTERM_KBS) if test "x$with_xterm_kbs" != "x$want_xterm_kbs" then - AC_MSG_WARN(expected --with-xterm-kbs=$want_xterm_kbs for $host_os) + AC_MSG_WARN([expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs]) fi MAKE_TERMINFO= @@ -865,16 +858,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 @@ -1171,7 +1172,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]) @@ -1265,17 +1265,13 @@ if test "x$with_ext_mouse" = xyes ; then CF_NCURSES_ABI_6 fi -case $cf_cv_abi_version 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) @@ -1315,7 +1311,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) ############################################################################## @@ -1743,12 +1742,6 @@ case "$cf_cv_system_name" in CF_CHECK_LIBSSP ;; (*) -AC_CHECK_FUNC(gettimeofday, - AC_DEFINE(HAVE_GETTIMEOFDAY,1,[Define to 1 if we have gettimeofday function]),[ - -AC_CHECK_LIB(bsd, gettimeofday, - AC_DEFINE(HAVE_GETTIMEOFDAY,1,[Define to 1 if we have gettimeofday function]) - CF_ADD_LIB(bsd))])dnl CLIX: bzero, select, gettimeofday ;; esac @@ -1756,8 +1749,6 @@ CF_MATH_LIB(MATH_LIB,pow(sin(x),x)) AC_SUBST(MATH_LIB) ### Checks for header files. -AC_STDC_HEADERS -AC_HEADER_DIRENT AC_HEADER_TIME CF_REGEX @@ -1769,6 +1760,7 @@ limits.h \ locale.h \ math.h \ poll.h \ +sys/auxv.h \ sys/ioctl.h \ sys/param.h \ sys/poll.h \ @@ -1824,12 +1816,15 @@ CF_ERRNO CF_LINK_DATAONLY ### Checks for library functions. +CF_FUNC_GETTIME AC_CHECK_FUNCS( \ fpathconf \ getcwd \ +getauxval \ getegid \ geteuid \ getopt \ +getuid \ issetugid \ localeconv \ poll \ @@ -2344,10 +2339,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]) @@ -2508,7 +2499,7 @@ cf_filter_syms=no if test -n "$RESULTING_SYMS" then cf_filter_syms=$cf_dft_filter_syms - CF_VERBOSE(will map symbols to ABI=$cf_cv_abi_version) + CF_VERBOSE(will map symbols to ABI=$cf_cv_abi_default) fi if test "x$WILDCARD_SYMS" = xno @@ -2539,20 +2530,20 @@ 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 \ include/ncurses_dll.h \ include/termcap.h \ include/unctrl.h \ + man/man_db.renames \ $SUB_MAKEFILES \ Makefile,[ if test "x$cf_with_tests" != xno ; then CF_PRG_RULES(["$srcdir/test/mk-test.awk" INSTALL=no ECHO_LINK="$ECHO_LD"], test) fi CF_LIB_RULES($SRC_SUBDIRS) +CF_OUTPUT_MANPAGE_RENAMES if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then if test -z "$USE_OLD_MAKERULES" ; then @@ -2569,9 +2560,7 @@ CXX_NAME="$CXX_NAME" DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX" DFT_LWR_MODEL="$DFT_LWR_MODEL" ECHO_LD="$ECHO_LD" -EGREP="${EGREP-grep -E}" EXTRA_SUFFIX="$EXTRA_SUFFIX" -FGREP="${FGREP-grep -F}" FORM_NAME="$FORM_NAME" LDCONFIG="$LDCONFIG" LIBTOOL_VERSION="$LIBTOOL_VERSION" @@ -2582,6 +2571,7 @@ LIB_SUFFIX="$LIB_SUFFIX" LIB_TRACING="$LIB_TRACING" LN_S="$LN_S" MAKE_TERMINFO="$MAKE_TERMINFO" +MANPAGE_RENAMES="$MANPAGE_RENAMES" MENU_NAME="$MENU_NAME" NCURSES_MAJOR="$NCURSES_MAJOR" NCURSES_MINOR="$NCURSES_MINOR" @@ -2611,6 +2601,7 @@ WITH_OVERWRITE="$with_overwrite" cf_LIST_MODELS="$cf_list_models" cf_cv_VERSION_GNATMAKE=$cf_cv_VERSION_GNATMAKE cf_cv_VERSION_GPRBUILD=$cf_cv_VERSION_GPRBUILD +cf_cv_abi_default="$cf_cv_abi_default" cf_cv_abi_version="$cf_cv_abi_version" cf_cv_do_relink="$cf_cv_do_relink" cf_cv_do_reranlib="$cf_cv_do_reranlib" @@ -2635,6 +2626,7 @@ cf_with_manpages="$cf_with_manpages" cf_with_tests="$cf_with_tests" host="$host" target="$target" +verbose="$verbose" with_shared_cxx="$with_shared_cxx" ],cat)dnl