XFree86 3.9q - xterm patch #52 - 1997/9/29 - T.Dickey This patch addresses bugs and requests reported by Bob Maynard , Clint Olsen , JCHANDRA@Inf.COM (JCHANDRA), Michael Schroeder , Pablo Ariel Kohan Some of the changes are interrelated (it was an unusually busy week). + change the default resource value for colorMode to true, matching the Xterm.ad file. + correct behavior of 'ech' control, making the default and 0 parameters erase one character rather than to the end of line (reported by Michael Schroeder). + add resource boldColors, command-line options +pc and -pc and configure-script option to specify behavior of xterm's mapping bold colors 0 through 7 to colors 8 through 15. (request by Pablo Ariel Kohan). + add resource colorAttrMode to specify whether colorULMode and colorBDMode can override the ANSI colors (from a problem report by Clint Olsen). + correct a conflict between colorULMode/colorBDMode versus ANSI colors, where exposure events would occasionally pick up the former (e.g., colorBD) rather than ANSI colors. Testing the colorAttrMode made this apparent, though it has been in the code since 3.2A (patch #35 in Jan 1997). + correct two problems with the optional logging support. On Linux at least, the waitpid call in creat_as hangs when the logging is toggled from the popup menu. Also, the mktemp template has the wrong number of X's (since X11R5!). Fixed the waitpid problem by exploiting the fact that the setuid behavior is reset before the popup menus are available. (reported by Jayachandran C.). + add configure script options for building with the Xaw3d and neXtaw libraries. + correct CF_IMAKE_CFLAGS standalone configure script macro, so that it will pick up $(ALLDEFINES) rather than $(STD_DEFINES). This is needed to make scrollbars work on Linux, since that uses narrow prototypes. (reported by Bob Maynard). + various minor updates to configure-script macros. -------------------------------------------------------------------------------- Makefile.in | 2 XTerm.ad | 4 aclocal.m4 | 42 +++- charproc.c | 47 +++-- configure | 496 +++++++++++++++++++++++++++++------------------------ configure.in | 24 +- data.c | 3 data.h | 1 main.c | 6 menu.c | 7 misc.c | 25 ++ os2main.c | 5 ptyx.h | 8 screen.c | 22 +- util.c | 18 - xterm-52/INSTALL | 52 +++++ xterm.h | 4 xterm.man | 20 ++ xtermcfg.hin | 1 19 files changed, 492 insertions, 295 deletions -------------------------------------------------------------------------------- Index: INSTALL --- /dev/null Sun Jul 17 19:46:18 1994 +++ xterm-52/INSTALL Mon Sep 29 19:09:28 1997 @@ -0,0 +1,52 @@ +-- $Id: INSTALL,v 1.2 1997/09/29 23:09:28 tom Exp $ +-- Thomas E. Dickey + +Xterm is normally built as part of the X Windows source tree, using +imake to generate a Makefile from Imakefile. You can also use the +configure script to generate a Makefile from Makefile.in: + + + If you have imake (or xmkmf), then you can use those directly, + or use the configure script, which normally uses those tools + to obtain the special definitions needed to build xterm. + + Ultimately, imake will not be necessary, since it is possible + to add configure tests that derive the information that imake + would supply. + + + You need the Athena widgets (or a clone, such as Xaw3d or + neXtaw), to provide the popup menus. + +Even if you have imake, the configure script is still convenient because +it allows you to build different configurations more easily than with +imake, simply by specifying options to the configure script. + +Options: +------- + +Autoconf configure scripts recognize two types of application-defined +options, enable/disable and with/without. The latter, by convention, are +used for denoting inclusion of external packages, while the former denote +enabling/disabling of internal features. The configure --help option +lists the available options. This script uses "enable" and "disable" +to indicate the sense of the default behavior. + +The options (in alphabetic order): + + --disable-16-color disable 16-color support (default: on) + --disable-active-icon disable X11R6.3 active-icon feature (default: on) + --disable-ansi-color disable ANSI color (default: on) + --disable-bold-color disable PC-style mapping of bold colors (default: on) + --disable-color-mode disable default colorMode resource (default: on) + --disable-doublechars disable support for double-size chars (default: on) + --disable-echo test: display "compiling" commands (default: on) + --disable-i18n disable internationalization (default: on) + --disable-imake disable use of imake for definitions (default: on) + --disable-input-method disable input-method (default: on) + --disable-vt52 disable VT52 emulation (default: on) + --enable-logging enable logging (default: off) + --enable-trace test: set to enable debugging traces (default: off) + --enable-warnings test: turn on GCC compiler warnings (default: off) + --enable-xmc-glitch test: enable xmc magic-cookie emulation (default: off) + --with-Xaw3d link with Xaw 3d library + --with-neXtaw link with neXT Athena library + --with-terminal-id[=V] set default decTerminalID (default: vt100) Index: Makefile.in --- xterm-51+/Makefile.in Fri Sep 19 13:58:52 1997 +++ xterm-52/Makefile.in Sat Sep 27 10:58:50 1997 @@ -90,7 +90,7 @@ $(mandir)/resize.$(manext) mostlyclean: - -$(RM) *.[oi] .pure core *~ *.BAK + -$(RM) *.[oi] XtermLog.* .pure core *~ *.BAK *.out clean: mostlyclean -$(RM) $(PROGRAMS) Index: XTerm.ad --- xterm-51+/XTerm.ad Fri Sep 19 13:58:52 1997 +++ xterm-52/XTerm.ad Sun Sep 28 21:18:29 1997 @@ -95,6 +95,7 @@ ! Enable Colour by default. *VT100*colorMode: on +*VT100*boldColors: on *VT100*dynamicColors: on ! Uncomment this use color for underline attribute @@ -103,6 +104,9 @@ ! Uncomment this to use color for the bold attribute !*VT100*colorBDMode: on + +! Uncomment this to use the bold/underline colors in preference to other colors +!*VT100*colorAttrMode: on *VT100*color0: black *VT100*color1: red3 Index: aclocal.m4 --- xterm-51+/aclocal.m4 Fri Sep 19 13:58:52 1997 +++ xterm-52/aclocal.m4 Fri Sep 26 21:18:55 1997 @@ -336,7 +336,7 @@ dnl -pedantic dnl AC_DEFUN([CF_GCC_WARNINGS], -[EXTRA_CFLAGS="" +[ if test -n "$GCC" then changequote(,)dnl @@ -348,6 +348,8 @@ AC_CHECKING([for gcc warning options]) cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" + cf_warn_CONST="" + test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" for cf_opt in \ Wbad-function-cast \ Wcast-align \ @@ -358,7 +360,7 @@ Wnested-externs \ Wpointer-arith \ Wshadow \ - Wstrict-prototypes + Wstrict-prototypes $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" if AC_TRY_EVAL(ac_compile); then @@ -393,10 +395,10 @@ if mkdir conftestdir; then cd conftestdir echo >./Imakefile - test ../Imakefile && cat ../Imakefile >>./Imakefile + test -f ../Imakefile && cat ../Imakefile >>./Imakefile cat >> ./Imakefile <<'CF_EOF' findstddefs: - @echo 'IMAKE_CFLAGS="${STD_DEFINES} ifelse($1,,,$1)"' + @echo 'IMAKE_CFLAGS="${ALLDEFINES} ifelse($1,,,$1)"' CF_EOF if ( $IMAKE $cf_imake_opts 1>/dev/null 2>&AC_FD_CC && test -f Makefile) then @@ -478,17 +480,30 @@ dnl AC_DEFUN([CF_X_ATHENA], [AC_REQUIRE([CF_X_TOOLKIT]) -AC_CHECK_HEADERS(X11/Xaw/SimpleMenu.h) -AC_CHECK_LIB(Xmu, XmuClientWindow) +cf_x_athena=Xaw + +AC_ARG_WITH(Xaw3d, + [ --with-Xaw3d link with Xaw 3d library], + [cf_x_athena=Xaw3d]) + +AC_ARG_WITH(neXtaw, + [ --with-neXtaw link with neXT Athena library], + [cf_x_athena=neXtaw]) + +AC_CHECK_HEADERS(X11/$cf_x_athena/SimpleMenu.h) + +AC_CHECK_LIB(Xmu, XmuClientWindow,,[ +AC_CHECK_LIB(Xmu_s, XmuClientWindow)]) + AC_CHECK_LIB(Xext,XextCreateExtension, [LIBS="-lXext $LIBS"]) -AC_CHECK_LIB(Xmu_s, XmuClientWindow) -AC_CHECK_LIB(Xaw, XawSimpleMenuAddGlobalActions, - [LIBS="-lXaw $LIBS"],[ -AC_CHECK_LIB(Xaw_s, XawSimpleMenuAddGlobalActions, - [LIBS="-lXaw_s $LIBS"], + +AC_CHECK_LIB($cf_x_athena, XawSimpleMenuAddGlobalActions, + [LIBS="-l$cf_x_athena $LIBS"],[ +AC_CHECK_LIB(${cf_x_athena}_s, XawSimpleMenuAddGlobalActions, + [LIBS="-l${cf_x_athena}_s $LIBS"], AC_ERROR( -[Unable to successfully link Athena library (-lXaw) with test program]), +[Unable to successfully link Athena library (-l$cf_x_athena) with test program]), [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])]) ])dnl dnl --------------------------------------------------------------------------- @@ -496,11 +511,12 @@ dnl AC_DEFUN([CF_X_TOOLKIT], [ +AC_REQUIRE([CF_CHECK_CACHE]) # We need to check for -lsocket and -lnsl here in order to work around an # autoconf bug. autoconf-2.12 is not checking for these prior to checking for # the X11R6 -lSM and -lICE libraries. The resultant failures cascade... # (tested on Solaris 2.5 w/ X11R6) -SYSTEM_NAME=`echo "$system_name"|tr ' ' -` +SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -` cf_have_X_LIBS=no case $SYSTEM_NAME in irix5*) ;; Index: charproc.c --- xterm-51+/charproc.c Fri Sep 19 13:58:52 1997 +++ xterm-52/charproc.c Sun Sep 28 21:07:01 1997 @@ -255,6 +255,8 @@ #define XtNcolorMode "colorMode" #define XtNcolorULMode "colorULMode" #define XtNcolorBDMode "colorBDMode" +#define XtNcolorAttrMode "colorAttrMode" +#define XtNboldColors "boldColors" #define XtNdynamicColors "dynamicColors" #define XtNunderLine "underLine" #define XtNdecTerminalID "decTerminalID" @@ -745,6 +747,12 @@ {XtNcolorBDMode, XtCColorMode, XtRBoolean, sizeof(Boolean), XtOffsetOf(XtermWidgetRec, screen.colorBDMode), XtRBoolean, (XtPointer) &defaultFALSE}, +{XtNcolorAttrMode, XtCColorMode, XtRBoolean, sizeof(Boolean), + XtOffsetOf(XtermWidgetRec, screen.colorAttrMode), + XtRBoolean, (XtPointer) &defaultFALSE}, +{XtNboldColors, XtCColorMode, XtRBoolean, sizeof(Boolean), + XtOffsetOf(XtermWidgetRec, screen.boldColors), + XtRBoolean, (XtPointer) &defaultTRUE}, #endif /* OPT_ISO_COLORS */ {XtNdynamicColors, XtCDynamicColors, XtRBoolean, sizeof(Boolean), XtOffsetOf(XtermWidgetRec, misc.dynamicColors), @@ -872,14 +880,15 @@ } /* Invoked after updating bold/underline flags, computes the extended color - * index to use for foreground. + * index to use for foreground. (See also 'extract_fg()'). */ static void setExtendedFG() { int fg = term->sgr_foreground; - if (fg < 0) { + if (term->screen.colorAttrMode + || (fg < 0)) { if (term->screen.colorULMode && (term->flags & UNDERLINE)) fg = COLOR_UL; @@ -892,8 +901,13 @@ * much sense for 16-color applications, but we keep it to retain * compatiblity with ANSI-color applications. */ - if ((fg >= 0) && (fg < 8) && (term->flags & BOLD)) +#if OPT_PC_COLORS + if (term->screen.boldColors + && (fg >= 0) + && (fg < 8) + && (term->flags & BOLD)) fg |= 8; +#endif SGR_Foreground(fg); } @@ -1320,7 +1334,7 @@ case CASE_ECH: /* ECH */ - ClearRight(screen, param[0]); + ClearRight(screen, param[0] < 1 ? 1 : param[0]); parsestate = groundtable; break; @@ -2492,8 +2506,7 @@ register int len; { unsigned flags = term->flags; - int fg = term->cur_foreground; - int bg = term->cur_background; + int fg_bg = makeColorPair(term->cur_foreground, term->cur_background); GC currentGC; TRACE(("WriteText (%2d,%2d) (%d) %3d:%.*s\n", @@ -2510,7 +2523,7 @@ InsertChar(screen, len); if (!AddToRefresh(screen)) { /* make sure that the correct GC is current */ - currentGC = updatedXtermGC(screen, flags, fg, bg, False); + currentGC = updatedXtermGC(screen, flags, fg_bg, False); if(screen->scroll_amt) FlushScroll(screen); @@ -2542,7 +2555,7 @@ #endif } } - ScreenWrite(screen, str, flags, fg, bg, len); + ScreenWrite(screen, str, flags, fg_bg, len); CursorForward(screen, len); } @@ -3584,15 +3597,19 @@ new->screen.menu_font_number = fontMenu_fontdefault; #if OPT_ISO_COLORS - new->screen.colorMode = request->screen.colorMode; - new->screen.colorULMode = request->screen.colorULMode; - new->screen.colorBDMode = request->screen.colorBDMode; + new->screen.boldColors = request->screen.boldColors; + new->screen.colorAttrMode = request->screen.colorAttrMode; + new->screen.colorBDMode = request->screen.colorBDMode; + new->screen.colorMode = request->screen.colorMode; + new->screen.colorULMode = request->screen.colorULMode; + for (i = 0, color_ok = False; i < MAXCOLORS; i++) { new->screen.Acolors[i] = request->screen.Acolors[i]; if (new->screen.Acolors[i] != request->screen.foreground && new->screen.Acolors[i] != request->core.background_pixel) color_ok = True; } + /* If none of the colors are anything other than the foreground or * background, we'll assume this isn't color, no matter what the colorMode * resource says. (There doesn't seem to be any good way to determine if @@ -4200,7 +4217,7 @@ { register TScreen *screen = &term->screen; GC currentGC; - register int flags, fg = 0, bg = 0; + register int flags, fg_bg = 0; Char c; Boolean in_selection; @@ -4213,9 +4230,7 @@ flags = SCRN_BUF_ATTRS(screen, screen->cursor_row)[screen->cursor_col]; if_OPT_ISO_COLORS(screen,{ - unsigned fb = SCRN_BUF_COLOR(screen, screen->cursor_row)[screen->cursor_col]; - fg = extract_fg(fb, flags); - bg = extract_bg(fb); + fg_bg = SCRN_BUF_COLOR(screen, screen->cursor_row)[screen->cursor_col]; }) #ifndef NO_ACTIVE_ICON @@ -4236,7 +4251,7 @@ else in_selection = True; - currentGC = updatedXtermGC(screen, flags, fg, bg, in_selection); + currentGC = updatedXtermGC(screen, flags, fg_bg, in_selection); if (c == 0) c = ' '; Index: configure --- xterm-51+/configure Fri Sep 19 13:58:52 1997 +++ xterm-52/configure Sun Sep 28 21:36:34 1997 @@ -1,8 +1,6 @@ #! /bin/sh -# -# $XFree86: xc/programs/xterm/configure,v 3.11 1997/09/19 11:24:41 hohndel Exp $ -# From configure.in Revision: 1.13 +# From configure.in Revision: 1.16 # Guess values for system-dependent variables and create Makefiles. @@ -19,6 +17,10 @@ ac_help="$ac_help --with-x use the X Window System" ac_help="$ac_help + --with-Xaw3d link with Xaw 3d library" +ac_help="$ac_help + --with-neXtaw link with neXT Athena library" +ac_help="$ac_help --disable-imake disable use of imake for definitions (default: on)" ac_help="$ac_help --with-terminal-id[=V] set default decTerminalID (default: vt100)" @@ -29,7 +31,9 @@ ac_help="$ac_help --disable-16-color disable 16-color support (default: on)" ac_help="$ac_help - --enable-color-mode set default colorMode resource (default: off)" + --disable-bold-color disable PC-style mapping of bold colors (default: on)" +ac_help="$ac_help + --disable-color-mode disable default colorMode resource (default: on)" ac_help="$ac_help --disable-doublechars disable support for double-size chars (default: on)" ac_help="$ac_help @@ -584,7 +588,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:586: checking host system type" >&5 +echo "configure:592: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -635,7 +639,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:637: checking for $ac_word" >&5 +echo "configure:643: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -664,7 +668,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:666: checking for $ac_word" >&5 +echo "configure:672: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -712,7 +716,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:714: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:720: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -722,11 +726,11 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -746,12 +750,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:748: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:754: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:753: checking whether we are using GNU C" >&5 +echo "configure:759: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -760,7 +764,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -775,7 +779,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:777: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:783: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -803,7 +807,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:805: checking how to run the C preprocessor" >&5 +echo "configure:811: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -818,13 +822,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -835,13 +839,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -865,13 +869,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:867: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:873: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -889,7 +893,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -921,7 +925,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:923: checking for a BSD compatible install" >&5 +echo "configure:929: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -973,9 +977,9 @@ ### checks for UNIX variants that set C preprocessor variables echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:975: checking for AIX" >&5 +echo "configure:981: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:999: checking for POSIXized ISC" >&5 +echo "configure:1005: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1019,17 +1023,17 @@ ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -echo "configure:1021: checking for minix/config.h" >&5 +echo "configure:1027: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1071,12 +1075,12 @@ ### checks for typedefs echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1073: checking for ANSI C header files" >&5 +echo "configure:1079: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1084,7 +1088,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1101,7 +1105,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1119,7 +1123,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1140,7 +1144,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1151,7 +1155,7 @@ exit (0); } EOF -if { (eval echo configure:1153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1175,12 +1179,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1177: checking for size_t" >&5 +echo "configure:1183: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1208,12 +1212,12 @@ fi echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:1210: checking for time_t" >&5 +echo "configure:1216: checking for time_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1249,12 +1253,12 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1251: checking for $ac_func" >&5 +echo "configure:1257: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1305,7 +1309,7 @@ if test ".$ac_cv_func_memmove" != .yes ; then if test $ac_cv_func_bcopy = yes ; then echo $ac_n "checking if bcopy does overlapping moves""... $ac_c" 1>&6 -echo "configure:1307: checking if bcopy does overlapping moves" >&5 +echo "configure:1313: checking if bcopy does overlapping moves" >&5 if eval "test \"`echo '$''{'cf_cv_good_bcopy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1314,7 +1318,7 @@ cf_cv_good_bcopy=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cf_cv_good_bcopy=yes else @@ -1361,7 +1365,7 @@ echo $ac_n "checking for workable tgetent function""... $ac_c" 1>&6 -echo "configure:1363: checking for workable tgetent function" >&5 +echo "configure:1369: checking for workable tgetent function" >&5 if eval "test \"`echo '$''{'cf_cv_func_tgetent'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1377,7 +1381,7 @@ cf_cv_func_tgetent=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then echo "yes, there is a termcap/tgetent present" 1>&5 cf_cv_func_tgetent=yes @@ -1412,14 +1416,14 @@ for cf_termlib in $cf_TERMLIB do cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "there is a terminfo/tgetent present" 1>&5 cf_cv_func_tgetent=$cf_termlib @@ -1445,17 +1449,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1447: checking for $ac_hdr" >&5 +echo "configure:1453: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1457: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1493,13 +1497,13 @@ ### checks for structures echo $ac_n "checking for declaration of fd_set""... $ac_c" 1>&6 -echo "configure:1495: checking for declaration of fd_set" >&5 +echo "configure:1501: checking for declaration of fd_set" >&5 if eval "test \"`echo '$''{'cf_cv_type_fd_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1507,7 +1511,7 @@ fd_set x ; return 0; } EOF -if { (eval echo configure:1509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_fd_set=sys/types.h else @@ -1515,7 +1519,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -1524,7 +1528,7 @@ fd_set x ; return 0; } EOF -if { (eval echo configure:1526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_fd_set=sys/select.h else @@ -1549,12 +1553,12 @@ ### checks for compiler characteristics echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1551: checking for working const" >&5 +echo "configure:1557: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1625,7 +1629,7 @@ echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1627: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1633: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1643,7 +1647,7 @@ do CFLAGS="$cf_save_CFLAGS $cf_arg" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -1693,7 +1697,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:1695: checking for X" >&5 +echo "configure:1701: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1755,12 +1759,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1829,14 +1833,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1923,11 +1927,12 @@ fi + # We need to check for -lsocket and -lnsl here in order to work around an # autoconf bug. autoconf-2.12 is not checking for these prior to checking for # the X11R6 -lSM and -lICE libraries. The resultant failures cascade... # (tested on Solaris 2.5 w/ X11R6) -SYSTEM_NAME=`echo "$system_name"|tr ' ' -` +SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -` cf_have_X_LIBS=no case $SYSTEM_NAME in irix5*) ;; @@ -1935,7 +1940,7 @@ # FIXME: modify the library lookup in autoconf to # allow _s.a suffix ahead of .a echo $ac_n "checking for open in -lc_s""... $ac_c" 1>&6 -echo "configure:1937: checking for open in -lc_s" >&5 +echo "configure:1944: checking for open in -lc_s" >&5 ac_lib_var=`echo c_s'_'open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1943,7 +1948,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1971,7 +1976,7 @@ echo "$ac_t""yes" 1>&6 LIBS="-lc_s $LIBS" echo $ac_n "checking for gethostname in -lbsd""... $ac_c" 1>&6 -echo "configure:1973: checking for gethostname in -lbsd" >&5 +echo "configure:1980: checking for gethostname in -lbsd" >&5 ac_lib_var=`echo bsd'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1979,7 +1984,7 @@ ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2007,7 +2012,7 @@ echo "$ac_t""yes" 1>&6 LIBS="-lbsd $LIBS" echo $ac_n "checking for gethostname in -lnsl_s""... $ac_c" 1>&6 -echo "configure:2009: checking for gethostname in -lnsl_s" >&5 +echo "configure:2016: checking for gethostname in -lnsl_s" >&5 ac_lib_var=`echo nsl_s'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2015,7 +2020,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2043,7 +2048,7 @@ echo "$ac_t""yes" 1>&6 LIBS="-lnsl_s $LIBS" echo $ac_n "checking for XOpenDisplay in -lX11_s""... $ac_c" 1>&6 -echo "configure:2045: checking for XOpenDisplay in -lX11_s" >&5 +echo "configure:2052: checking for XOpenDisplay in -lX11_s" >&5 ac_lib_var=`echo X11_s'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2051,7 +2056,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2079,7 +2084,7 @@ echo "$ac_t""yes" 1>&6 LIBS="-lX11_s $LIBS" echo $ac_n "checking for XtAppInitialize in -lXt_s""... $ac_c" 1>&6 -echo "configure:2081: checking for XtAppInitialize in -lXt_s" >&5 +echo "configure:2088: checking for XtAppInitialize in -lXt_s" >&5 ac_lib_var=`echo Xt_s'_'XtAppInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2087,7 +2092,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2139,7 +2144,7 @@ ;; *) echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2141: checking for socket in -lsocket" >&5 +echo "configure:2148: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2147,7 +2152,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2186,7 +2191,7 @@ fi echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:2188: checking for gethostname in -lnsl" >&5 +echo "configure:2195: checking for gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2194,7 +2199,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2256,17 +2261,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:2258: checking whether -R must be followed by a space" >&5 +echo "configure:2265: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -2282,14 +2287,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -2321,7 +2326,7 @@ # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:2323: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2330: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2329,7 +2334,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2362,7 +2367,7 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:2364: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2371: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2370,7 +2375,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2410,12 +2415,12 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:2412: checking for gethostbyname" >&5 +echo "configure:2419: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2459,7 +2464,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2461: checking for gethostbyname in -lnsl" >&5 +echo "configure:2468: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2467,7 +2472,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2508,12 +2513,12 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:2510: checking for connect" >&5 +echo "configure:2517: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2557,7 +2562,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2559: checking for connect in -lsocket" >&5 +echo "configure:2566: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2565,7 +2570,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2600,12 +2605,12 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:2602: checking for remove" >&5 +echo "configure:2609: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2649,7 +2654,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2651: checking for remove in -lposix" >&5 +echo "configure:2658: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2657,7 +2662,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2692,12 +2697,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2694: checking for shmat" >&5 +echo "configure:2701: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2741,7 +2746,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2743: checking for shmat in -lipc" >&5 +echo "configure:2750: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2749,7 +2754,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2793,7 +2798,7 @@ # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2795: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2802: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2801,7 +2806,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2839,7 +2844,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" CFLAGS="$CFLAGS $X_CFLAGS" echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:2841: checking for XOpenDisplay in -lX11" >&5 +echo "configure:2848: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2847,7 +2852,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2879,7 +2884,7 @@ fi echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:2881: checking for XtAppInitialize in -lXt" >&5 +echo "configure:2888: checking for XtAppInitialize in -lXt" >&5 ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2887,7 +2892,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2943,17 +2948,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2945: checking for $ac_hdr" >&5 +echo "configure:2952: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2981,21 +2986,37 @@ -for ac_hdr in X11/Xaw/SimpleMenu.h +cf_x_athena=Xaw + +# Check whether --with-Xaw3d or --without-Xaw3d was given. +if test "${with_Xaw3d+set}" = set; then + withval="$with_Xaw3d" + cf_x_athena=Xaw3d +fi + + +# Check whether --with-neXtaw or --without-neXtaw was given. +if test "${with_neXtaw+set}" = set; then + withval="$with_neXtaw" + cf_x_athena=neXtaw +fi + + +for ac_hdr in X11/$cf_x_athena/SimpleMenu.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2987: checking for $ac_hdr" >&5 +echo "configure:3010: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3021,8 +3042,9 @@ fi done + echo $ac_n "checking for XmuClientWindow in -lXmu""... $ac_c" 1>&6 -echo "configure:3024: checking for XmuClientWindow in -lXmu" >&5 +echo "configure:3048: checking for XmuClientWindow in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuClientWindow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3030,7 +3052,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3066,29 +3088,28 @@ else echo "$ac_t""no" 1>&6 -fi -echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:3071: checking for XextCreateExtension in -lXext" >&5 -ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` +echo $ac_n "checking for XmuClientWindow in -lXmu_s""... $ac_c" 1>&6 +echo "configure:3094: checking for XmuClientWindow in -lXmu_s" >&5 +ac_lib_var=`echo Xmu_s'_'XmuClientWindow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lXext $LIBS" +LIBS="-lXmu_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3103,32 +3124,42 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="-lXext $LIBS" + ac_tr_lib=HAVE_LIB`echo Xmu_s | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 fi -echo $ac_n "checking for XmuClientWindow in -lXmu_s""... $ac_c" 1>&6 -echo "configure:3111: checking for XmuClientWindow in -lXmu_s" >&5 -ac_lib_var=`echo Xmu_s'_'XmuClientWindow | sed 'y%./+-%__p_%'` +fi + + +echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 +echo "configure:3144: checking for XextCreateExtension in -lXext" >&5 +ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lXmu_s $LIBS" +LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3143,28 +3174,22 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo Xmu_s | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 fi -echo $ac_n "checking for XawSimpleMenuAddGlobalActions in -lXaw""... $ac_c" 1>&6 -echo "configure:3158: checking for XawSimpleMenuAddGlobalActions in -lXaw" >&5 -ac_lib_var=`echo Xaw'_'XawSimpleMenuAddGlobalActions | sed 'y%./+-%__p_%'` + +echo $ac_n "checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena""... $ac_c" 1>&6 +echo "configure:3185: checking for XawSimpleMenuAddGlobalActions in -l$cf_x_athena" >&5 +ac_lib_var=`echo $cf_x_athena'_'XawSimpleMenuAddGlobalActions | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lXaw $LIBS" +LIBS="-l$cf_x_athena $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3190,20 +3215,20 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="-lXaw $LIBS" + LIBS="-l$cf_x_athena $LIBS" else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for XawSimpleMenuAddGlobalActions in -lXaw_s""... $ac_c" 1>&6 -echo "configure:3197: checking for XawSimpleMenuAddGlobalActions in -lXaw_s" >&5 -ac_lib_var=`echo Xaw_s'_'XawSimpleMenuAddGlobalActions | sed 'y%./+-%__p_%'` +echo $ac_n "checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s""... $ac_c" 1>&6 +echo "configure:3224: checking for XawSimpleMenuAddGlobalActions in -l${cf_x_athena}_s" >&5 +ac_lib_var=`echo ${cf_x_athena}_s'_'XawSimpleMenuAddGlobalActions | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lXaw_s $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" +LIBS="-l${cf_x_athena}_s $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3229,10 +3254,10 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="-lXaw_s $LIBS" + LIBS="-l${cf_x_athena}_s $LIBS" else echo "$ac_t""no" 1>&6 -{ echo "configure: error: Unable to successfully link Athena library (-lXaw) with test program" 1>&2; exit 1; } +{ echo "configure: error: Unable to successfully link Athena library (-l$cf_x_athena) with test program" 1>&2; exit 1; } fi fi @@ -3242,7 +3267,7 @@ LIBS="$LIBS $X_EXTRA_LIBS" echo $ac_n "checking if we should use imake to help""... $ac_c" 1>&6 -echo "configure:3244: checking if we should use imake to help" >&5 +echo "configure:3271: checking if we should use imake to help" >&5 # Check whether --enable-imake or --disable-imake was given. if test "${enable_imake+set}" = set; then enableval="$enable_imake" @@ -3266,7 +3291,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3268: checking for $ac_word" >&5 +echo "configure:3295: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_IMAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3311,10 +3336,10 @@ if mkdir conftestdir; then cd conftestdir echo >./Imakefile - test ../Imakefile && cat ../Imakefile >>./Imakefile + test -f ../Imakefile && cat ../Imakefile >>./Imakefile cat >> ./Imakefile <<'CF_EOF' findstddefs: - @echo 'IMAKE_CFLAGS="${STD_DEFINES} $(MAIN_DEFINES)"' + @echo 'IMAKE_CFLAGS="${ALLDEFINES} $(MAIN_DEFINES)"' CF_EOF if ( $IMAKE $cf_imake_opts 1>/dev/null 2>&5 && test -f Makefile) then @@ -3361,7 +3386,7 @@ echo $ac_n "checking for default terminal-id""... $ac_c" 1>&6 -echo "configure:3363: checking for default terminal-id" >&5 +echo "configure:3390: checking for default terminal-id" >&5 # Check whether --with-terminal-id or --without-terminal-id was given. if test "${with_terminal_id+set}" = set; then withval="$with_terminal_id" @@ -3382,7 +3407,7 @@ ### checks for optional features echo $ac_n "checking if you want active-icons""... $ac_c" 1>&6 -echo "configure:3384: checking if you want active-icons" >&5 +echo "configure:3411: checking if you want active-icons" >&5 # Check whether --enable-active-icon or --disable-active-icon was given. if test "${enable_active_icon+set}" = set; then enableval="$enable_active_icon" @@ -3407,7 +3432,7 @@ fi echo $ac_n "checking if you want ANSI color""... $ac_c" 1>&6 -echo "configure:3409: checking if you want ANSI color" >&5 +echo "configure:3436: checking if you want ANSI color" >&5 # Check whether --enable-ansi-color or --disable-ansi-color was given. if test "${enable_ansi_color+set}" = set; then enableval="$enable_ansi_color" @@ -3430,7 +3455,7 @@ echo $ac_n "checking if you want 16 colors like aixterm""... $ac_c" 1>&6 -echo "configure:3432: checking if you want 16 colors like aixterm" >&5 +echo "configure:3459: checking if you want 16 colors like aixterm" >&5 # Check whether --enable-16-color or --disable-16-color was given. if test "${enable_16_color+set}" = set; then enableval="$enable_16_color" @@ -3446,37 +3471,60 @@ fi -echo "$ac_t""$enable_ansi_color" 1>&6 +echo "$ac_t""$enable_16_color" 1>&6 test $enable_16_color = no && cat >> confdefs.h <<\EOF #define OPT_AIX_COLORS 0 EOF -echo $ac_n "checking for default color-mode""... $ac_c" 1>&6 -echo "configure:3455: checking for default color-mode" >&5 +echo $ac_n "checking if you want bold colors mapped like IBM PC""... $ac_c" 1>&6 +echo "configure:3482: checking if you want bold colors mapped like IBM PC" >&5 +# Check whether --enable-bold-color or --disable-bold-color was given. +if test "${enable_bold_color+set}" = set; then + enableval="$enable_bold_color" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + enable_pc_color=no + else + enable_pc_color=yes + fi +else + enableval=yes + enable_pc_color=yes + +fi + +echo "$ac_t""$enable_pc_color" 1>&6 +test $enable_pc_color = no && cat >> confdefs.h <<\EOF +#define OPT_PC_COLORS 0 +EOF + + +echo $ac_n "checking if you want color-mode enabled by default""... $ac_c" 1>&6 +echo "configure:3505: checking if you want color-mode enabled by default" >&5 # Check whether --enable-color-mode or --disable-color-mode was given. if test "${enable_color_mode+set}" = set; then enableval="$enable_color_mode" - test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then - default_colormode=TRUE + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + default_colormode=no else - default_colormode=FALSE + default_colormode=yes fi else - enableval=no - default_colormode=FALSE + enableval=yes + default_colormode=yes fi echo "$ac_t""$default_colormode" 1>&6 -cat >> confdefs.h <> confdefs.h <<\EOF +#define DFT_COLORMODE FALSE EOF echo $ac_n "checking for doublesize characters""... $ac_c" 1>&6 -echo "configure:3478: checking for doublesize characters" >&5 +echo "configure:3528: checking for doublesize characters" >&5 # Check whether --enable-doublechars or --disable-doublechars was given. if test "${enable_doublechars+set}" = set; then enableval="$enable_doublechars" @@ -3499,7 +3547,7 @@ echo $ac_n "checking if you want support for input-method""... $ac_c" 1>&6 -echo "configure:3501: checking if you want support for input-method" >&5 +echo "configure:3551: checking if you want support for input-method" >&5 # Check whether --enable-input-method or --disable-input-method was given. if test "${enable_input_method+set}" = set; then enableval="$enable_input_method" @@ -3524,7 +3572,7 @@ fi echo $ac_n "checking if you want support for internationalization""... $ac_c" 1>&6 -echo "configure:3526: checking if you want support for internationalization" >&5 +echo "configure:3576: checking if you want support for internationalization" >&5 # Check whether --enable-i18n or --disable-i18n was given. if test "${enable_i18n+set}" = set; then enableval="$enable_i18n" @@ -3549,7 +3597,7 @@ fi echo $ac_n "checking if you want support for logging""... $ac_c" 1>&6 -echo "configure:3551: checking if you want support for logging" >&5 +echo "configure:3601: checking if you want support for logging" >&5 # Check whether --enable-logging or --disable-logging was given. if test "${enable_logging+set}" = set; then enableval="$enable_logging" @@ -3574,7 +3622,7 @@ fi echo $ac_n "checking if you want debugging traces""... $ac_c" 1>&6 -echo "configure:3576: checking if you want debugging traces" >&5 +echo "configure:3626: checking if you want debugging traces" >&5 # Check whether --enable-trace or --disable-trace was given. if test "${enable_trace+set}" = set; then enableval="$enable_trace" @@ -3601,7 +3649,7 @@ fi echo $ac_n "checking if you want VT52 emulation""... $ac_c" 1>&6 -echo "configure:3603: checking if you want VT52 emulation" >&5 +echo "configure:3653: checking if you want VT52 emulation" >&5 # Check whether --enable-vt52 or --disable-vt52 was given. if test "${enable_vt52+set}" = set; then enableval="$enable_vt52" @@ -3626,7 +3674,7 @@ # development/testing aids echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:3628: checking if you want to see long compiling messages" >&5 +echo "configure:3678: checking if you want to see long compiling messages" >&5 # Check whether --enable-echo or --disable-echo was given. if test "${enable_echo+set}" = set; then enableval="$enable_echo" @@ -3665,7 +3713,7 @@ echo $ac_n "checking if you want magic cookie emulation""... $ac_c" 1>&6 -echo "configure:3667: checking if you want magic cookie emulation" >&5 +echo "configure:3717: checking if you want magic cookie emulation" >&5 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. if test "${enable_xmc_glitch+set}" = set; then enableval="$enable_xmc_glitch" @@ -3694,7 +3742,7 @@ if test -n "$GCC" ; then echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:3696: checking if you want to turn on gcc warnings" >&5 +echo "configure:3746: checking if you want to turn on gcc warnings" >&5 # Check whether --enable-warnings or --disable-warnings was given. if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" @@ -3733,9 +3781,9 @@ if test -n "$GCC" then echo "checking for gcc __attribute__ directives" 1>&6 -echo "configure:3735: checking for gcc __attribute__ directives" >&5 +echo "configure:3785: checking for gcc __attribute__ directives" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:3825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6 cat conftest.h >>confdefs.h # else @@ -3786,17 +3834,19 @@ rm -rf conftest* fi - EXTRA_CFLAGS="" + if test -n "$GCC" then cat > conftest.$ac_ext <&6 -echo "configure:3796: checking for gcc warning options" >&5 +echo "configure:3846: checking for gcc warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" + cf_warn_CONST="" + test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" for cf_opt in \ Wbad-function-cast \ Wcast-align \ @@ -3807,10 +3857,10 @@ Wnested-externs \ Wpointer-arith \ Wshadow \ - Wstrict-prototypes + Wstrict-prototypes $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:3812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:3864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES" Index: configure.in --- xterm-51+/configure.in Fri Sep 19 13:58:52 1997 +++ xterm-52/configure.in Sun Sep 28 21:16:07 1997 @@ -27,7 +27,7 @@ dnl --------------------------------------------------------------------------- dnl Process this file with autoconf to produce a configure script. dnl -AC_REVISION($Revision: 1.14 $) +AC_REVISION($Revision: 1.16 $) AC_PREREQ(2.12) AC_INIT(charproc.c) AC_CONFIG_HEADER(xtermcfg.h:xtermcfg.hin) @@ -127,16 +127,24 @@ [ --disable-16-color disable 16-color support], [enable_16_color=no], [enable_16_color=yes]) -AC_MSG_RESULT($enable_ansi_color) +AC_MSG_RESULT($enable_16_color) test $enable_16_color = no && AC_DEFINE(OPT_AIX_COLORS,0) -AC_MSG_CHECKING(for default color-mode) -CF_ARG_ENABLE(color-mode, - [ --enable-color-mode set default colorMode resource], - [default_colormode=TRUE], - [default_colormode=FALSE]) +AC_MSG_CHECKING(if you want bold colors mapped like IBM PC) +CF_ARG_DISABLE(bold-color, + [ --disable-bold-color disable PC-style mapping of bold colors], + [enable_pc_color=no], + [enable_pc_color=yes]) +AC_MSG_RESULT($enable_pc_color) +test $enable_pc_color = no && AC_DEFINE(OPT_PC_COLORS,0) + +AC_MSG_CHECKING(if you want color-mode enabled by default) +CF_ARG_DISABLE(color-mode, + [ --disable-color-mode disable default colorMode resource], + [default_colormode=no], + [default_colormode=yes]) AC_MSG_RESULT($default_colormode) -AC_DEFINE_UNQUOTED(DFT_COLORMODE,$default_colormode) +test $default_colormode = no && AC_DEFINE(DFT_COLORMODE,FALSE) AC_MSG_CHECKING(for doublesize characters) CF_ARG_DISABLE(doublechars, Index: data.c --- xterm-51+/data.c Fri Sep 19 13:58:52 1997 +++ xterm-52/data.c Sat Sep 27 12:38:43 1997 @@ -96,6 +96,7 @@ #endif int am_slave = 0; /* set to 1 if running as a slave process */ +int done_setuid = 0; /* set to 1 after resetting setuid */ int max_plus1; fd_set Select_mask; fd_set X_mask; @@ -103,7 +104,7 @@ char *ptydev; char *ttydev; #ifdef ALLOWLOGGING -char log_def_name[] = "XtermLog.XXXXX"; +char log_def_name[] = "XtermLog.XXXXXX"; #endif int T_lastx = -1; int T_lasty = -1; Index: data.h --- xterm-51+/data.h Fri Sep 19 13:58:52 1997 +++ xterm-52/data.h Sat Sep 27 12:38:07 1997 @@ -66,6 +66,7 @@ extern int Tbcnt; extern int Ttoggled; extern int am_slave; +extern int done_setuid; extern int bcnt; #ifdef DEBUG extern int debug; Index: main.c --- xterm-51+/main.c Fri Sep 19 13:58:52 1997 +++ xterm-52/main.c Sun Sep 28 21:20:42 1997 @@ -811,6 +811,8 @@ {"-nb", "*nMarginBell", XrmoptionSepArg, (caddr_t) NULL}, {"-nul", "*underLine", XrmoptionNoArg, (caddr_t) "off"}, {"+nul", "*underLine", XrmoptionNoArg, (caddr_t) "on"}, +{"-pc", "*boldColors", XrmoptionNoArg, (caddr_t) "on"}, +{"+pc", "*boldColors", XrmoptionNoArg, (caddr_t) "off"}, {"-rw", "*reverseWrap", XrmoptionNoArg, (caddr_t) "on"}, {"+rw", "*reverseWrap", XrmoptionNoArg, (caddr_t) "off"}, {"-s", "*multiScroll", XrmoptionNoArg, (caddr_t) "on"}, @@ -904,6 +906,7 @@ { "-nb number", "margin bell in characters from right end" }, { "-/+nul", "turn on/off display of underlining" }, { "-/+aw", "turn on/off auto wraparound" }, +{ "-/+pc", "turn on/off PC-style bold colors" }, { "-/+rw", "turn on/off reverse wraparound" }, { "-/+s", "turn on/off multiscroll" }, { "-/+sb", "turn on/off scrollbar" }, @@ -1682,6 +1685,9 @@ XSetIOErrorHandler(xioerror); (void) setuid (screen->uid); /* we're done with privileges... */ + (void) setgid (screen->gid); + done_setuid = 1; + for( ; ; ) { if(screen->TekEmu) { TekRun(); Index: menu.c --- xterm-51+/menu.c Fri Sep 19 13:58:52 1997 +++ xterm-52/menu.c Sun Sep 28 20:26:15 1997 @@ -474,8 +474,9 @@ #ifdef ALLOWLOGGING static void do_logging (gw, closure, data) - Widget gw; - XtPointer closure, data; + Widget gw GCC_UNUSED; + XtPointer closure GCC_UNUSED; + XtPointer data GCC_UNUSED; { register TScreen *screen = &term->screen; @@ -1059,7 +1060,7 @@ #ifdef ALLOWLOGGING void HandleLogging(w, event, params, param_count) Widget w; - XEvent *event; + XEvent *event GCC_UNUSED; String *params; Cardinal *param_count; { Index: misc.c --- xterm-51+/misc.c Fri Sep 19 13:58:52 1997 +++ xterm-52/misc.c Sat Sep 27 12:37:34 1997 @@ -533,13 +533,22 @@ int mode; { int fd; - int waited; int pid; #ifndef HAS_WAITPID + int waited; int (*chldfunc)(); chldfunc = signal(SIGCHLD, SIG_DFL); #endif + + if (done_setuid) { + fd = open(pathname, O_WRONLY|O_CREAT|O_APPEND, mode); + if (fd >= 0) { + close(fd); + } + return; + } + pid = fork(); switch (pid) { @@ -585,10 +594,10 @@ StartLog(screen) register TScreen *screen; { - register char *cp; - register int i; static char *log_default; #ifdef ALLOWLOGFILEEXEC + register char *cp; + register int i; void logpipe(); #ifdef SYSV /* SYSV has another pointer which should be part of the @@ -603,10 +612,14 @@ if(screen->logfile == NULL || *screen->logfile == 0) { if(screen->logfile) free(screen->logfile); - if(log_default == NULL) - log_default = log_def_name; + if(log_default == NULL) { + log_default = malloc(strlen(log_def_name) + 1); + if (log_default == 0) + return; + strcpy(log_default, log_def_name); mktemp(log_default); - if((screen->logfile = malloc((unsigned)strlen(log_default) + 1)) == NULL) + } + if((screen->logfile = malloc(strlen(log_default) + 1)) == NULL) return; strcpy(screen->logfile, log_default); } Index: os2main.c --- xterm-51+/os2main.c Fri Sep 19 13:58:52 1997 +++ xterm-52/os2main.c Sun Sep 28 21:22:28 1997 @@ -340,10 +340,10 @@ {"-nb", "*nMarginBell", XrmoptionSepArg, (caddr_t) NULL}, {"-nul", "*underLine", XrmoptionNoArg, (caddr_t) "off"}, {"+nul", "*underLine", XrmoptionNoArg, (caddr_t) "on"}, +{"-pc", "*boldColors", XrmoptionNoArg, (caddr_t) "on"}, +{"+pc", "*boldColors", XrmoptionNoArg, (caddr_t) "off"}, {"-rw", "*reverseWrap", XrmoptionNoArg, (caddr_t) "on"}, {"+rw", "*reverseWrap", XrmoptionNoArg, (caddr_t) "off"}, -{"-aw", "*autoWrap", XrmoptionNoArg, (caddr_t) "on"}, -{"+aw", "*autoWrap", XrmoptionNoArg, (caddr_t) "off"}, {"-s", "*multiScroll", XrmoptionNoArg, (caddr_t) "on"}, {"+s", "*multiScroll", XrmoptionNoArg, (caddr_t) "off"}, {"-sb", "*scrollBar", XrmoptionNoArg, (caddr_t) "on"}, @@ -435,6 +435,7 @@ { "-nb number", "margin bell in characters from right end" }, { "-/+nul", "turn on/off display of underlining" }, { "-/+aw", "turn on/off auto wraparound" }, +{ "-/+pc", "turn on/off PC-style bold colors" }, { "-/+rw", "turn on/off reverse wraparound" }, { "-/+s", "turn on/off multiscroll" }, { "-/+sb", "turn on/off scrollbar" }, Index: ptyx.h --- xterm-51+/ptyx.h Fri Sep 19 13:58:52 1997 +++ xterm-52/ptyx.h Sun Sep 28 21:28:21 1997 @@ -324,6 +324,10 @@ #define OPT_ISO_COLORS 1 /* true if xterm is configured with ISO colors */ #endif +#ifndef OPT_PC_COLORS +#define OPT_PC_COLORS 1 /* true if xterm is supports PC-style (bold) colors */ +#endif + #ifndef OPT_SUNPC_KBD #define OPT_SUNPC_KBD 1 /* true if xterm supports Sun/PC keyboard map */ #endif @@ -371,7 +375,7 @@ #define COLOR_BD 16 #define COLOR_UL 17 #ifndef DFT_COLORMODE -#define DFT_COLORMODE FALSE /* default colorMode resource */ +#define DFT_COLORMODE TRUE /* default colorMode resource */ #endif #else #define if_OPT_ISO_COLORS(screen, code) /* nothing */ @@ -497,9 +501,11 @@ Pixel mousecolorback; /* Mouse color background */ #if OPT_ISO_COLORS Pixel Acolors[MAXCOLORS]; /* ANSI color emulation */ + Boolean boldColors; /* can we make bold colors? */ Boolean colorMode; /* are we using color mode? */ Boolean colorULMode; /* use color for underline? */ Boolean colorBDMode; /* use color for bold? */ + Boolean colorAttrMode; /* prefer colorUL/BD to SGR */ #endif #if OPT_DEC_CHRSET Char chrset; /* character-set index & code */ Index: screen.c --- xterm-51+/screen.c Fri Sep 19 13:58:52 1997 +++ xterm-52/screen.c Sun Sep 28 20:22:51 1997 @@ -203,7 +203,7 @@ } void -ScreenWrite (screen, str, flags, cur_fg, cur_bg, length) +ScreenWrite (screen, str, flags, cur_fg_bg, length) /* * Writes str into buf at screen's current row and column. Characters are set * to match flags. @@ -211,7 +211,7 @@ TScreen *screen; Char *str; register unsigned flags; -register unsigned cur_fg, cur_bg; +register unsigned cur_fg_bg; register int length; /* length of string */ { #if OPT_ISO_COLORS @@ -254,7 +254,7 @@ memset( attrs, flags, length); if_OPT_ISO_COLORS(screen,{ - memset( fb, makeColorPair(cur_fg, cur_bg), length); + memset( fb, cur_fg_bg, length); }) if_OPT_DEC_CHRSET({ memset( cb, curXtermChrSet(screen->cur_row), length); @@ -481,7 +481,7 @@ int hi_col = maxcol; int lastind; int flags; - int fg = 0, bg = 0; + int fg_bg = 0, fg = 0, bg = 0; int x; GC gc; Boolean hilite; @@ -590,10 +590,11 @@ flags = attrs[col]; if_OPT_ISO_COLORS(screen,{ fb = SCRN_BUF_COLOR(screen, lastind + topline); - fg = extract_fg(fb[col], flags); - bg = extract_bg(fb[col]); + fg_bg = fb[col]; + fg = extract_fg(fg_bg, flags); + bg = extract_bg(fg_bg); }) - gc = updatedXtermGC(screen, flags, fg, bg, hilite); + gc = updatedXtermGC(screen, flags, fg_bg, hilite); gc_changes |= (flags & (FG_COLOR|BG_COLOR)); x = CurCursorX(screen, row, col); @@ -624,13 +625,14 @@ flags = attrs[col]; if_OPT_ISO_COLORS(screen,{ - fg = extract_fg(fb[col], flags); - bg = extract_bg(fb[col]); + fg_bg = fb[col]; + fg = extract_fg(fg_bg, flags); + bg = extract_bg(fg_bg); }) if_OPT_DEC_CHRSET({ cs = cb[col]; }) - gc = updatedXtermGC(screen, flags, fg, bg, hilite); + gc = updatedXtermGC(screen, flags, fg_bg, hilite); gc_changes |= (flags & (FG_COLOR|BG_COLOR)); } Index: util.c --- xterm-51+/util.c Fri Sep 19 13:58:52 1997 +++ xterm-52/util.c Sun Sep 28 20:45:46 1997 @@ -1361,15 +1361,14 @@ * current screen foreground and background colors. */ GC -updatedXtermGC(screen, flags, fg, bg, hilite) +updatedXtermGC(screen, flags, fg_bg, hilite) register TScreen *screen; int flags; - int fg; - int bg; + int fg_bg; Bool hilite; { - Pixel fg_pix = getXtermForeground(flags,fg); - Pixel bg_pix = getXtermBackground(flags,bg); + Pixel fg_pix = getXtermForeground(flags,extract_fg(fg_bg,flags)); + Pixel bg_pix = getXtermBackground(flags,extract_bg(fg_bg)); GC gc; if ( (!hilite && (flags & INVERSE) != 0) @@ -1433,8 +1432,7 @@ #if OPT_ISO_COLORS /* * Extract the foreground-color index from a one-byte color pair. If we've got - * BOLD or UNDERLINE color-mode active, those will be used unless we've got - * an SGR foreground color active. + * BOLD or UNDERLINE color-mode active, those will be used. */ int extract_fg (color, flags) @@ -1442,8 +1440,9 @@ unsigned flags; { int fg = (int) ((color >> 4) & 0xf); - if (fg == extract_bg(color)) - { + + if (term->screen.colorAttrMode + || (fg == extract_bg(color))) { if (term->screen.colorULMode && (flags & UNDERLINE)) fg = COLOR_UL; if (term->screen.colorBDMode && (flags & BOLD)) @@ -1480,6 +1479,7 @@ unsigned xtermColorPair () { + /* FIXME? */ return makeColorPair(term->sgr_foreground, term->cur_background); } Index: xterm.h --- xterm-51+/xterm.h Fri Sep 19 13:58:52 1997 +++ xterm-52/xterm.h Sun Sep 28 20:22:24 1997 @@ -172,7 +172,7 @@ extern int ScreenResize PROTO((TScreen *screen, int width, int height, unsigned *flags)); extern int ScrnGetAttributes PROTO((TScreen *screen, int row, int col, Char *str, int length)); extern void ClearBufRows PROTO((TScreen *screen, int first, int last)); -extern void ScreenWrite PROTO((TScreen *screen, Char *str, unsigned flags, unsigned cur_fg, unsigned cur_bg, int length)); +extern void ScreenWrite PROTO((TScreen *screen, Char *str, unsigned flags, unsigned cur_fg_bg, int length)); extern void ScrnDeleteChar PROTO((TScreen *screen, int n, int size)); extern void ScrnDeleteLine PROTO((ScrnBuf sb, int n, int last, int size, int where)); extern void ScrnInsertChar PROTO((TScreen *screen, int n, int size)); @@ -202,7 +202,7 @@ extern void TabZonk PROTO((Tabs tabs)); /* util.c */ -extern GC updatedXtermGC PROTO((TScreen *screen, int flags, int fg, int bg, Bool hilite)); +extern GC updatedXtermGC PROTO((TScreen *screen, int flags, int fg_bg, Bool hilite)); extern int AddToRefresh PROTO((TScreen *screen)); extern int HandleExposure PROTO((TScreen *screen, XEvent *event)); extern void ChangeColors PROTO((XtermWidget tw, ScrnColors *pNew)); Index: xterm.man --- xterm-51+/xterm.man Fri Sep 19 13:58:52 1997 +++ xterm-52/xterm.man Sun Sep 28 21:24:48 1997 @@ -311,6 +311,13 @@ .B "\+nul" This option disables the display of underlining. .TP 8 +.B \-pc +This option enables the PC-style use of bold colors (see boldColors +resource). +.TP 8 +.B \+pc +This option disables the PC-style use of bold colors. +.TP 8 .B \-rw This option indicates that reverse-wraparound should be allowed. This allows the cursor to back up from the leftmost column of one line to the rightmost @@ -655,6 +662,12 @@ the first bell has been completed; this feature is most useful with the visible bell. .TP 8 +.B "boldColors (\fPclass\fB ColorMode)" +Specifies whether to combine bold attribute with colors like the IBM PC, +i.e., map colors 0 through 7 to colors 8 through 15. +These normally are the brighter versions of the first 8 colors, hence bold. +The default is ``true.'' +.TP 8 .B "boldFont (\fPclass\fB BoldFont)" Specifies the name of the bold font to use instead of overstriking. .TP 8 @@ -686,9 +699,16 @@ should be worked around. See the \fB\-cu\fP option for details. The default is ``false.'' .TP 8 +.B "colorAttrMode (\fPclass\fB ColorMode)" +Specifies whether ``colorBD'' and ``colorUL'' should override ANSI colors. +If not, these are displayed only when no ANSI colors +have been set for the corresponding position. +The default is ``false.'' +.TP 8 .B "colorMode (\fPclass\fB ColorMode)" Specifies whether or not recognition of ANSI (ISO 6429) color change escape sequences should be enabled. +The default is ``true.'' .TP 8 .B "colorBDMode (\fPclass\fB ColorMode)" Specifies whether characters with the bold attribute should be displayed in Index: xtermcfg.hin --- xterm-51+/xtermcfg.hin Fri Sep 19 13:58:52 1997 +++ xterm-52/xtermcfg.hin Sun Sep 28 18:42:26 1997 @@ -44,6 +44,7 @@ #undef OPT_I18N_SUPPORT /* CF_ARG_DISABLE(i18n) */ #undef OPT_INPUT_METHOD /* CF_ARG_DISABLE(input-method) */ #undef OPT_ISO_COLORS /* CF_ARG_DISABLE(ansi-color) */ +#undef OPT_PC_COLORS /* CF_ARG_DISABLE(pc-color) */ #undef OPT_TRACE /* CF_ARG_ENABLE(trace) */ #undef OPT_VT52_MODE /* CF_ARG_DISABLE(vt52) */ #undef OPT_XMC_GLITCH /* CF_ARG_ENABLE(xmc-glitch) */