X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fconfigure.in;h=66985a4e15b2b238a60ffb95f8613d85c11fa837;hp=3e01589614aa8dff15d0501f4c6101b43f133c4d;hb=95a30fbbfc81d5eb0a76e139c86e0a6505cad871;hpb=a8987e73ec254703634802b4f7ee30d3a485524d diff --git a/test/configure.in b/test/configure.in index 3e015896..66985a4e 100644 --- a/test/configure.in +++ b/test/configure.in @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. * +dnl Copyright (c) 1998-2007,2008 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.47 2004/01/31 00:07:01 tom Exp $ +dnl $Id: configure.in,v 1.67 2008/09/06 22:10:23 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) @@ -49,33 +49,34 @@ CF_CHECK_CACHE AC_PROG_MAKE_SET AC_PROG_CC AC_PROG_CPP +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) -EXTRA_LIBS="" AC_SUBST(EXTRA_LIBS) -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) +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) @@ -84,7 +85,16 @@ cf_cv_libtype= AC_EXEEXT AC_OBJEXT -CF_GNU_SOURCE + +CF_ANSI_CC_REQD +CF_GCC_ATTRIBUTES +CF_XOPEN_SOURCE +AC_C_CONST +CF_SIG_ATOMIC_T + +CF_DISABLE_ECHO +CF_ENABLE_WARNINGS + CF_WITH_CURSES_DIR dnl SunOS 4.x @@ -97,12 +107,16 @@ 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) @@ -113,16 +127,15 @@ curses) ncurses) CF_NCURSES_CPPFLAGS CF_NCURSES_LIBS - LIB_NAME=ncurses ;; ncursesw) cf_cv_libtype=w CF_UTF8_LIB - CF_PREDEFINE(_XOPEN_SOURCE,500) - CF_PREDEFINE(_XOPEN_SOURCE_EXTENDED) CF_NCURSES_CPPFLAGS(ncursesw) CF_NCURSES_LIBS(ncursesw) - LIB_NAME=ncursesw + ;; +pdcurses) #(vi + CF_PDCURSES_X11 ;; esac @@ -131,22 +144,34 @@ dnl installed conventionally (e.g., SunOS 5.x - solaris). dnl Autoconf builds up the $LIBS in reverse order -AC_CHECK_LIB(form$cf_cv_libtype,form_driver) -AC_CHECK_LIB(menu$cf_cv_libtype,menu_driver) -AC_CHECK_LIB(panel$cf_cv_libtype,new_panel) +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 \ + ) + ;; +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 \ @@ -155,20 +180,51 @@ 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 \ +setupterm \ slk_color \ -strdup \ +slk_init \ +termattrs \ +tgetent \ +tigetnum \ +tigetstr \ +typeahead \ use_default_colors \ 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}>], [ @@ -183,8 +239,28 @@ AC_TRY_LINK([ (void) resizeterm (0, 0); (void) use_default_colors (); (void) use_extended_names (0); - (void) wresize (0, 0, 0); - ],[AC_DEFINE(NCURSES_EXT_FUNCS)]) + (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) +else + AC_DEFINE(USE_WIDEC_SUPPORT,0) +fi CF_SYS_TIME_SELECT CF_FUNC_CURSES_VERSION @@ -193,9 +269,13 @@ CF_CURSES_WACS_MAP CF_CURSES_CHECK_TYPE(attr_t,long) CF_CURSES_CHECK_TYPE(mbstate_t,long) +TEST_ARGS="$LIBS" +LIBS= + dnl --------------------------------------------------------------------------- AC_OUTPUT(Makefile,[ +CF_PRG_RULES([$srcdir/mk-test.awk ECHO_LINK="$ECHO_LD"], .) cat >>Makefile <