X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fconfigure.in;h=09c3cebe19522c114a8423ae86da2dd89595a2e0;hp=69141c6762462a91400a15c32cf53b295ad397eb;hb=e0881a7f395769f2ec89b8fa8c21c4292c1de7b5;hpb=41068edef084c39be0cecdf949d9b538d925f42c diff --git a/test/configure.in b/test/configure.in index 69141c67..09c3cebe 100644 --- a/test/configure.in +++ b/test/configure.in @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * +dnl Copyright (c) 1998-2011,2012 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.76 2010/01/30 23:52:22 tom Exp $ +dnl $Id: configure.in,v 1.104 2012/03/17 17:29:03 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,12 +46,21 @@ 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 +CF_TOP_BUILDDIR CC_G_OPT="-g" AC_SUBST(CC_G_OPT) CC_SHARED_OPTS=unknown AC_SUBST(CC_SHARED_OPTS) CPPFLAGS="$CPPFLAGS" AC_SUBST(CPPFLAGS) @@ -68,15 +77,13 @@ 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) +TINFO_LDFLAGS='' AC_SUBST(TINFO_LDFLAGS) +TINFO_LIBS='$(LIBS_CURSES)' AC_SUBST(TINFO_LIBS) cf_cv_abi_version="" AC_SUBST(cf_cv_abi_version) cf_cv_rel_version="" AC_SUBST(cf_cv_rel_version) @@ -95,43 +102,28 @@ CF_SIG_ATOMIC_T CF_DISABLE_ECHO CF_ENABLE_WARNINGS -CF_WITH_CURSES_DIR - -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 --------------------------------------------------------------------------- -dnl NcursesW, installed in conventional location -AC_ARG_WITH(ncursesw, - [ --with-ncursesw use wide ncurses-libraries (installed)], - [cf_cv_screen=ncursesw],[ +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) -dnl Ncurses, installed in conventional location -AC_ARG_WITH(ncurses, - [ --with-ncurses use ncurses-libraries (installed)], - [cf_cv_screen=ncurses],[ -AC_ARG_WITH(pdcurses, - [ --with-pdcurses compile/link with pdcurses X11 library], - [cf_cv_screen=pdcurses])])]) +dnl --------------------------------------------------------------------------- +CF_WITH_NCURSES_ETC case $cf_cv_screen in -curses) - CF_CURSES_CONFIG - ;; -ncurses) - CF_NCURSES_CONFIG +curses|curses_*) + CF_NETBSD_FORM_H + CF_NETBSD_MENU_H ;; ncursesw) cf_cv_libtype=w - CF_UTF8_LIB - CF_NCURSES_CONFIG(ncursesw) - ;; -pdcurses) #(vi - CF_PDCURSES_X11 ;; esac @@ -156,6 +148,7 @@ pdcurses) #(vi form.h \ menu.h \ panel.h \ + term_entry.h \ ) ;; esac @@ -167,6 +160,7 @@ AC_HEADER_TIME AC_CHECK_HEADERS( \ getopt.h \ locale.h \ +math.h \ stdarg.h \ sys/ioctl.h \ sys/select.h \ @@ -175,20 +169,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 \ -strdup \ wcsrtombs \ wcstombs \ ) +fi CF_CURSES_FUNCS( \ +assume_default_colors \ chgat \ color_set \ filter \ @@ -205,6 +207,7 @@ putwin \ resize_term \ resizeterm \ ripoffline \ +scr_dump \ setupterm \ slk_color \ slk_init \ @@ -214,103 +217,139 @@ tigetnum \ tigetstr \ typeahead \ use_default_colors \ -vw_printw \ +use_screen \ +use_window \ vsscanf \ +vw_printw \ wchgat \ winsstr \ wresize \ +wsyncdown \ ) -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) - -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) +CF_TPUTS_PROTO +CF_NCURSES_EXT_FUNCS + +if test "$cf_enable_widec" = yes +then + # workaround for systems with ncurses before 20111029, due to change of + # feature test macro from _XPG5 to _XOPEN_SOURCE + if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno + then + cf_define_xpg5=no + AC_MSG_CHECKING(if _XPG5 should be defined to enable wide-characters) + + AC_TRY_COMPILE([ +#include <${cf_cv_ncurses_header:-curses.h}>], + [int x = _XPG5],, + [cf_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_XPG5" + AC_TRY_COMPILE([ +#include <${cf_cv_ncurses_header:-curses.h}>], + [int x = _XPG5], + [cf_define_xpg5=yes]) + CPPFLAGS="$cf_save_cppflags"]) + AC_MSG_RESULT($cf_define_xpg5) + + if test "$cf_define_xpg5" = yes + then + CPPFLAGS="$CPPFLAGS -D_XPG5" + fi + fi + + 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 -AC_FUNC_VFORK 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_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 "$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_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_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) + 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) +CF_DISABLE_RPATH_HACK + TEST_ARGS="$LIBS" LIBS= dnl --------------------------------------------------------------------------- AC_OUTPUT(Makefile,[ -CF_PRG_RULES([$srcdir/mk-test.awk ECHO_LINK="$ECHO_LD"], .) +CF_PRG_RULES([$srcdir/mk-test.awk INSTALL=yes ECHO_LINK="$ECHO_LD"], .) cat >>Makefile <>Makefile <>Makefile <