X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=configure.in;h=2d6836cb7190eb2ceff01bc788aeb8cfe2ca9db3;hb=refs%2Fheads%2Fmaster;hp=d2a80ac9132c3b4ff9f23b3c21e3a03fdcc56749;hpb=f4056beeb4f75be8c1d1cb7936b2735fa250951a;p=ncurses.git diff --git a/configure.in b/configure.in index d2a80ac9..8a7e6c5e 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2022,2023 Thomas E. Dickey * +dnl Copyright 2018-2023,2024 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.770 2023/10/28 15:41:34 tom Exp $ +dnl $Id: configure.in,v 1.782 2024/05/25 23:05:44 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.770 $) +AC_REVISION($Revision: 1.782 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -65,19 +65,7 @@ CF_ABI_DEFAULTS CF_WITH_ABI_ALTERED ### Checks for programs. -AC_ARG_WITH(ada, - [ --without-ada suppress check for Ada compiler, don't build demo], - [cf_with_ada=$withval], - [cf_with_ada=yes]) - -if test "x$cf_with_ada" = xyes -then - cf_prog_cc="gnatgcc gcc cc" -else - cf_prog_cc="gcc cc" -fi -CF_PROG_CC($cf_prog_cc) - +CF_WITH_ADA AC_PROG_CPP AC_PROG_GCC_TRADITIONAL CF_PROG_CC_C_O(CC,[$CFLAGS $CPPFLAGS]) @@ -235,7 +223,7 @@ if test -z "$MAKE_PC_FILES" then AC_MSG_CHECKING(for suffix to add to pkg-config files) AC_ARG_WITH(pc-suffix, - [ --with-pc-suffix=XXX suffix pkg-config files with XXX], + [[ --with-pc-suffix[=XXX] suffix pkg-config files with XXX]], [case "x$withval" in (xyes|xno) PC_MODULE_SUFFIX= @@ -565,7 +553,7 @@ CF_HELP_MESSAGE(Fine-Tuning Your Configuration:) AC_MSG_CHECKING(for extra suffix to append to header/library paths) EXTRA_SUFFIX= AC_ARG_WITH(extra-suffix, - [ --with-extra-suffix=X append extra suffix X to header/library paths], + [[ --with-extra-suffix[=X] append extra suffix X to header/library paths]], [case x$withval in (xno) ;; @@ -694,7 +682,7 @@ esac 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[=XXX] specify if xterm backspace sends BS or DEL]], [with_xterm_kbs=$withval], [with_xterm_kbs=auto]) case x$with_xterm_kbs in @@ -765,7 +753,7 @@ AC_ARG_ENABLE(big-core, [AC_TRY_RUN([ #include #include -int main() { +int main(void) { unsigned long n = 6000000L; char *s = malloc(n); if (s != 0) @@ -1061,13 +1049,10 @@ AC_SUBST(NCURSES_WATTR_MACROS) CF_WITH_X11_RGB ### use option --with-bool to override bool's type -AC_MSG_CHECKING(for type of bool) -AC_ARG_WITH(bool, +CF_WITH_TYPE(bool, [ --with-bool=TYPE fall back to TYPE for curses 'bool' typedef], - [NCURSES_BOOL="$withval"], - [NCURSES_BOOL=auto]) -AC_MSG_RESULT($NCURSES_BOOL) -AC_SUBST(NCURSES_BOOL) + NCURSES_BOOL, + auto) AC_MSG_CHECKING(for alternate terminal capabilities file) AC_ARG_WITH(caps, @@ -1083,29 +1068,22 @@ AC_MSG_RESULT($TERMINFO_CAPS) AC_SUBST(TERMINFO_CAPS) ### use option --with-chtype to override chtype's type -AC_MSG_CHECKING(for type of chtype) -AC_ARG_WITH(chtype, +CF_WITH_TYPE(chtype, [ --with-chtype=TYPE override type of chtype], - [NCURSES_CHTYPE="$withval"], - [NCURSES_CHTYPE=$cf_dft_chtype]) -AC_MSG_RESULT($NCURSES_CHTYPE) + NCURSES_CHTYPE, + $cf_dft_chtype) ### use option --with-ospeed to override ospeed's type -AC_MSG_CHECKING(for type of ospeed) -AC_ARG_WITH(ospeed, +CF_WITH_TYPE(ospeed, [ --with-ospeed=TYPE override type of ospeed variable], - [NCURSES_OSPEED="$withval"], - [NCURSES_OSPEED=short]) -AC_MSG_RESULT($NCURSES_OSPEED) -AC_SUBST(NCURSES_OSPEED) + NCURSES_OSPEED, + short) ### use option --with-mmask-t to override mmask_t's type -AC_MSG_CHECKING(for type of mmask_t) -AC_ARG_WITH(mmask-t, +CF_WITH_TYPE(mmask-t, [ --with-mmask-t=TYPE override type of mmask_t], - [NCURSES_MMASK_T="$withval"], - [NCURSES_MMASK_T=$cf_dft_mmask_t]) -AC_MSG_RESULT($NCURSES_MMASK_T) + NCURSES_MMASK_T, + $cf_dft_mmask_t) ### use option --with-ccharw-max to override CCHARW_MAX size AC_MSG_CHECKING(for size CCHARW_MAX) @@ -1132,13 +1110,10 @@ test "x$with_signed_char" != xyes && NCURSES_SBOOL="char" AC_SUBST(NCURSES_SBOOL) ### use option --with-tparm-arg to override tparm's argument type -AC_MSG_CHECKING(for type of tparm args) -AC_ARG_WITH(tparm-arg, +CF_WITH_TYPE(tparm-arg, [ --with-tparm-arg=TYPE override parameter type of tparm], - [NCURSES_TPARM_ARG="$withval"], - [NCURSES_TPARM_ARG=$cf_dft_tparm_arg]) -AC_MSG_RESULT($NCURSES_TPARM_ARG) -AC_SUBST(NCURSES_TPARM_ARG) + NCURSES_TPARM_ARG, + $cf_dft_tparm_arg) ### Enable compiling-in rcs id's AC_MSG_CHECKING(if RCS identifiers should be compiled-in) @@ -1176,8 +1151,9 @@ if test "x$with_ext_funcs" = xyes ; then 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]) GENERATED_EXT_FUNCS=generated - test "x$with_ext_funcs" = xyes || cf_dft_ext_spfuncs=no else + cf_dft_ext_spfuncs=no + cf_dft_ext_colors=no NCURSES_EXT_FUNCS=0 GENERATED_EXT_FUNCS= fi @@ -1301,7 +1277,14 @@ AC_ARG_ENABLE(sigwinch, [with_sigwinch=$enableval], [with_sigwinch=$with_ext_funcs]) AC_MSG_RESULT($with_sigwinch) -test "x$with_sigwinch" = xyes && AC_DEFINE(USE_SIGWINCH,1,[Define to 1 to compile with SIGWINCH handler]) +if test "x$with_sigwinch" = xyes +then + AC_DEFINE(USE_SIGWINCH,1,[Define to 1 to compile with SIGWINCH handler]) + cf_cv_enable_sigwinch=1 +else + cf_cv_enable_sigwinch=0 +fi +AC_SUBST(cf_cv_enable_sigwinch) ### use option --enable-tcap-names to allow user to define new capabilities AC_MSG_CHECKING(if you want user-definable terminal capabilities like termcap) @@ -1412,9 +1395,9 @@ AC_SUBST(cf_cv_enable_opaque) AC_SUBST(NCURSES_SIZE_T) AC_MSG_CHECKING(whether curses library structures should be opaque) -CF_ARG_ENABLE(opaque-curses, +CF_ARG_DISABLE(opaque-curses, [ --disable-opaque-curses do not make WINDOW, etc., structures opaque], - [enable_opaque_curses=yes],[ + [enable_opaque_curses=no],[ test "$cf_cv_enable_reentrant" = 1 && enable_opaque_curses=yes test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=$cf_dft_opaque_curses ]) @@ -1425,21 +1408,21 @@ test "$enable_opaque_curses" = no && \ AC_MSG_ERROR(reentrant configuration requires opaque library) AC_MSG_CHECKING(whether form library structures should be opaque) -AC_ARG_ENABLE(opaque-form, +CF_ARG_DISABLE(opaque-form, [ --disable-opaque-form do not make form library structures opaque], - [enable_opaque_form=yes],[enable_opaque_form=$cf_dft_opaque_curses]) + [enable_opaque_form=no],[enable_opaque_form=$cf_dft_opaque_curses]) AC_MSG_RESULT($enable_opaque_form) AC_MSG_CHECKING(whether menu library structures should be opaque) -AC_ARG_ENABLE(opaque-menu, +CF_ARG_DISABLE(opaque-menu, [ --disable-opaque-menu do not make menu library structures opaque], - [enable_opaque_menu=yes],[enable_opaque_menu=$cf_dft_opaque_curses]) + [enable_opaque_menu=no],[enable_opaque_menu=$cf_dft_opaque_curses]) AC_MSG_RESULT($enable_opaque_menu) AC_MSG_CHECKING(whether panel library structures should be opaque) -AC_ARG_ENABLE(opaque-panel, +CF_ARG_DISABLE(opaque-panel, [ --disable-opaque-panel do not make panel library structures opaque], - [enable_opaque_panel=yes],[enable_opaque_panel=$cf_dft_opaque_curses]) + [enable_opaque_panel=no],[enable_opaque_panel=$cf_dft_opaque_curses]) AC_MSG_RESULT($enable_opaque_panel) NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1 @@ -1476,6 +1459,14 @@ AC_ARG_WITH(develop, [with_develop=no]) AC_MSG_RESULT($with_develop) +### use option --enable-check-size to detect screensize with CPR +AC_MSG_CHECKING(if you want to check screensize of serial terminals) +AC_ARG_ENABLE(check-size, + [ --enable-check-size compile-in code to detect screensize of serial terminals],, + [enable_check_size=$with_develop]) +AC_MSG_RESULT($enable_check_size) +test "x$enable_check_size" = xyes && AC_DEFINE(USE_CHECK_SIZE,1,[Define to 1 to compile-in code to detect screensize]) + ### use option --enable-hard-tabs to turn on use of hard-tabs optimize AC_MSG_CHECKING(if you want hard-tabs code) AC_ARG_ENABLE(hard-tabs, @@ -1513,15 +1504,6 @@ AC_ARG_ENABLE(hashmap, AC_MSG_RESULT($with_hashmap) test "x$with_hashmap" = xyes && AC_DEFINE(USE_HASHMAP,1,[Define to 1 to compile with hashmap scrolling-optimization]) -### use option --enable-colorfgbg to turn on use of $COLORFGBG environment -AC_MSG_CHECKING(if you want code to check screensize) -AC_ARG_ENABLE(check-size, - [ --enable-check-size compile-in code to detect screensize], - [with_check_size=$enableval], - [with_check_size=no]) -AC_MSG_RESULT($with_check_size) -test "x$with_check_size" = xyes && AC_DEFINE(USE_CHECK_SIZE,1,[Define to 1 to compile-in code to detect screensize]) - ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment AC_MSG_CHECKING(if you want colorfgbg code) AC_ARG_ENABLE(colorfgbg, @@ -1728,7 +1710,7 @@ AC_MSG_RESULT($cf_with_trace) if test "x$cf_with_trace" = xyes ; then LIB_TRACING=all ADA_TRACE=TRUE - CF_ADD_CFLAGS(-DTRACE) + AC_DEFINE(TRACE,1,[Define to 1 if we have support trace functions]) AC_DEFINE(HAVE__TRACEF,1,[Define to 1 if we have _tracef function]) else LIB_TRACING=DEBUG @@ -1837,12 +1819,10 @@ getuid \ issetugid \ localeconv \ poll \ -putenv \ remove \ select \ setbuf \ setbuffer \ -setenv \ setfsuid \ setvbuf \ sigaction \ @@ -1900,6 +1880,7 @@ CF_TYPE_SIGACTION CF_SIZECHANGE CF_FUNC_MEMMOVE CF_FUNC_POLL +CF_MB_LEN_MAX CF_VA_COPY AC_FUNC_VFORK CF_FOPEN_BIN_R @@ -2027,7 +2008,6 @@ dnl libtool -TD 20070714 dnl Check for availability of GNU Ada Translator (GNAT). dnl At the moment we support no other Ada compiler. if test "$cf_with_ada" != "no" ; then - CF_PROG_GNAT if test "x$cf_cv_prog_gnat_correct" = xyes; then CF_ADD_ADAFLAGS(-gnatpn) CF_FIXUP_ADAFLAGS