dnl***************************************************************************
-dnl Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *
+dnl Copyright (c) 1998-2009,2010 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 *
dnl
dnl Author: Thomas E. Dickey 1996, etc.
dnl
-dnl $Id: configure.in,v 1.67 2008/09/06 22:10:23 tom Exp $
+dnl $Id: configure.in,v 1.78 2010/04/03 15:43:44 tom Exp $
dnl This is a simple configuration-script for the ncurses test programs that
dnl allows the test-directory to be separately configured against a reference
dnl system (i.e., sysvr4 curses)
AC_PROG_CC
AC_PROG_CPP
AC_PROG_AWK
+CF_MAKE_TAGS
dnl Things that we don't need (or must override) if we're not building ncurses
CC_G_OPT="-g" AC_SUBST(CC_G_OPT)
case $cf_cv_screen in
curses)
- CF_CURSES_CPPFLAGS
- CF_NCURSES_VERSION
- CF_CURSES_LIBS
+ CF_CURSES_CONFIG
;;
ncurses)
- CF_NCURSES_CPPFLAGS
- CF_NCURSES_LIBS
+ CF_NCURSES_CONFIG
;;
ncursesw)
cf_cv_libtype=w
CF_UTF8_LIB
- CF_NCURSES_CPPFLAGS(ncursesw)
- CF_NCURSES_LIBS(ncursesw)
+ CF_NCURSES_CONFIG(ncursesw)
;;
pdcurses) #(vi
CF_PDCURSES_X11
tigetstr \
typeahead \
use_default_colors \
+vw_printw \
vsscanf \
wchgat \
winsstr \
wresize \
)
-AC_CACHE_CHECK(for ncurses extended functions,cf_cv_ncurses_ext_funcs,[
-AC_TRY_LINK([
-#include <${cf_cv_ncurses_header-curses.h}>],
-[
- (void) assume_default_colors (0, 0);
- (void) curses_version ();
- (void) define_key (0, 0);
- (void) is_term_resized (0, 0);
- (void) key_defined (0);
- (void) keybound (0, 0);
- (void) keyok (0, 0);
- (void) resize_term (0, 0);
- (void) resizeterm (0, 0);
- (void) use_default_colors ();
- (void) use_extended_names (0);
- (void) wresize (0, 0, 0);],
- [cf_cv_ncurses_ext_funcs=yes],
- [cf_cv_ncurses_ext_funcs=no])
-])
-test "$cf_cv_ncurses_ext_funcs" != no && AC_DEFINE(NCURSES_EXT_FUNCS)
+CF_NCURSES_EXT_FUNCS
AC_CACHE_CHECK(for wide-character functions,cf_cv_widechar_funcs,[
AC_TRY_LINK([
AC_DEFINE(USE_WIDEC_SUPPORT,0)
fi
+AC_FUNC_VFORK
CF_SYS_TIME_SELECT
CF_FUNC_CURSES_VERSION
CF_CURSES_ACS_MAP
CF_CURSES_WACS_MAP
+
CF_CURSES_CHECK_TYPE(attr_t,long)
-CF_CURSES_CHECK_TYPE(mbstate_t,long)
+
+CF_WCHAR_TYPE(mbstate_t, NCURSES_MBSTATE_T, NCURSES_OK_MBSTATE_T)
+CF_WCHAR_TYPE(wchar_t, NCURSES_WCHAR_T, NCURSES_OK_WCHAR_T)
+CF_WCHAR_TYPE(wint_t, NCURSES_WINT_T, NCURSES_OK_WINT_T)
+
+if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
+ CF_CURSES_CHECK_TYPE(mbstate_t,long)
+fi
+
+if test "$NCURSES_OK_WCHAR_T" = 0 ; then
+ CF_CURSES_CHECK_TYPE(wchar_t,long)
+fi
+
+if test "$NCURSES_OK_WINT_T" = 0 ; then
+ CF_CURSES_CHECK_TYPE(wint_t,long)
+fi
+
+CF_CURSES_CHECK_DATA(boolnames)
+CF_CURSES_CHECK_DATA(boolfnames)
TEST_ARGS="$LIBS"
LIBS=