Attachment 689 Details for Bug 1137 – diff between xterm 195 and 196

[patch] diff between xterm 195 and 196

xterm_195-196.diff (text/plain), 32.71 KB, created by Alexandru Fomin on 2004-08-20 01:28:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexandru Fomin

Created: 2004-08-20 01:28:40 UTC

Size: 32.71 KB

patch

obsolete

>diff -Nur xterm-195/MANIFEST xterm-196/MANIFEST
>--- xterm-195/MANIFEST	2004-08-09 01:37:07.000000000 +0300
>+++ xterm-196/MANIFEST	2004-08-15 22:29:06.000000000 +0300
>@@ -1,4 +1,4 @@
>-MANIFEST for xterm, version xterm-195
>+MANIFEST for xterm, version xterm-196
> --------------------------------------------------------------------------------
> MANIFEST                        this file
> 256colres.h                     resource-definitions for 256-color mode
>diff -Nur xterm-195/configure xterm-196/configure
>--- xterm-195/configure	2004-07-06 02:33:30.000000000 +0300
>+++ xterm-196/configure	2004-08-15 23:35:57.000000000 +0300
>@@ -5082,15 +5082,66 @@
> 
> # Check for openpty() in -lutil if the UNIX98-style pty functions are not
> # available. E.g. for GNU libc 2.0.
>-for ac_func in grantpt
>+case $host_os in #(vi
>+netbsd*)	# 2004/8/15 - revisit this if/when grantpt is known to work.
>+	echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
>+echo "configure:5089: checking for openpty in -lutil" >&5
>+ac_lib_var=`echo util'_'openpty | 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="-lutil  $LIBS"
>+cat > conftest.$ac_ext <<EOF
>+#line 5097 "configure"
>+#include "confdefs.h"
>+/* Override any gcc2 internal prototype to avoid an error.  */
>+/* We use char because int might match the return type of a gcc2
>+    builtin and then its argument prototype would still apply.  */
>+char openpty();
>+
>+int main() {
>+openpty()
>+; return 0; }
>+EOF
>+if { (eval echo configure:5108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>+  rm -rf conftest*
>+  eval "ac_cv_lib_$ac_lib_var=yes"
>+else
>+  echo "configure: failed program was:" >&5
>+  cat conftest.$ac_ext >&5
>+  rm -rf conftest*
>+  eval "ac_cv_lib_$ac_lib_var=no"
>+fi
>+rm -f conftest*
>+LIBS="$ac_save_LIBS"
>+
>+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 util | sed -e 's/[^a-zA-Z0-9_]/_/g' \
>+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
>+  cat >> confdefs.h <<EOF
>+#define $ac_tr_lib 1
>+EOF
>+
>+  LIBS="-lutil $LIBS"
>+
>+else
>+  echo "$ac_t""no" 1>&6
>+fi
>+
>+	;;
>+*)
>+	for ac_func in grantpt
> do
> echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
>-echo "configure:5089: checking for $ac_func" >&5
>+echo "configure:5140: 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 <<EOF
>-#line 5094 "configure"
>+#line 5145 "configure"
> #include "confdefs.h"
> /* System header to define __stub macros and hopefully few prototypes,
>     which can conflict with char $ac_func(); below.  */
>@@ -5113,7 +5164,7 @@
> 
> ; return 0; }
> EOF
>-if { (eval echo configure:5117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>+if { (eval echo configure:5168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>   rm -rf conftest*
>   eval "ac_cv_func_$ac_func=yes"
> else
>@@ -5135,7 +5186,7 @@
> else
>   echo "$ac_t""no" 1>&6
> echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
>-echo "configure:5139: checking for openpty in -lutil" >&5
>+echo "configure:5190: checking for openpty in -lutil" >&5
> ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
> if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
>@@ -5143,7 +5194,7 @@
>   ac_save_LIBS="$LIBS"
> LIBS="-lutil  $LIBS"
> cat > conftest.$ac_ext <<EOF
>-#line 5147 "configure"
>+#line 5198 "configure"
> #include "confdefs.h"
> /* Override any gcc2 internal prototype to avoid an error.  */
> /* We use char because int might match the return type of a gcc2
>@@ -5154,7 +5205,7 @@
> openpty()
> ; return 0; }
> EOF
>-if { (eval echo configure:5158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>+if { (eval echo configure:5209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>   rm -rf conftest*
>   eval "ac_cv_lib_$ac_lib_var=yes"
> else
>@@ -5184,11 +5235,13 @@
> fi
> done
> 
>+	;;
>+esac
> 
> # Extract the first word of "xterm", so it can be a program name with args.
> set dummy xterm; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:5192: checking for $ac_word" >&5
>+echo "configure:5245: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_path_XTERM_PATH'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -5223,13 +5276,13 @@
> 
> 
> echo $ac_n "checking for XKB Bell extension""... $ac_c" 1>&6
>-echo "configure:5227: checking for XKB Bell extension" >&5
>+echo "configure:5280: checking for XKB Bell extension" >&5
> if eval "test \"`echo '$''{'cf_cv_xkb_bell_ext'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>   
> cat > conftest.$ac_ext <<EOF
>-#line 5233 "configure"
>+#line 5286 "configure"
> #include "confdefs.h"
> 
> #include <X11/XKBlib.h>		/* has the prototype */
>@@ -5245,7 +5298,7 @@
> 
> ; return 0; }
> EOF
>-if { (eval echo configure:5249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>+if { (eval echo configure:5302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>   rm -rf conftest*
>   cf_cv_xkb_bell_ext=yes
> else
>@@ -5268,12 +5321,12 @@
> for ac_func in Xutf8LookupString
> do
> echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
>-echo "configure:5272: checking for $ac_func" >&5
>+echo "configure:5325: 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 <<EOF
>-#line 5277 "configure"
>+#line 5330 "configure"
> #include "confdefs.h"
> /* System header to define __stub macros and hopefully few prototypes,
>     which can conflict with char $ac_func(); below.  */
>@@ -5296,7 +5349,7 @@
> 
> ; return 0; }
> EOF
>-if { (eval echo configure:5300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>+if { (eval echo configure:5353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>   rm -rf conftest*
>   eval "ac_cv_func_$ac_func=yes"
> else
>@@ -5327,7 +5380,7 @@
> 
> 
> echo $ac_n "checking if we should use imake to help""... $ac_c" 1>&6
>-echo "configure:5331: checking if we should use imake to help" >&5
>+echo "configure:5384: 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
>@@ -5352,7 +5405,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:5356: checking for $ac_word" >&5
>+echo "configure:5409: 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
>@@ -5692,7 +5745,7 @@
> 
> 
> echo $ac_n "checking for default terminal-id""... $ac_c" 1>&6
>-echo "configure:5696: checking for default terminal-id" >&5
>+echo "configure:5749: 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
>@@ -5713,7 +5766,7 @@
> 
> 
> echo $ac_n "checking for default terminal-type""... $ac_c" 1>&6
>-echo "configure:5717: checking for default terminal-type" >&5
>+echo "configure:5770: checking for default terminal-type" >&5
> 
> # Check whether --with-terminal-type or --without-terminal-type was given.
> if test "${with_terminal_type+set}" = set; then
>@@ -5730,7 +5783,7 @@
> 
> 
> echo $ac_n "checking for private terminfo-directory""... $ac_c" 1>&6
>-echo "configure:5734: checking for private terminfo-directory" >&5
>+echo "configure:5787: checking for private terminfo-directory" >&5
> 
> # Check whether --with-own-terminfo or --without-own-terminfo was given.
> if test "${with_own_terminfo+set}" = set; then
>@@ -5771,7 +5824,7 @@
> 
> 
> echo $ac_n "checking if you want active-icons""... $ac_c" 1>&6
>-echo "configure:5775: checking if you want active-icons" >&5
>+echo "configure:5828: 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
>@@ -5797,7 +5850,7 @@
> fi
> 
> echo $ac_n "checking if you want ANSI color""... $ac_c" 1>&6
>-echo "configure:5801: checking if you want ANSI color" >&5
>+echo "configure:5854: 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
>@@ -5823,7 +5876,7 @@
> if test "$enable_ansi_color" = yes ; then
> 
> 	echo $ac_n "checking if you want 16 colors like aixterm""... $ac_c" 1>&6
>-echo "configure:5827: checking if you want 16 colors like aixterm" >&5
>+echo "configure:5880: 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
>@@ -5847,7 +5900,7 @@
> 
> 
> 	echo $ac_n "checking if you want 256 colors""... $ac_c" 1>&6
>-echo "configure:5851: checking if you want 256 colors" >&5
>+echo "configure:5904: checking if you want 256 colors" >&5
> 	
> # Check whether --enable-256-color or --disable-256-color was given.
> if test "${enable_256_color+set}" = set; then
>@@ -5874,7 +5927,7 @@
> 
> 	else
> 	echo $ac_n "checking if you want 88 colors""... $ac_c" 1>&6
>-echo "configure:5878: checking if you want 88 colors" >&5
>+echo "configure:5931: checking if you want 88 colors" >&5
> 	
> # Check whether --enable-88-color or --disable-88-color was given.
> if test "${enable_88_color+set}" = set; then
>@@ -5905,7 +5958,7 @@
> fi
> 
> echo $ac_n "checking if you want blinking cursor""... $ac_c" 1>&6
>-echo "configure:5909: checking if you want blinking cursor" >&5
>+echo "configure:5962: checking if you want blinking cursor" >&5
> 
> # Check whether --enable-blink-cursor or --disable-blink-cursor was given.
> if test "${enable_blink_cursor+set}" = set; then
>@@ -5929,7 +5982,7 @@
> 
> 
> echo $ac_n "checking if you want to ignore Linux's broken palette-strings""... $ac_c" 1>&6
>-echo "configure:5933: checking if you want to ignore Linux's broken palette-strings" >&5
>+echo "configure:5986: checking if you want to ignore Linux's broken palette-strings" >&5
> 
> case $host_os in #(vi
> linux*)
>@@ -5968,7 +6021,7 @@
> fi
> 
> echo $ac_n "checking if you want to allow broken string-terminators""... $ac_c" 1>&6
>-echo "configure:5972: checking if you want to allow broken string-terminators" >&5
>+echo "configure:6025: checking if you want to allow broken string-terminators" >&5
> 
> # Check whether --enable-broken-st or --disable-broken-st was given.
> if test "${enable_broken_st+set}" = set; then
>@@ -5992,7 +6045,7 @@
> 
> 
> echo $ac_n "checking if you want printable 128-159""... $ac_c" 1>&6
>-echo "configure:5996: checking if you want printable 128-159" >&5
>+echo "configure:6049: checking if you want printable 128-159" >&5
> 
> # Check whether --enable-c1-print or --disable-c1-print was given.
> if test "${enable_c1_print+set}" = set; then
>@@ -6018,7 +6071,7 @@
> if test "$enable_ansi_color" = yes ; then
> 
> 	echo $ac_n "checking if you want bold colors mapped like IBM PC""... $ac_c" 1>&6
>-echo "configure:6022: checking if you want bold colors mapped like IBM PC" >&5
>+echo "configure:6075: 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
>@@ -6042,7 +6095,7 @@
> 
> 
> 	echo $ac_n "checking if you want separate color-classes""... $ac_c" 1>&6
>-echo "configure:6046: checking if you want separate color-classes" >&5
>+echo "configure:6099: checking if you want separate color-classes" >&5
> 	
> # Check whether --enable-color-class or --disable-color-class was given.
> if test "${enable_color_class+set}" = set; then
>@@ -6066,7 +6119,7 @@
> 
> 
> 	echo $ac_n "checking if you want color-mode enabled by default""... $ac_c" 1>&6
>-echo "configure:6070: checking if you want color-mode enabled by default" >&5
>+echo "configure:6123: 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
>@@ -6092,7 +6145,7 @@
> fi
> 
> echo $ac_n "checking if you want support for color highlighting""... $ac_c" 1>&6
>-echo "configure:6096: checking if you want support for color highlighting" >&5
>+echo "configure:6149: checking if you want support for color highlighting" >&5
> 
> # Check whether --enable-highlighting or --disable-highlighting was given.
> if test "${enable_highlighting+set}" = set; then
>@@ -6116,7 +6169,7 @@
> 
> 
> echo $ac_n "checking if you want support for doublesize characters""... $ac_c" 1>&6
>-echo "configure:6120: checking if you want support for doublesize characters" >&5
>+echo "configure:6173: checking if you want support for doublesize characters" >&5
> 
> # Check whether --enable-doublechars or --disable-doublechars was given.
> if test "${enable_doublechars+set}" = set; then
>@@ -6140,7 +6193,7 @@
> 
> 
> echo $ac_n "checking if you want fallback-support for box characters""... $ac_c" 1>&6
>-echo "configure:6144: checking if you want fallback-support for box characters" >&5
>+echo "configure:6197: checking if you want fallback-support for box characters" >&5
> 
> # Check whether --enable-boxchars or --disable-boxchars was given.
> if test "${enable_boxchars+set}" = set; then
>@@ -6164,7 +6217,7 @@
> 
> 
> echo $ac_n "checking if you want to use FreeType library""... $ac_c" 1>&6
>-echo "configure:6168: checking if you want to use FreeType library" >&5
>+echo "configure:6221: checking if you want to use FreeType library" >&5
> 
> # Check whether --enable-freetype or --disable-freetype was given.
> if test "${enable_freetype+set}" = set; then
>@@ -6188,7 +6241,7 @@
> # Extract the first word of "xft-config", so it can be a program name with args.
> set dummy xft-config; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:6192: checking for $ac_word" >&5
>+echo "configure:6245: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_path_FREETYPE_CONFIG'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -6226,7 +6279,7 @@
> 	# Extract the first word of "freetype-config", so it can be a program name with args.
> set dummy freetype-config; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
>-echo "configure:6230: checking for $ac_word" >&5
>+echo "configure:6283: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_path_FREETYPE_CONFIG'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -6274,7 +6327,7 @@
> else
>   
> echo $ac_n "checking for X FreeType headers""... $ac_c" 1>&6
>-echo "configure:6278: checking for X FreeType headers" >&5
>+echo "configure:6331: checking for X FreeType headers" >&5
> if eval "test \"`echo '$''{'cf_cv_x_freetype_incs'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -6298,7 +6351,7 @@
> else
>   
> echo $ac_n "checking for X FreeType libraries""... $ac_c" 1>&6
>-echo "configure:6302: checking for X FreeType libraries" >&5
>+echo "configure:6355: checking for X FreeType libraries" >&5
> if eval "test \"`echo '$''{'cf_cv_x_freetype_libs'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>@@ -6313,7 +6366,7 @@
> CPPFLAGS="$cf_cv_x_freetype_incs $CPPFLAGS"
> 
> cat > conftest.$ac_ext <<EOF
>-#line 6317 "configure"
>+#line 6370 "configure"
> #include "confdefs.h"
> 
> #include <X11/Xlib.h>
>@@ -6325,7 +6378,7 @@
> 	
> ; return 0; }
> EOF
>-if { (eval echo configure:6329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>+if { (eval echo configure:6382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>   :
> else
>   echo "configure: failed program was:" >&5
>@@ -6438,7 +6491,7 @@
> fi
> 
> echo $ac_n "checking if you want support for HP-style function keys""... $ac_c" 1>&6
>-echo "configure:6442: checking if you want support for HP-style function keys" >&5
>+echo "configure:6495: checking if you want support for HP-style function keys" >&5
> 
> # Check whether --enable-hp-fkeys or --disable-hp-fkeys was given.
> if test "${enable_hp_fkeys+set}" = set; then
>@@ -6464,7 +6517,7 @@
> fi
> 
> echo $ac_n "checking if you want support for SCO-style function keys""... $ac_c" 1>&6
>-echo "configure:6468: checking if you want support for SCO-style function keys" >&5
>+echo "configure:6521: checking if you want support for SCO-style function keys" >&5
> 
> # Check whether --enable-sco-fkeys or --disable-sco-fkeys was given.
> if test "${enable_sco_fkeys+set}" = set; then
>@@ -6490,7 +6543,7 @@
> fi
> 
> echo $ac_n "checking if you want support for internationalization""... $ac_c" 1>&6
>-echo "configure:6494: checking if you want support for internationalization" >&5
>+echo "configure:6547: checking if you want support for internationalization" >&5
> 
> # Check whether --enable-i18n or --disable-i18n was given.
> if test "${enable_i18n+set}" = set; then
>@@ -6516,7 +6569,7 @@
> fi
> 
> echo $ac_n "checking if you want support for initial-erase setup""... $ac_c" 1>&6
>-echo "configure:6520: checking if you want support for initial-erase setup" >&5
>+echo "configure:6573: checking if you want support for initial-erase setup" >&5
> 
> # Check whether --enable-initial-erase or --disable-initial-erase was given.
> if test "${enable_initial_erase+set}" = set; then
>@@ -6542,7 +6595,7 @@
> fi
> 
> echo $ac_n "checking if you want support for input-method""... $ac_c" 1>&6
>-echo "configure:6546: checking if you want support for input-method" >&5
>+echo "configure:6599: 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
>@@ -6562,13 +6615,13 @@
> echo "$ac_t""$enable_ximp" 1>&6
> 
> echo $ac_n "checking if X libraries support input-method""... $ac_c" 1>&6
>-echo "configure:6566: checking if X libraries support input-method" >&5
>+echo "configure:6619: checking if X libraries support input-method" >&5
> if eval "test \"`echo '$''{'cf_cv_input_method'+set}'`\" = set"; then
>   echo $ac_n "(cached) $ac_c" 1>&6
> else
>   
> cat > conftest.$ac_ext <<EOF
>-#line 6572 "configure"
>+#line 6625 "configure"
> #include "confdefs.h"
> 
> #include <X11/IntrinsicP.h>
>@@ -6595,7 +6648,7 @@
> 
> ; return 0; }
> EOF
>-if { (eval echo configure:6599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>+if { (eval echo configure:6652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
>   rm -rf conftest*
>   cf_cv_input_method=yes
> else
>@@ -6618,7 +6671,7 @@
> fi
> 
> echo $ac_n "checking if you want support for load-vt-fonts""... $ac_c" 1>&6
>-echo "configure:6622: checking if you want support for load-vt-fonts" >&5
>+echo "configure:6675: checking if you want support for load-vt-fonts" >&5
> 
> # Check whether --enable-load-vt-fonts or --disable-load-vt-fonts was given.
> if test "${enable_load_vt_fonts+set}" = set; then
>@@ -6644,7 +6697,7 @@
> fi
> 
> echo $ac_n "checking if you want support for logging""... $ac_c" 1>&6
>-echo "configure:6648: checking if you want support for logging" >&5
>+echo "configure:6701: checking if you want support for logging" >&5
> 
> # Check whether --enable-logging or --disable-logging was given.
> if test "${enable_logging+set}" = set; then
>@@ -6668,7 +6721,7 @@
> EOF
> 
> 	echo $ac_n "checking if you want to allow logging via a pipe""... $ac_c" 1>&6
>-echo "configure:6672: checking if you want to allow logging via a pipe" >&5
>+echo "configure:6725: checking if you want to allow logging via a pipe" >&5
> 	
> # Check whether --enable-logfile-exec or --disable-logfile-exec was given.
> if test "${enable_logfile_exec+set}" = set; then
>@@ -6695,7 +6748,7 @@
> fi
> 
> echo $ac_n "checking if you want support for iconify/maximize translations""... $ac_c" 1>&6
>-echo "configure:6699: checking if you want support for iconify/maximize translations" >&5
>+echo "configure:6752: checking if you want support for iconify/maximize translations" >&5
> 
> # Check whether --enable-maximize or --disable-maximize was given.
> if test "${enable_maximize+set}" = set; then
>@@ -6719,7 +6772,7 @@
> 
> 
> echo $ac_n "checking if you want NumLock to override keyboard tables""... $ac_c" 1>&6
>-echo "configure:6723: checking if you want NumLock to override keyboard tables" >&5
>+echo "configure:6776: checking if you want NumLock to override keyboard tables" >&5
> 
> # Check whether --enable-num-lock or --disable-num-lock was given.
> if test "${enable_num_lock+set}" = set; then
>@@ -6743,7 +6796,7 @@
> 
> 
> echo $ac_n "checking if you want support for pty-handshaking""... $ac_c" 1>&6
>-echo "configure:6747: checking if you want support for pty-handshaking" >&5
>+echo "configure:6800: checking if you want support for pty-handshaking" >&5
> 
> 
> # Check whether --enable-pty-handshake or --disable-pty-handshake was given.
>@@ -6775,7 +6828,7 @@
> fi
> 
> echo $ac_n "checking if you want support for right-scrollbar""... $ac_c" 1>&6
>-echo "configure:6779: checking if you want support for right-scrollbar" >&5
>+echo "configure:6832: checking if you want support for right-scrollbar" >&5
> 
> # Check whether --enable-rightbar or --disable-rightbar was given.
> if test "${enable_rightbar+set}" = set; then
>@@ -6801,7 +6854,7 @@
> fi
> 
> echo $ac_n "checking if you want check for redundant name-change""... $ac_c" 1>&6
>-echo "configure:6805: checking if you want check for redundant name-change" >&5
>+echo "configure:6858: checking if you want check for redundant name-change" >&5
> 
> # Check whether --enable-samename or --disable-samename was given.
> if test "${enable_samename+set}" = set; then
>@@ -6825,7 +6878,7 @@
> 
> 
> echo $ac_n "checking if you want support for session management""... $ac_c" 1>&6
>-echo "configure:6829: checking if you want support for session management" >&5
>+echo "configure:6882: checking if you want support for session management" >&5
> 
> # Check whether --enable-session-mgt or --disable-session-mgt was given.
> if test "${enable_session_mgt+set}" = set; then
>@@ -6849,7 +6902,7 @@
> 
> 
> echo $ac_n "checking if you want to use termcap-query/report""... $ac_c" 1>&6
>-echo "configure:6853: checking if you want to use termcap-query/report" >&5
>+echo "configure:6906: checking if you want to use termcap-query/report" >&5
> 
> # Check whether --enable-tcap-query or --disable-tcap-query was given.
> if test "${enable_tcap_query+set}" = set; then
>@@ -6873,7 +6926,7 @@
> 
> 
> echo $ac_n "checking if you want support for tek4014""... $ac_c" 1>&6
>-echo "configure:6877: checking if you want support for tek4014" >&5
>+echo "configure:6930: checking if you want support for tek4014" >&5
> 
> # Check whether --enable-tek4014 or --disable-tek4014 was given.
> if test "${enable_tek4014+set}" = set; then
>@@ -6903,7 +6956,7 @@
> fi
> 
> echo $ac_n "checking if you want pulldown menus with a toolbar""... $ac_c" 1>&6
>-echo "configure:6907: checking if you want pulldown menus with a toolbar" >&5
>+echo "configure:6960: checking if you want pulldown menus with a toolbar" >&5
> 
> # Check whether --enable-toolbar or --disable-toolbar was given.
> if test "${enable_toolbar+set}" = set; then
>@@ -6929,7 +6982,7 @@
> fi
> 
> echo $ac_n "checking if you want VT52 emulation""... $ac_c" 1>&6
>-echo "configure:6933: checking if you want VT52 emulation" >&5
>+echo "configure:6986: checking if you want VT52 emulation" >&5
> 
> # Check whether --enable-vt52 or --disable-vt52 was given.
> if test "${enable_vt52+set}" = set; then
>@@ -6953,7 +7006,7 @@
> 
> 
> echo $ac_n "checking if you want to use luit""... $ac_c" 1>&6
>-echo "configure:6957: checking if you want to use luit" >&5
>+echo "configure:7010: checking if you want to use luit" >&5
> 
> # Check whether --enable-luit or --disable-luit was given.
> if test "${enable_luit+set}" = set; then
>@@ -6979,7 +7032,7 @@
> fi
> 
> echo $ac_n "checking if you want wide-character support""... $ac_c" 1>&6
>-echo "configure:6983: checking if you want wide-character support" >&5
>+echo "configure:7036: checking if you want wide-character support" >&5
> 
> # Check whether --enable-wide-chars or --disable-wide-chars was given.
> if test "${enable_wide_chars+set}" = set; then
>@@ -7008,7 +7061,7 @@
> fi
> 
> echo $ac_n "checking if you want dynamic-abbreviation support""... $ac_c" 1>&6
>-echo "configure:7012: checking if you want dynamic-abbreviation support" >&5
>+echo "configure:7065: checking if you want dynamic-abbreviation support" >&5
> 
> # Check whether --enable-dec-locator or --disable-dec-locator was given.
> if test "${enable_dec_locator+set}" = set; then
>@@ -7034,7 +7087,7 @@
> fi
> 
> echo $ac_n "checking if you want DECterm Locator support""... $ac_c" 1>&6
>-echo "configure:7038: checking if you want DECterm Locator support" >&5
>+echo "configure:7091: checking if you want DECterm Locator support" >&5
> 
> # Check whether --enable-dec-locator or --disable-dec-locator was given.
> if test "${enable_dec_locator+set}" = set; then
>@@ -7060,7 +7113,7 @@
> fi
> 
> echo $ac_n "checking if you want -ziconbeep option""... $ac_c" 1>&6
>-echo "configure:7064: checking if you want -ziconbeep option" >&5
>+echo "configure:7117: checking if you want -ziconbeep option" >&5
> 
> # Check whether --enable-ziconbeep or --disable-ziconbeep was given.
> if test "${enable_ziconbeep+set}" = set; then
>@@ -7087,7 +7140,7 @@
> 
> 
> echo $ac_n "checking if you want debugging traces""... $ac_c" 1>&6
>-echo "configure:7091: checking if you want debugging traces" >&5
>+echo "configure:7144: checking if you want debugging traces" >&5
> 
> # Check whether --enable-trace or --disable-trace was given.
> if test "${enable_trace+set}" = set; then
>@@ -7116,7 +7169,7 @@
> 
> 
> echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
>-echo "configure:7120: checking if you want to see long compiling messages" >&5
>+echo "configure:7173: 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
>@@ -7160,7 +7213,7 @@
> 
> 
> echo $ac_n "checking if you want magic cookie emulation""... $ac_c" 1>&6
>-echo "configure:7164: checking if you want magic cookie emulation" >&5
>+echo "configure:7217: 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
>@@ -7189,7 +7242,7 @@
> 
> if test -n "$GCC" ; then
> echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
>-echo "configure:7193: checking if you want to turn on gcc warnings" >&5
>+echo "configure:7246: 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
>@@ -7229,9 +7282,9 @@
> if test "$GCC" = yes
> then
> 	echo "checking for $CC __attribute__ directives" 1>&6
>-echo "configure:7233: checking for $CC __attribute__ directives" >&5
>+echo "configure:7286: checking for $CC __attribute__ directives" >&5
> cat > conftest.$ac_ext <<EOF
>-#line 7235 "configure"
>+#line 7288 "configure"
> #include "confdefs.h"
> #include "conftest.h"
> #include "conftest.i"
>@@ -7269,7 +7322,7 @@
> EOF
> 			;;
> 		esac
>-		if { (eval echo configure:7273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>+		if { (eval echo configure:7326: \"$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
> 		fi
>@@ -7285,7 +7338,7 @@
> GCC_VERSION=none
> if test "$GCC" = yes ; then
> 	echo $ac_n "checking version of $CC""... $ac_c" 1>&6
>-echo "configure:7289: checking version of $CC" >&5
>+echo "configure:7342: checking version of $CC" >&5
> 	GCC_VERSION="`${CC} --version|sed -e '2,$d' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
> 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
> 	echo "$ac_t""$GCC_VERSION" 1>&6
>@@ -7296,11 +7349,11 @@
> if test "$GCC" = yes
> then
> 	cat > conftest.$ac_ext <<EOF
>-#line 7300 "configure"
>+#line 7353 "configure"
> int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
> EOF
> 	echo "checking for $CC warning options" 1>&6
>-echo "configure:7304: checking for $CC warning options" >&5
>+echo "configure:7357: checking for $CC warning options" >&5
> 	cf_save_CFLAGS="$CFLAGS"
> 	EXTRA_CFLAGS="-W -Wall"
> 	cf_warn_CONST=""
>@@ -7319,7 +7372,7 @@
> 		Wundef $cf_warn_CONST
> 	do
> 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
>-		if { (eval echo configure:7323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
>+		if { (eval echo configure:7376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> 			test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
> 			case $cf_opt in #(vi
> 			Wcast-qual) #(vi
>diff -Nur xterm-195/configure.in xterm-196/configure.in
>--- xterm-195/configure.in	2004-05-26 04:19:55.000000000 +0300
>+++ xterm-196/configure.in	2004-08-16 00:07:59.000000000 +0300
>@@ -1,6 +1,6 @@
>-dnl $XTermId: configure.in,v 1.168 2004/05/26 01:19:55 tom Exp $
>+dnl $XTermId: configure.in,v 1.170 2004/08/15 21:07:59 tom Exp $
> dnl
>-dnl $XFree86: xc/programs/xterm/configure.in,v 3.65 2004/05/26 01:19:55 dickey Exp $
>+dnl $XFree86: xc/programs/xterm/configure.in,v 3.66 2004/08/15 21:07:59 dickey Exp $
> dnl
> dnl ---------------------------------------------------------------------------
> dnl
>@@ -128,7 +128,14 @@
> 
> # Check for openpty() in -lutil if the UNIX98-style pty functions are not
> # available. E.g. for GNU libc 2.0.
>-AC_CHECK_FUNCS(grantpt, [], AC_CHECK_LIB(util,openpty))
>+case $host_os in #(vi
>+netbsd*)	# 2004/8/15 - revisit this if/when grantpt is known to work.
>+	AC_CHECK_LIB(util,openpty)
>+	;;
>+*)
>+	AC_CHECK_FUNCS(grantpt, [], AC_CHECK_LIB(util,openpty))
>+	;;
>+esac
> 
> AC_PATH_PROG(XTERM_PATH,xterm)
> 
>diff -Nur xterm-195/main.c xterm-196/main.c
>--- xterm-195/main.c	2004-07-20 04:14:41.000000000 +0300
>+++ xterm-196/main.c	2004-08-16 00:07:59.000000000 +0300
>@@ -1,4 +1,4 @@
>-/* $XTermId: main.c,v 1.394 2004/07/20 01:14:41 tom Exp $ */
>+/* $XTermId: main.c,v 1.396 2004/08/15 21:07:59 tom Exp $ */
> 
> #if !defined(lint) && 0
> static char *rid = "$Xorg: main.c,v 1.7 2001/02/09 02:06:02 xorgcvs Exp $";
>@@ -91,7 +91,7 @@
> 
> ******************************************************************/
> 
>-/* $XFree86: xc/programs/xterm/main.c,v 3.184 2004/07/20 01:14:41 dickey Exp $ */
>+/* $XFree86: xc/programs/xterm/main.c,v 3.185 2004/08/15 21:07:59 dickey Exp $ */
> 
> /* main.c */
> 
>@@ -4352,7 +4352,7 @@
> #endif
> 		break;
> 	    }
>-
>+	    memset(utptr, 0, sizeof(*utptr));	/* keep searching */
> 	}
> 	(void) endutent();
>     }
>diff -Nur xterm-195/version.h xterm-196/version.h
>--- xterm-195/version.h	2004-08-09 01:36:14.000000000 +0300
>+++ xterm-196/version.h	2004-08-16 00:07:59.000000000 +0300
>@@ -1,5 +1,5 @@
>-/* $XTermId: version.h,v 1.231 2004/08/08 22:36:14 tom Exp $ */
>-/* $XFree86: xc/programs/xterm/version.h,v 3.106 2004/08/08 22:36:14 dickey Exp $ */
>+/* $XTermId: version.h,v 1.233 2004/08/15 21:07:59 tom Exp $ */
>+/* $XFree86: xc/programs/xterm/version.h,v 3.107 2004/08/15 21:07:59 dickey Exp $ */
> 
> /*
>  * These definitions are used to build the string that's printed in response to
>@@ -7,7 +7,7 @@
>  * version of X to which this version of xterm has been built.  The number in
>  * parentheses is my patch number (T.Dickey).
>  */
>-#define XTERM_PATCH   195
>+#define XTERM_PATCH   196
> 
> #ifndef __vendorversion__
> #define __vendorversion__ "XTerm"
>diff -Nur xterm-195/xterm.log.html xterm-196/xterm.log.html
>--- xterm-195/xterm.log.html	2004-08-09 01:36:14.000000000 +0300
>+++ xterm-196/xterm.log.html	2004-08-16 00:07:59.000000000 +0300
>@@ -20,8 +20,8 @@
>  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   *
>  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.            *
>  *****************************************************************************
>-  $XTermId: xterm.log.html,v 1.170 2004/08/08 22:36:14 tom Exp $
>-  $XFree86: xc/programs/xterm/xterm.log.html,v 1.129 2004/08/08 22:36:14 dickey Exp $
>+  $XTermId: xterm.log.html,v 1.173 2004/08/15 21:07:59 tom Exp $
>+  $XFree86: xc/programs/xterm/xterm.log.html,v 1.130 2004/08/15 21:07:59 dickey Exp $
>   -->
> <HTML>
> <HEAD>
>@@ -46,6 +46,7 @@
> is the latest version of this file.
> 
> <UL>
>+<LI><A HREF="#xterm_196">Patch #196 - 2004/8/15 - XFree86 4.4.99.12</A>
> <LI><A HREF="#xterm_195">Patch #195 - 2004/8/8 - XFree86 4.4.99.11</A>
> <LI><A HREF="#xterm_194">Patch #194 - 2004/7/27 - XFree86 4.4.99.11</A>
> <LI><A HREF="#xterm_193">Patch #193 - 2004/7/19 - XFree86 4.4.99.10</A>
>@@ -244,6 +245,18 @@
> <LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
> </UL>
> 
>+<H1><A NAME="xterm_196">Patch #196 - 2004/8/15 - XFree86 4.4.99.12</A></H1>
>+<ul>
>+	<li>add a special case to configure script to ignore NetBSD's
>+	    <code>grantpt()</code> which was recently added (but not part of a
>+	    release), until someone is able to ensure that xterm can use it
>+	    (report by Min Sik Kim).
>+
>+	<li>clear the buffer returned by getutid().  This fixes an infinite
>+	    loop on some platforms introduced in <a href="#xterm_193">patch
>+	    #193</a> by Debian #256468 fix (report by David Ellement).
>+</ul>
>+
> <H1><A NAME="xterm_195">Patch #195 - 2004/8/8 - XFree86 4.4.99.11</A></H1>
> <ul>
> 	<li>correct length used for blinking text, make the last column blink

Actions: View | Splinter Review

Attachments on bug 1137: 689

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.