dnl***************************************************************************
-dnl Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
+dnl Copyright (c) 1998-2008,2009 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.61 2007/01/27 22:56:49 tom Exp $
+dnl $Id: configure.in,v 1.74 2009/07/18 20:52:09 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_AWK
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)
+CC_G_OPT="-g" AC_SUBST(CC_G_OPT)
CC_SHARED_OPTS=unknown AC_SUBST(CC_SHARED_OPTS)
CPPFLAGS="$CPPFLAGS" AC_SUBST(CPPFLAGS)
-DFT_DEP_SUFFIX="" AC_SUBST(DFT_DEP_SUFFIX)
+DFT_DEP_SUFFIX="" AC_SUBST(DFT_DEP_SUFFIX)
DFT_OBJ_SUBDIR=`pwd|sed -e's:.*/::'` AC_SUBST(DFT_OBJ_SUBDIR)
DFT_UPR_MODEL="NORMAL" AC_SUBST(DFT_UPR_MODEL)
-ECHO_LINK='@ echo linking $@ ... ;' AC_SUBST(ECHO_LINK)
-LD="ld" AC_SUBST(LD)
-LDFLAGS_SHARED="" AC_SUBST(LDFLAGS_SHARED)
-LD_MODEL="" AC_SUBST(LD_MODEL)
-LD_SHARED_OPTS="" AC_SUBST(LD_SHARED_OPTS)
-LIBTOOL="" AC_SUBST(LIBTOOL)
-LIB_CLEAN="" AC_SUBST(LIB_CLEAN)
-LIB_COMPILE="" AC_SUBST(LIB_COMPILE)
-LIB_LINK="" AC_SUBST(LIB_LINK)
-LINK_TESTS="" AC_SUBST(LINK_TESTS)
-LINT=lint AC_SUBST(LINT)
-LINT_OPTS="" AC_SUBST(LINT_OPTS)
-LOCAL_LDFLAGS="" AC_SUBST(LOCAL_LDFLAGS)
-MATH_LIB="-lm" AC_SUBST(MATH_LIB)
-TEST_ARGS="" AC_SUBST(TEST_ARGS)
-TEST_DEPS="" AC_SUBST(TEST_DEPS)
+LD="ld" AC_SUBST(LD)
+LDFLAGS_SHARED="" AC_SUBST(LDFLAGS_SHARED)
+LDFLAGS_STATIC="" AC_SUBST(LDFLAGS_STATIC)
+LD_MODEL="" AC_SUBST(LD_MODEL)
+LD_SHARED_OPTS="" AC_SUBST(LD_SHARED_OPTS)
+LIBTOOL="" AC_SUBST(LIBTOOL)
+LIB_CLEAN="" AC_SUBST(LIB_CLEAN)
+LIB_COMPILE="" AC_SUBST(LIB_COMPILE)
+LIB_LINK='${CC}' AC_SUBST(LIB_LINK)
+LINK_TESTS="" AC_SUBST(LINK_TESTS)
+LINT=lint AC_SUBST(LINT)
+LINT_OPTS="" AC_SUBST(LINT_OPTS)
+LOCAL_LDFLAGS="" AC_SUBST(LOCAL_LDFLAGS)
+MATH_LIB="-lm" AC_SUBST(MATH_LIB)
+PTHREAD="-lm" AC_SUBST(PTHREAD)
+TEST_ARGS="" AC_SUBST(TEST_ARGS)
+TEST_DEPS="" AC_SUBST(TEST_DEPS)
+TEST_LIBS="" AC_SUBST(TEST_LIBS)
TINFO_ARGS='$(LIBS_CURSES)' AC_SUBST(TINFO_ARGS)
cf_cv_abi_version="" AC_SUBST(cf_cv_abi_version)
cf_cv_rel_version="" AC_SUBST(cf_cv_rel_version)
AC_OBJEXT
CF_ANSI_CC_REQD
-CF_ENABLE_WARNINGS
CF_GCC_ATTRIBUTES
CF_XOPEN_SOURCE
+AC_C_CONST
+CF_SIG_ATOMIC_T
+
+CF_DISABLE_ECHO
+CF_ENABLE_WARNINGS
CF_WITH_CURSES_DIR
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
)
AC_CHECK_FUNCS( \
+gettimeofday \
+mblen \
+mbrlen \
+mbrtowc \
+mbsrtowcs \
+mbstowcs \
+mbtowc \
+strdup \
+wcsrtombs \
+wcstombs \
+)
+
+CF_CURSES_FUNCS( \
chgat \
color_set \
filter \
getcurx \
getmaxx \
getnstr \
-gettimeofday \
+getparx \
getwin \
mvvline \
mvwvline \
setupterm \
slk_color \
slk_init \
-strdup \
termattrs \
tgetent \
tigetnum \
tigetstr \
typeahead \
use_default_colors \
+vw_printw \
vsscanf \
wchgat \
winsstr \
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=
dnl ---------------------------------------------------------------------------
AC_OUTPUT(Makefile,[
-CF_PRG_RULES([$srcdir/mk-test.awk ECHO_LINK="$ECHO_LINK"], .)
+CF_PRG_RULES([$srcdir/mk-test.awk ECHO_LINK="$ECHO_LD"], .)
cat >>Makefile <<TEST_EOF
# These rules are generated so we do not rely on suffix rules, which do not
done
],[
AWK="$AWK"
+ECHO_LD="$ECHO_LD"
],cat)