ncurses 6.5 - patch 20240518

[ncurses.git] / configure.in

diff --git a/configure.in b/configure.in
index 280313058b290e9b40f59d914d27cb41e0596245..1beb840a6c2eebc111e62c1354477a03a8564d34 100644 (file)
--- 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.776 2024/03/17 00:08:03 tom Exp $
+dnl $Id: configure.in,v 1.781 2024/05/18 19:42:53 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.776 $)
+AC_REVISION($Revision: 1.781 $)
 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])
@@ -1406,9 +1394,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
        ])
@@ -1419,21 +1407,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
@@ -1721,7 +1709,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
@@ -2019,7 +2007,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