X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fconfigure.in;h=c9070b6770b2fae0f497110a2ca7dab7051db4f6;hp=4175530c3b4d9593a719b909d1b43aff1165b9f4;hb=b040313679284c778b4f02a5b34d9e775ceba697;hpb=55ccd2b959766810cf7db8d1c4462f338ce0afc8;ds=sidebyside diff --git a/test/configure.in b/test/configure.in index 4175530c..c9070b67 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.51 2005/02/26 23:58:27 tom Exp $ +dnl $Id: configure.in,v 1.89 2011/01/15 19:41:30 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,35 +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) -LIB_NAME=curses AC_SUBST(LIB_NAME) -LIB_PREFIX="-l" AC_SUBST(LIB_PREFIX) -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) @@ -86,8 +92,15 @@ AC_EXEEXT AC_OBJEXT CF_ANSI_CC_REQD +CF_GCC_ATTRIBUTES CF_XOPEN_SOURCE +AC_C_CONST +CF_SIG_ATOMIC_T +CF_DISABLE_ECHO +CF_ENABLE_WARNINGS + +CF_DISABLE_LEAKS CF_WITH_CURSES_DIR dnl SunOS 4.x @@ -100,30 +113,33 @@ dnl --------------------------------------------------------------------------- dnl NcursesW, installed in conventional location AC_ARG_WITH(ncursesw, [ --with-ncursesw use wide ncurses-libraries (installed)], - [cf_cv_screen=ncursesw]) + [cf_cv_screen=ncursesw],[ dnl Ncurses, installed in conventional location AC_ARG_WITH(ncurses, [ --with-ncurses use ncurses-libraries (installed)], - [cf_cv_screen=ncurses]) + [cf_cv_screen=ncurses],[ + +AC_ARG_WITH(pdcurses, + [ --with-pdcurses compile/link with pdcurses X11 library], + [cf_cv_screen=pdcurses])])]) case $cf_cv_screen in curses) - CF_CURSES_CPPFLAGS - CF_NCURSES_VERSION - CF_CURSES_LIBS + CF_CURSES_CONFIG + CF_NETBSD_FORM_H + CF_NETBSD_MENU_H ;; ncurses) - CF_NCURSES_CPPFLAGS - CF_NCURSES_LIBS - LIB_NAME=ncurses + CF_NCURSES_CONFIG ;; ncursesw) cf_cv_libtype=w CF_UTF8_LIB - CF_NCURSES_CPPFLAGS(ncursesw) - CF_NCURSES_LIBS(ncursesw) - LIB_NAME=ncursesw + CF_NCURSES_CONFIG(ncursesw) + ;; +pdcurses) #(vi + CF_PDCURSES_X11 ;; esac @@ -132,22 +148,35 @@ dnl installed conventionally (e.g., SunOS 5.x - solaris). dnl Autoconf builds up the $LIBS in reverse order -AC_CHECK_LIB(panel$cf_cv_libtype,new_panel) -AC_CHECK_LIB(menu$cf_cv_libtype,menu_driver) -AC_CHECK_LIB(form$cf_cv_libtype,form_driver) +case $cf_cv_screen in #(vi +pdcurses) #(vi + ;; +*) + # look for curses-related libraries + AC_CHECK_LIB(panel$cf_cv_libtype,new_panel) + AC_CHECK_LIB(menu$cf_cv_libtype,menu_driver) + AC_CHECK_LIB(form$cf_cv_libtype,form_driver) + + # look for curses-related headers + AC_CHECK_HEADERS( \ + nc_alloc.h \ + nomacros.h \ + form.h \ + menu.h \ + panel.h \ + term_entry.h \ + ) + ;; +esac AC_TYPE_SIGNAL AC_STDC_HEADERS AC_HEADER_TIME AC_CHECK_HEADERS( \ -form.h \ getopt.h \ locale.h \ -menu.h \ -nc_alloc.h \ -nomacros.h \ -panel.h \ +stdarg.h \ sys/ioctl.h \ sys/select.h \ sys/time.h \ @@ -156,43 +185,99 @@ unistd.h \ ) AC_CHECK_FUNCS( \ +gettimeofday \ +mblen \ +mbrlen \ +mbrtowc \ +mbsrtowcs \ +mbstowcs \ +mbtowc \ +strdup \ +wcsrtombs \ +wcstombs \ +) + +CF_CURSES_FUNCS( \ +chgat \ color_set \ +filter \ +getbegx \ +getcurx \ +getmaxx \ getnstr \ -gettimeofday \ +getparx \ +getwin \ +mvvline \ +mvwvline \ napms \ +putwin \ resize_term \ resizeterm \ +ripoffline \ +scr_dump \ +setupterm \ slk_color \ -strdup \ +slk_init \ +termattrs \ +tgetent \ +tigetnum \ +tigetstr \ +typeahead \ use_default_colors \ +vw_printw \ vsscanf \ wchgat \ +winsstr \ wresize \ +wsyncdown \ ) +CF_NCURSES_EXT_FUNCS + +AC_CACHE_CHECK(for wide-character functions,cf_cv_widechar_funcs,[ AC_TRY_LINK([ -#include <${cf_cv_ncurses_header-curses.h}>], +#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)]) + 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 +AC_FUNC_VFORK CF_SYS_TIME_SELECT CF_FUNC_CURSES_VERSION CF_CURSES_ACS_MAP CF_CURSES_WACS_MAP +CF_CURSES_WACS_SYMBOLS + 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= @@ -200,21 +285,36 @@ LIBS= dnl --------------------------------------------------------------------------- AC_OUTPUT(Makefile,[ +CF_PRG_RULES([$srcdir/mk-test.awk INSTALL=yes ECHO_LINK="$ECHO_LD"], .) cat >>Makefile <>Makefile <>Makefile <