X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=configure.in;h=7dbf48f54b165e5279c1a38f6de5955031e48988;hp=72d029d3925c15dececd7deee26ecee3720a1493;hb=1501ae2a13db0ffd2db8404c24aa5010a88ea91b;hpb=44a63c85c16f81579c74d68cd99eea1a1fd00c28 diff --git a/configure.in b/configure.in index 72d029d3..7dbf48f5 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright (c) 1998-2016,2017 Free Software Foundation, Inc. * +dnl Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * dnl copy of this software and associated documentation files (the * @@ -28,14 +28,14 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.636 2017/02/12 15:51:08 tom Exp $ +dnl $Id: configure.in,v 1.653 2018/01/19 22:45:56 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl -dnl See http://invisible-island.net/autoconf/ for additional information. +dnl See https://invisible-island.net/autoconf/ for additional information. dnl dnl --------------------------------------------------------------------------- -AC_PREREQ(2.52.20030208) -AC_REVISION($Revision: 1.636 $) +AC_PREREQ(2.52.20170501) +AC_REVISION($Revision: 1.653 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -178,6 +178,22 @@ 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], @@ -193,9 +209,8 @@ AC_ARG_WITH(curses-h, AC_MSG_RESULT($with_curses_h) modules_to_build="ncurses" -if test "X$cf_with_progs" != Xno ; then -modules_to_build="$modules_to_build progs tack" -fi +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 @@ -208,7 +223,21 @@ CF_PROG_LN_S AC_SYS_LONG_FILE_NAMES -# if we find pkg-config, check if we should install the ".pc" files. +# Provide for renaming "ncurses5-config" to "ncurses5X-config", etc., in case +# of package conflict. +cf_config_suffix= +AC_ARG_WITH(config-suffix, + [ --with-config-suffix=X suffixes ncursesXX-config file], + [case "x$withval" in + (xyes|xno) + AC_MSG_WARN(expected a value for config-suffix option) + ;; + (*) cf_config_suffix="$withval" + ;; + esac]) +AC_SUBST(cf_config_suffix) + +# If we find pkg-config, check if we should install the ".pc" files. CF_PKG_CONFIG CF_WITH_PKG_CONFIG_LIBDIR CF_ENABLE_PC_FILES @@ -941,6 +970,8 @@ else fi 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, @@ -1026,18 +1057,18 @@ AC_ARG_ENABLE(ext-funcs, AC_MSG_RESULT($with_ext_funcs) if test "x$with_ext_funcs" = xyes ; then NCURSES_EXT_FUNCS=1 - AC_DEFINE(HAVE_ASSUME_DEFAULT_COLORS,1,[Define to 1 to enable assume_default_colors() function]) - AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 to enable curses_version() function]) - AC_DEFINE(HAVE_HAS_KEY,1,[Define to 1 to enable has_key() function]) - AC_DEFINE(HAVE_RESIZETERM,1,[Define to 1 to enable resizeterm() function]) - AC_DEFINE(HAVE_RESIZE_TERM,1,[Define to 1 to enable resize_term() function]) - AC_DEFINE(HAVE_TERM_ENTRY_H,1,[Define to 1 to enable term_entry() function]) - AC_DEFINE(HAVE_USE_DEFAULT_COLORS,1,[Define to 1 to enable use_default_colors() function]) - AC_DEFINE(HAVE_USE_EXTENDED_NAMES,1,[Define to 1 to enable use_extended_names() function]) - AC_DEFINE(HAVE_USE_SCREEN,1,[Define to 1 to enable use_screen() function]) - AC_DEFINE(HAVE_USE_WINDOW,1,[Define to 1 to enable use_window() function]) - AC_DEFINE(HAVE_WRESIZE,1,[Define to 1 to enable wresize() function]) AC_DEFINE(NCURSES_EXT_FUNCS,1,[Define to 1 to enable ncurses extended functions]) + AC_DEFINE(HAVE_ASSUME_DEFAULT_COLORS,1,[Define to 1 to enable assume_default_colors() function in test-programs]) + AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 to enable curses_version() function in test-programs]) + AC_DEFINE(HAVE_HAS_KEY,1,[Define to 1 to enable has_key() function in test-programs]) + AC_DEFINE(HAVE_RESIZETERM,1,[Define to 1 to enable resizeterm() function in test-programs]) + 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]) GENERATED_EXT_FUNCS=generated test "x$with_ext_funcs" = xyes || cf_dft_ext_spfuncs=no else @@ -1056,6 +1087,7 @@ AC_MSG_RESULT($with_sp_funcs) if test "x$with_sp_funcs" = xyes ; then NCURSES_SP_FUNCS=1 AC_DEFINE(NCURSES_SP_FUNCS,1,[Define to 1 to enable SCREEN-extensions]) + AC_DEFINE(HAVE_TPUTS_SP,1,[Define to 1 to enable tputs_sp() function in test-programs]) GENERATED_SP_FUNCS=generated else NCURSES_SP_FUNCS=0 @@ -1109,6 +1141,9 @@ if test "x$with_ext_colors" = xyes ; then CF_NCURSES_ABI_6 NCURSES_EXT_COLORS=1 AC_DEFINE(NCURSES_EXT_COLORS,1,[Define to 1 to compile for 256-color support]) + AC_DEFINE(HAVE_ALLOC_PAIR,1,[Define to 1 to enable alloc_pair() function]) + AC_DEFINE(HAVE_INIT_EXTENDED_COLOR,1,[Define to 1 to enable init_extended_color() function in test-programs]) + AC_DEFINE(HAVE_RESET_COLOR_PAIRS,1,[Define to 1 to enable reset_color_pairs() function in test-programs]) fi fi AC_SUBST(NCURSES_EXT_COLORS) @@ -1438,6 +1473,9 @@ else fi AC_SUBST(ECHO_LINK) +# --disable-stripping is used for debugging +CF_INSTALL_OPTS + ### use option --enable-warnings to turn on all gcc warnings AC_MSG_CHECKING(if you want to see compiler warnings) AC_ARG_ENABLE(warnings, @@ -1506,6 +1544,7 @@ if test "x$cf_with_trace" = xyes ; then LIB_TRACING=all ADA_TRACE=TRUE CF_ADD_CFLAGS(-DTRACE) + AC_DEFINE(HAVE__TRACEF,1,[Define to 1 if we have _tracef function]) else LIB_TRACING=DEBUG ADA_TRACE=FALSE @@ -1624,11 +1663,13 @@ sigvec \ strdup \ strstr \ tcgetpgrp \ +tdestroy \ times \ +tsearch \ vsnprintf \ ) -if test "x$ac_cv_func_getopt" = xno && +if test "x$ac_cv_func_getopt" = xno && \ test "x$cf_with_progs$cf_with_tests" != xnono; then AC_MSG_ERROR(getopt is required for building programs) fi @@ -2264,10 +2305,15 @@ AC_SUBST(UNALTERED_SYMS) if test "x$cross_compiling" = xyes ; then ADAGEN_LDFLAGS='$(CROSS_LDFLAGS)' + CHECK_BUILD="#" else ADAGEN_LDFLAGS='$(NATIVE_LDFLAGS)' + CHECK_BUILD= fi AC_SUBST(ADAGEN_LDFLAGS) +AC_SUBST(CHECK_BUILD) + +AC_DEFINE(HAVE_CURSES_DATA_BOOLNAMES,1,[definition needed for in-tree build of tack]) AC_OUTPUT( \ include/MKterm.h.awk \