X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fconfigure.in;h=d5d280b48b85bdc0063c6f93f0a10d17fcba2063;hp=4175530c3b4d9593a719b909d1b43aff1165b9f4;hb=a1aff38c9421e79f92cd4e8ab0587fdf3806cc28;hpb=55ccd2b959766810cf7db8d1c4462f338ce0afc8 diff --git a/test/configure.in b/test/configure.in index 4175530c..d5d280b4 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-2006,2007 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.63 2007/06/09 20:02:57 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,6 +49,7 @@ 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) @@ -57,17 +58,15 @@ CPPFLAGS="$CPPFLAGS" AC_SUBST(CPPFLAGS) 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) +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="" AC_SUBST(LIB_LINK) -LIB_NAME=curses AC_SUBST(LIB_NAME) -LIB_PREFIX="-l" AC_SUBST(LIB_PREFIX) +LIB_LINK='${CC}' AC_SUBST(LIB_LINK) LINK_TESTS="" AC_SUBST(LINK_TESTS) LINT=lint AC_SUBST(LINT) LINT_OPTS="" AC_SUBST(LINT_OPTS) @@ -86,7 +85,13 @@ 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_WITH_CURSES_DIR @@ -100,12 +105,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) @@ -116,14 +125,15 @@ curses) ncurses) CF_NCURSES_CPPFLAGS CF_NCURSES_LIBS - LIB_NAME=ncurses ;; ncursesw) cf_cv_libtype=w CF_UTF8_LIB CF_NCURSES_CPPFLAGS(ncursesw) CF_NCURSES_LIBS(ncursesw) - LIB_NAME=ncursesw + ;; +pdcurses) #(vi + CF_PDCURSES_X11 ;; esac @@ -132,22 +142,34 @@ 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 \ + ) + ;; +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,20 +178,39 @@ unistd.h \ ) AC_CHECK_FUNCS( \ +chgat \ color_set \ +filter \ +getbegx \ +getcurx \ +getmaxx \ getnstr \ gettimeofday \ +getwin \ +mvvline \ +mvwvline \ napms \ +putwin \ resize_term \ resizeterm \ +ripoffline \ +setupterm \ slk_color \ +slk_init \ strdup \ +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}>], [ @@ -184,8 +225,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 @@ -200,6 +261,7 @@ LIBS= dnl --------------------------------------------------------------------------- AC_OUTPUT(Makefile,[ +CF_PRG_RULES([$srcdir/mk-test.awk ECHO_LINK="$ECHO_LD"], .) cat >>Makefile <