X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=configure.in;h=67e1535dba5d27c8a50b4661849894407f4cf68c;hp=1404b751cdab98b7401df9815b8f3ecc917f077f;hb=fe6abf09238512f5a902bc1aeab2263d1e997396;hpb=fe2691bfa4a5412dd665263260e01f48bcf8b4d8 diff --git a/configure.in b/configure.in index 1404b751..67e1535d 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. * +dnl Copyright (c) 1998-2014,2015 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.597 2015/01/21 23:34:29 tom Exp $ +dnl $Id: configure.in,v 1.600 2015/03/27 10:48:27 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 dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20030208) -AC_REVISION($Revision: 1.597 $) +AC_REVISION($Revision: 1.600 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -479,10 +479,11 @@ done # pretend that ncurses==ncursesw==ncursest AC_MSG_CHECKING(if you want to disable library suffixes) -AC_ARG_ENABLE(lib-suffixes, +CF_ARG_DISABLE(lib-suffixes, [ --disable-lib-suffixes disable library suffixes], - [disable_lib_suffixes=$enableval], - [disable_lib_suffixes=no]) + [disable_lib_suffixes=yes], + [disable_lib_suffixes=no], + no) AC_MSG_RESULT($disable_lib_suffixes) ### If we're building with rpath, try to link non-standard libs that way too. @@ -788,7 +789,9 @@ NCURSES_WCHAR_T=0 NCURSES_WINT_T=0 # Check to define _XOPEN_SOURCE "automatically" +CPPFLAGS_before_XOPEN="$CPPFLAGS" CF_XOPEN_SOURCE(500) +CPPFLAGS_after_XOPEN="$CPPFLAGS" # Work around breakage on OS X CF_SIGWINCH @@ -1073,6 +1076,17 @@ if test "x$with_ext_mouse" = xyes ; then fi AC_SUBST(NCURSES_MOUSE_VERSION) +### use option --enable-ext-putwin to turn on extended screendumps +AC_MSG_CHECKING(if you want to use extended putwin/screendump) +AC_ARG_ENABLE(ext-colors, + [ --enable-ext-putwin compile with extended putwin/screendump], + [with_ext_putwin=$enableval], + [with_ext_putwin=no]) +AC_MSG_RESULT($with_ext_putwin) +if test "x$with_ext_putwin" = xyes ; then + AC_DEFINE(NCURSES_EXT_PUTWIN,1,[Define to 1 to compile with extended putwin/screendump]) +fi + AC_MSG_CHECKING(if you want \$NCURSES_NO_PADDING code) AC_ARG_ENABLE(no-padding, [ --enable-no-padding compile with $NCURSES_NO_PADDING code], @@ -2037,7 +2051,7 @@ AC_SUBST(CXX_NAME) # workaround for g++ versus Solaris (20131116) case $cf_cv_system_name in #(vi -solaris2*) #(vi +solaris2*) case "x$CPPFLAGS" in #(vi *-D_XOPEN_SOURCE_EXTENDED*) CF_VERBOSE(moving _XOPEN_SOURCE_EXTENDED to work around g++ problem) @@ -2048,6 +2062,26 @@ solaris2*) #(vi ;; esac +# Help to automatically enable the extended curses features when using either +# the *-config or the ".pc" files by adding defines. +AC_MSG_CHECKING(for defines to add to ncurses${DFT_ARG_SUFFIX}${cf_cv_abi_version}-config script) +PKG_CFLAGS= +for cf_loop1 in $CPPFLAGS_after_XOPEN +do + cf_found=no + for cf_loop2 in $CPPFLAGS_before_XOPEN + do + if test "x$cf_loop1" = "x$cf_loop2" + then + cf_found=yes + break + fi + done + test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" +done +AC_MSG_RESULT($PKG_CFLAGS) +AC_SUBST(PKG_CFLAGS) + # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. case "x$NCURSES_OSPEED" in #(vi *short*) #(vi