X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fconfigure.in;h=5c1c0541ce7e3494ee3d4b91bed5a04fe2c4e9d0;hp=928b24674e66dd107156ddc1e68a0095e326677b;hb=bd257b9d8d715a9a63dab215fcdc53f106e7d050;hpb=027ae42953e3186daed8f3882da73de48291b606 diff --git a/test/configure.in b/test/configure.in index 928b2467..5c1c0541 100644 --- a/test/configure.in +++ b/test/configure.in @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * +dnl Copyright (c) 1998-2010,2011 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,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1996, etc. dnl -dnl $Id: configure.in,v 1.58 2006/07/15 18:54:07 tom Exp $ +dnl $Id: configure.in,v 1.97 2011/04/23 22:10:32 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) @@ -46,34 +46,41 @@ CF_INHERIT_SCRIPT(config.guess) CF_INHERIT_SCRIPT(config.sub) CF_CHECK_CACHE +AC_ARG_PROGRAM + AC_PROG_MAKE_SET AC_PROG_CC AC_PROG_CPP AC_PROG_AWK +CF_PROG_INSTALL +CF_PROG_LINT +CF_MAKE_TAGS + +CF_MATH_LIB(MATH_LIB,sin(x)) +AC_SUBST(MATH_LIB) 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) +LOCAL_LDFLAGS="" AC_SUBST(LOCAL_LDFLAGS) +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) @@ -85,20 +92,30 @@ AC_EXEEXT AC_OBJEXT CF_ANSI_CC_REQD -CF_ENABLE_WARNINGS CF_GCC_ATTRIBUTES CF_XOPEN_SOURCE +AC_C_CONST +CF_SIG_ATOMIC_T -CF_WITH_CURSES_DIR +CF_DISABLE_ECHO +CF_ENABLE_WARNINGS -dnl SunOS 4.x -AC_ARG_WITH(5lib, - [ --with-5lib use SunOS sysv-libraries], - [LIBS="-L/usr/5lib $LIBS" - CPPFLAGS="$CPPFLAGS -I/usr/5include"]) +CF_DISABLE_LEAKS + +dnl --------------------------------------------------------------------------- +AC_MSG_CHECKING(if you want to check for wide-character functions) +CF_ARG_DISABLE(widec, + [--disable-widec disable checks for wide-character functions], + cf_enable_widec=no, + cf_enable_widec=yes, + yes) +AC_MSG_RESULT($cf_enable_widec) + +CF_WITH_CURSES_DIR dnl --------------------------------------------------------------------------- dnl NcursesW, installed in conventional location +AC_MSG_CHECKING(for specified curses library type) AC_ARG_WITH(ncursesw, [ --with-ncursesw use wide ncurses-libraries (installed)], [cf_cv_screen=ncursesw],[ @@ -110,23 +127,31 @@ AC_ARG_WITH(ncurses, AC_ARG_WITH(pdcurses, [ --with-pdcurses compile/link with pdcurses X11 library], - [cf_cv_screen=pdcurses])])]) + [cf_cv_screen=pdcurses],[ + +AC_ARG_WITH(curses-colr, + [ --with-curses-colr compile/link with HPUX 10.x color-curses], + [cf_cv_screen=curses_colr],[ + +AC_ARG_WITH(curses-5lib, + [ --with-curses-5lib compile/link with SunOS 5lib curses], + [cf_cv_screen=curses_5lib])])])])]) + +AC_MSG_RESULT($cf_cv_screen) case $cf_cv_screen in -curses) - CF_CURSES_CPPFLAGS - CF_NCURSES_VERSION - CF_CURSES_LIBS +curses|curses_*) + CF_CURSES_CONFIG + CF_NETBSD_FORM_H + CF_NETBSD_MENU_H ;; 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 @@ -154,6 +179,7 @@ pdcurses) #(vi form.h \ menu.h \ panel.h \ + term_entry.h \ ) ;; esac @@ -165,6 +191,7 @@ AC_HEADER_TIME AC_CHECK_HEADERS( \ getopt.h \ locale.h \ +math.h \ stdarg.h \ sys/ioctl.h \ sys/select.h \ @@ -173,7 +200,28 @@ termios.h \ unistd.h \ ) +CF_GETOPT_HEADER + +AC_CHECK_FUNCS( \ +gettimeofday \ +strdup \ +) + +if test "$cf_enable_widec" = yes; then AC_CHECK_FUNCS( \ +mblen \ +mbrlen \ +mbrtowc \ +mbsrtowcs \ +mbstowcs \ +mbtowc \ +wcsrtombs \ +wcstombs \ +) +fi + +CF_CURSES_FUNCS( \ +assume_default_colors \ chgat \ color_set \ filter \ @@ -181,7 +229,7 @@ getbegx \ getcurx \ getmaxx \ getnstr \ -gettimeofday \ +getparx \ getwin \ mvvline \ mvwvline \ @@ -190,45 +238,82 @@ putwin \ resize_term \ resizeterm \ ripoffline \ +scr_dump \ setupterm \ slk_color \ slk_init \ -strdup \ termattrs \ tgetent \ tigetnum \ tigetstr \ typeahead \ use_default_colors \ +use_screen \ +use_window \ vsscanf \ +vw_printw \ wchgat \ winsstr \ wresize \ +wsyncdown \ ) -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); - ],[AC_DEFINE(NCURSES_EXT_FUNCS)]) +CF_TPUTS_PROTO +CF_NCURSES_EXT_FUNCS + +if test "$cf_enable_widec" = yes +then + AC_CACHE_CHECK(for wide-character functions,cf_cv_widechar_funcs,[ + AC_TRY_LINK([ +#include <${cf_cv_ncurses_header:-curses.h}>], + [ + static wchar_t src_wchar[2]; + static cchar_t dst_cchar; + setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0); + ], + [cf_cv_widechar_funcs=yes], + [cf_cv_widechar_funcs=no]) + ]) + if test "$cf_cv_widechar_funcs" != no ; then + AC_DEFINE(USE_WIDEC_SUPPORT,1) + else + AC_DEFINE(USE_WIDEC_SUPPORT,0) + fi +else + AC_DEFINE(USE_WIDEC_SUPPORT,0) +fi CF_SYS_TIME_SELECT CF_FUNC_CURSES_VERSION CF_CURSES_ACS_MAP -CF_CURSES_WACS_MAP + +if test "$cf_enable_widec" = yes; then + CF_CURSES_WACS_MAP + CF_CURSES_WACS_SYMBOLS +fi + CF_CURSES_CHECK_TYPE(attr_t,long) -CF_CURSES_CHECK_TYPE(mbstate_t,long) + +if test "$cf_enable_widec" = yes; then + 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 +fi + +CF_CURSES_CHECK_DATA(boolnames) +CF_CURSES_CHECK_DATA(boolfnames) TEST_ARGS="$LIBS" LIBS= @@ -236,24 +321,36 @@ LIBS= dnl --------------------------------------------------------------------------- AC_OUTPUT(Makefile,[ -CF_PRG_RULES([$srcdir/mk-test.awk ECHO_LINK="$ECHO_LINK"], .) +CF_PRG_RULES([$srcdir/mk-test.awk INSTALL=yes ECHO_LINK="$ECHO_LD"], .) cat >>Makefile <>Makefile <>Makefile <