xterm: Changes to 'upstream-unstable'
MANIFEST | 2
aclocal.m4 | 19 -
charproc.c | 14
configure | 853 +++++++++++++++++++++++------------------------
ctlseqs.ms | 18
package/debian/changelog | 7
package/xterm.spec | 4
version.h | 4
xterm.log.html | 18
xterm.man | 5
10 files changed, 494 insertions(+), 450 deletions(-)
New commits:
commit e0ff34130ae920146d27d074b475079933271b8e
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 9 21:41:15 2012 +0200
Imported Upstream version 278
diff --git a/MANIFEST b/MANIFEST
index 36647ff..30e5fd3 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-277, version xterm-277
+MANIFEST for xterm-278, version xterm-278
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/aclocal.m4 b/aclocal.m4
index ea0d846..c019357 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.319 2012/01/07 13:29:08 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.321 2012/01/12 13:09:35 tom Exp $
dnl
dnl ---------------------------------------------------------------------------
dnl
@@ -543,17 +543,22 @@ AC_DEFUN([CF_ERRNO],
CF_CHECK_ERRNO(errno)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_GRANTPT version: 2 updated: 2011/11/28 20:14:06
+dnl CF_FUNC_GRANTPT version: 3 updated: 2012/01/12 08:07:51
dnl ---------------
dnl Check for grantpt versus openpty, as well as functions that "should" be
dnl available if grantpt is available.
AC_DEFUN([CF_FUNC_GRANTPT],[
-AC_CHECK_FUNCS(\
-grantpt \
-posix_openpt \
-ptsname \
-)
+cf_func_grantpt="grantpt ptsname"
+case $host_os in #(vi
+darwin[[0-9]].*) #(vi
+ ;;
+*)
+ cf_func_grantpt="$cf_func_grantpt posix_openpt"
+ ;;
+esac
+
+AC_CHECK_FUNCS($cf_func_grantpt)
if test "x$ac_cv_func_grantpt" != "xyes" ; then
AC_CHECK_LIB(util, openpty, [cf_have_openpty=yes],[cf_have_openpty=no])
diff --git a/charproc.c b/charproc.c
index e3e3350..ec5f498 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1159 2012/01/07 01:59:02 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1161 2012/01/19 00:22:08 tom Exp $ */
/*
* Copyright 1999-2010,2011 by Thomas E. Dickey
@@ -6787,15 +6787,19 @@ VTInitialize(Widget wrequest,
#endif /* OPT_WIDE_CHARS */
init_Sres(screen.eight_bit_meta_s);
- request->screen.eight_bit_meta =
+ wnew->screen.eight_bit_meta =
extendedBoolean(request->screen.eight_bit_meta_s, tbl8BitMeta, uLast);
- if (request->screen.eight_bit_meta == ebLocale) {
+ if (wnew->screen.eight_bit_meta == ebLocale) {
#if OPT_WIDE_CHARS
if (xtermEnvUTF8()) {
- request->screen.eight_bit_meta = ebFalse;
+ wnew->screen.eight_bit_meta = ebFalse;
+ TRACE(("...eightBitMeta is false due to locale\n"));
} else
#endif /* OPT_WIDE_CHARS */
- request->screen.eight_bit_meta = ebTrue;
+ {
+ wnew->screen.eight_bit_meta = ebTrue;
+ TRACE(("...eightBitMeta is true due to locale\n"));
+ }
}
init_Bres(screen.always_bold_mode);
diff --git a/configure b/configure
index 22aac42..d52bd28 100755
--- a/configure
+++ b/configure
@@ -12092,20 +12092,25 @@ EOF
LIBS="$LIBS $X_EXTRA_LIBS"
-for ac_func in \
-grantpt \
-posix_openpt \
-ptsname \
+cf_func_grantpt="grantpt ptsname"
+case $host_os in #(vi
+darwin[0-9].*) #(vi
+ ;;
+*)
+ cf_func_grantpt="$cf_func_grantpt posix_openpt"
+ ;;
+esac
+for ac_func in $cf_func_grantpt
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12102: checking for $ac_func" >&5
+echo "$as_me:12107: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12108 "configure"
+#line 12113 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -12136,16 +12141,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12139: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12144: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12142: \$? = $ac_status" >&5
+ echo "$as_me:12147: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12145: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12150: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12148: \$? = $ac_status" >&5
+ echo "$as_me:12153: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -12155,7 +12160,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12158: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12163: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -12166,7 +12171,7 @@ fi
done
if test "x$ac_cv_func_grantpt" != "xyes" ; then
- echo "$as_me:12169: checking for openpty in -lutil" >&5
+ echo "$as_me:12174: checking for openpty in -lutil" >&5
echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
if test "${ac_cv_lib_util_openpty+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12174,7 +12179,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lutil $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 12177 "configure"
+#line 12182 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -12193,16 +12198,16 @@ openpty ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12201: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12199: \$? = $ac_status" >&5
+ echo "$as_me:12204: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12202: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12207: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12205: \$? = $ac_status" >&5
+ echo "$as_me:12210: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_util_openpty=yes
else
@@ -12213,7 +12218,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:12216: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:12221: result: $ac_cv_lib_util_openpty" >&5
echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
if test $ac_cv_lib_util_openpty = yes; then
cf_have_openpty=yes
@@ -12234,23 +12239,23 @@ for ac_header in \
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12237: checking for $ac_header" >&5
+echo "$as_me:12242: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12243 "configure"
+#line 12248 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:12247: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12252: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:12253: \$? = $ac_status" >&5
+ echo "$as_me:12258: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12269,7 +12274,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:12272: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12277: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -12285,13 +12290,13 @@ fi
for ac_func in XkbQueryExtension
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12288: checking for $ac_func" >&5
+echo "$as_me:12293: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12294 "configure"
+#line 12299 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -12322,16 +12327,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12325: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12330: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12328: \$? = $ac_status" >&5
+ echo "$as_me:12333: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12331: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12336: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12334: \$? = $ac_status" >&5
+ echo "$as_me:12339: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -12341,7 +12346,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12344: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12349: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -12351,14 +12356,14 @@ EOF
fi
done
-echo "$as_me:12354: checking for XKB Bell extension" >&5
+echo "$as_me:12359: checking for XKB Bell extension" >&5
echo $ECHO_N "checking for XKB Bell extension... $ECHO_C" >&6
if test "${cf_cv_xkb_bell_ext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12361 "configure"
+#line 12366 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
@@ -12378,16 +12383,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12381: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12386: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12384: \$? = $ac_status" >&5
+ echo "$as_me:12389: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12387: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12392: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12390: \$? = $ac_status" >&5
+ echo "$as_me:12395: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xkb_bell_ext=yes
else
@@ -12398,7 +12403,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12401: result: $cf_cv_xkb_bell_ext" >&5
+echo "$as_me:12406: result: $cf_cv_xkb_bell_ext" >&5
echo "${ECHO_T}$cf_cv_xkb_bell_ext" >&6
test "$cf_cv_xkb_bell_ext" = yes && cat >>confdefs.h <<\EOF
#define HAVE_XKB_BELL_EXT 1
@@ -12407,13 +12412,13 @@ EOF
for ac_func in Xutf8LookupString
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12410: checking for $ac_func" >&5
+echo "$as_me:12415: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12416 "configure"
+#line 12421 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -12444,16 +12449,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12447: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12452: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12450: \$? = $ac_status" >&5
+ echo "$as_me:12455: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12453: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12458: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12456: \$? = $ac_status" >&5
+ echo "$as_me:12461: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -12463,7 +12468,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12466: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12471: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -12479,7 +12484,7 @@ else
fi
done
-echo "$as_me:12482: checking if you want narrow prototypes for X libraries" >&5
+echo "$as_me:12487: checking if you want narrow prototypes for X libraries" >&5
echo $ECHO_N "checking if you want narrow prototypes for X libraries... $ECHO_C" >&6
case `$ac_config_guess` in #(vi
@@ -12505,10 +12510,10 @@ else
enable_narrowproto=$cf_default_narrowproto
fi;
-echo "$as_me:12508: result: $enable_narrowproto" >&5
+echo "$as_me:12513: result: $enable_narrowproto" >&5
echo "${ECHO_T}$enable_narrowproto" >&6
-echo "$as_me:12511: checking if we should use imake to help" >&5
+echo "$as_me:12516: checking if we should use imake to help" >&5
echo $ECHO_N "checking if we should use imake to help... $ECHO_C" >&6
# Check whether --enable-imake or --disable-imake was given.
@@ -12525,7 +12530,7 @@ else
enable_imake=yes
fi;
-echo "$as_me:12528: result: $enable_imake" >&5
+echo "$as_me:12533: result: $enable_imake" >&5
echo "${ECHO_T}$enable_imake" >&6
if test "$enable_imake" = yes ; then
@@ -12534,7 +12539,7 @@ for ac_prog in xmkmf imake
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:12537: checking for $ac_word" >&5
+echo "$as_me:12542: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_IMAKE+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12551,7 +12556,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_IMAKE="$ac_dir/$ac_word"
- echo "$as_me:12554: found $ac_dir/$ac_word" >&5
+ echo "$as_me:12559: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -12562,10 +12567,10 @@ fi
IMAKE=$ac_cv_path_IMAKE
if test -n "$IMAKE"; then
- echo "$as_me:12565: result: $IMAKE" >&5
+ echo "$as_me:12570: result: $IMAKE" >&5
echo "${ECHO_T}$IMAKE" >&6
else
- echo "$as_me:12568: result: no" >&5
+ echo "$as_me:12573: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -12625,7 +12630,7 @@ CF_EOF
then
test -n "$verbose" && echo " Using $IMAKE $cf_imake_opts" 1>&6
-echo "${as_me:-configure}:12628: testing Using $IMAKE $cf_imake_opts ..." 1>&5
+echo "${as_me:-configure}:12633: testing Using $IMAKE $cf_imake_opts ..." 1>&5
else
# sometimes imake doesn't have the config path compiled in. Find it.
@@ -12643,7 +12648,7 @@ echo "${as_me:-configure}:12628: testing Using $IMAKE $cf_imake_opts ..." 1>&5
esac
done
if test -z "$cf_config" ; then
- { echo "$as_me:12646: WARNING: Could not find imake config-directory" >&5
+ { echo "$as_me:12651: WARNING: Could not find imake config-directory" >&5
echo "$as_me: WARNING: Could not find imake config-directory" >&2;}
else
cf_imake_opts="$cf_imake_opts -I$cf_config"
@@ -12651,10 +12656,10 @@ echo "$as_me: WARNING: Could not find imake config-directory" >&2;}
then
test -n "$verbose" && echo " Using $IMAKE $cf_config" 1>&6
-echo "${as_me:-configure}:12654: testing Using $IMAKE $cf_config ..." 1>&5
+echo "${as_me:-configure}:12659: testing Using $IMAKE $cf_config ..." 1>&5
else
- { echo "$as_me:12657: WARNING: Cannot run $IMAKE" >&5
+ { echo "$as_me:12662: WARNING: Cannot run $IMAKE" >&5
echo "$as_me: WARNING: Cannot run $IMAKE" >&2;}
fi
fi
@@ -12698,7 +12703,7 @@ echo "$as_me: WARNING: Cannot run $IMAKE" >&2;}
else
test -n "$verbose" && echo " suppressed \"$cf_nostdinc\" and \"$cf_std_incl\"" 1>&6
-echo "${as_me:-configure}:12701: testing suppressed \"$cf_nostdinc\" and \"$cf_std_incl\" ..." 1>&5
+echo "${as_me:-configure}:12706: testing suppressed \"$cf_nostdinc\" and \"$cf_std_incl\" ..." 1>&5
IMAKE_CFLAGS="$cf_cpp_opts"
fi
@@ -12720,11 +12725,11 @@ fi
test -n "$verbose" && echo " IMAKE_CFLAGS $IMAKE_CFLAGS" 1>&6
-echo "${as_me:-configure}:12723: testing IMAKE_CFLAGS $IMAKE_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12728: testing IMAKE_CFLAGS $IMAKE_CFLAGS ..." 1>&5
test -n "$verbose" && echo " IMAKE_LOADFLAGS $IMAKE_LOADFLAGS" 1>&6
-echo "${as_me:-configure}:12727: testing IMAKE_LOADFLAGS $IMAKE_LOADFLAGS ..." 1>&5
+echo "${as_me:-configure}:12732: testing IMAKE_LOADFLAGS $IMAKE_LOADFLAGS ..." 1>&5
fi
@@ -12813,7 +12818,7 @@ else
IMAKE_LOADFLAGS=
test -n "$verbose" && echo " make fallback definitions" 1>&6
-echo "${as_me:-configure}:12816: testing make fallback definitions ..." 1>&5
+echo "${as_me:-configure}:12821: testing make fallback definitions ..." 1>&5
# We prefer config.guess' values when we can get them, to avoid
# inconsistent results with uname (AIX for instance). However,
@@ -12947,27 +12952,27 @@ if test "x$cf_cv_lib_tgetent" != xno || test "x$cf_cv_lib_part_tgetent" != xno ;
test -n "$verbose" && echo " removing terminfo flags from IMAKE_CFLAGS" 1>&6
-echo "${as_me:-configure}:12950: testing removing terminfo flags from IMAKE_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12955: testing removing terminfo flags from IMAKE_CFLAGS ..." 1>&5
IMAKE_CFLAGS=`echo "$IMAKE_CFLAGS" | sed -e 's/-DUSE_TERMINFO[ ]*-DHAVE_TIGETSTR[ ]*//'`
test -n "$verbose" && echo " ...result $IMAKE_CFLAGS" 1>&6
-echo "${as_me:-configure}:12955: testing ...result $IMAKE_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12960: testing ...result $IMAKE_CFLAGS ..." 1>&5
test -n "$verbose" && echo " removing terminfo flags from CPPFLAGS" 1>&6
-echo "${as_me:-configure}:12959: testing removing terminfo flags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12964: testing removing terminfo flags from CPPFLAGS ..." 1>&5
CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/-DUSE_TERMINFO[ ]*-DHAVE_TIGETSTR[ ]*//'`
test -n "$verbose" && echo " ...result $CPPFLAGS" 1>&6
-echo "${as_me:-configure}:12964: testing ...result $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12969: testing ...result $CPPFLAGS ..." 1>&5
;;
esac
fi
-echo "$as_me:12970: checking for default terminal-id" >&5
+echo "$as_me:12975: checking for default terminal-id" >&5
echo $ECHO_N "checking for default terminal-id... $ECHO_C" >&6
# Check whether --with-terminal-id or --without-terminal-id was given.
@@ -12977,7 +12982,7 @@ if test "${with_terminal_id+set}" = set; then
else
default_termid=vt100
fi;
-echo "$as_me:12980: result: $default_termid" >&5
+echo "$as_me:12985: result: $default_termid" >&5
echo "${ECHO_T}$default_termid" >&6
case $default_termid in
vt*) default_termid=`echo $default_termid | sed -e 's/^..//'`
@@ -12987,7 +12992,7 @@ cat >>confdefs.h <<EOF
#define DFT_DECID "$default_termid"
EOF
-echo "$as_me:12990: checking for default terminal-type" >&5
+echo "$as_me:12995: checking for default terminal-type" >&5
echo $ECHO_N "checking for default terminal-type... $ECHO_C" >&6
# Check whether --with-terminal-type or --without-terminal-type was given.
@@ -12997,7 +13002,7 @@ if test "${with_terminal_type+set}" = set; then
else
default_TERM=xterm
fi;
-echo "$as_me:13000: result: $default_TERM" >&5
+echo "$as_me:13005: result: $default_TERM" >&5
echo "${ECHO_T}$default_TERM" >&6
cat >>confdefs.h <<EOF
#define DFT_TERMTYPE "$default_TERM"
@@ -13005,7 +13010,7 @@ EOF
# Extract the first word of "tic", so it can be a program name with args.
set dummy tic; ac_word=$2
-echo "$as_me:13008: checking for $ac_word" >&5
+echo "$as_me:13013: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_cf_tic_prog+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13020,7 +13025,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_cf_tic_prog="yes"
-echo "$as_me:13023: found $ac_dir/$ac_word" >&5
+echo "$as_me:13028: found $ac_dir/$ac_word" >&5
break
done
@@ -13029,15 +13034,15 @@ fi
fi
cf_tic_prog=$ac_cv_prog_cf_tic_prog
if test -n "$cf_tic_prog"; then
- echo "$as_me:13032: result: $cf_tic_prog" >&5
+ echo "$as_me:13037: result: $cf_tic_prog" >&5
echo "${ECHO_T}$cf_tic_prog" >&6
else
- echo "$as_me:13035: result: no" >&5
+ echo "$as_me:13040: result: no" >&5
echo "${ECHO_T}no" >&6
fi
if test "$cf_tic_prog" = yes ; then
- echo "$as_me:13040: checking for private terminfo-directory" >&5
+ echo "$as_me:13045: checking for private terminfo-directory" >&5
echo $ECHO_N "checking for private terminfo-directory... $ECHO_C" >&6
# Check whether --with-own-terminfo or --without-own-terminfo was given.
@@ -13047,10 +13052,10 @@ if test "${with_own_terminfo+set}" = set; then
else
TERMINFO_DIR=${TERMINFO-none}
fi;
- echo "$as_me:13050: result: $TERMINFO_DIR" >&5
+ echo "$as_me:13055: result: $TERMINFO_DIR" >&5
echo "${ECHO_T}$TERMINFO_DIR" >&6
if test "$TERMINFO_DIR" = yes ; then
- { echo "$as_me:13053: WARNING: no value given" >&5
+ { echo "$as_me:13058: WARNING: no value given" >&5
echo "$as_me: WARNING: no value given" >&2;}
elif test "$TERMINFO_DIR" != none ; then
if test -d $TERMINFO_DIR ; then
@@ -13059,7 +13064,7 @@ echo "$as_me: WARNING: no value given" >&2;}
EOF
else
- { echo "$as_me:13062: WARNING: not a directory" >&5
+ { echo "$as_me:13067: WARNING: not a directory" >&5
echo "$as_me: WARNING: not a directory" >&2;}
fi
elif test "$prefix" != NONE ; then
@@ -13083,7 +13088,7 @@ fi
###############################################################################
-echo "$as_me:13086: checking if you want active-icons" >&5
+echo "$as_me:13091: checking if you want active-icons" >&5
echo $ECHO_N "checking if you want active-icons... $ECHO_C" >&6
# Check whether --enable-active-icon or --disable-active-icon was given.
@@ -13100,7 +13105,7 @@ else
enable_active_icon=yes
fi;
-echo "$as_me:13103: result: $enable_active_icon" >&5
+echo "$as_me:13108: result: $enable_active_icon" >&5
echo "${ECHO_T}$enable_active_icon" >&6
if test "$enable_active_icon" = no ; then
cat >>confdefs.h <<\EOF
@@ -13109,7 +13114,7 @@ EOF
fi
-echo "$as_me:13112: checking if you want ANSI color" >&5
+echo "$as_me:13117: checking if you want ANSI color" >&5
echo $ECHO_N "checking if you want ANSI color... $ECHO_C" >&6
# Check whether --enable-ansi-color or --disable-ansi-color was given.
@@ -13126,7 +13131,7 @@ else
enable_ansi_color=yes
fi;
-echo "$as_me:13129: result: $enable_ansi_color" >&5
+echo "$as_me:13134: result: $enable_ansi_color" >&5
echo "${ECHO_T}$enable_ansi_color" >&6
test "$enable_ansi_color" = no && cat >>confdefs.h <<\EOF
#define OPT_ISO_COLORS 0
@@ -13134,7 +13139,7 @@ EOF
if test "$enable_ansi_color" = yes ; then
- echo "$as_me:13137: checking if you want 16 colors like aixterm" >&5
+ echo "$as_me:13142: checking if you want 16 colors like aixterm" >&5
echo $ECHO_N "checking if you want 16 colors like aixterm... $ECHO_C" >&6
# Check whether --enable-16-color or --disable-16-color was given.
@@ -13151,13 +13156,13 @@ else
enable_16_color=yes
fi;
- echo "$as_me:13154: result: $enable_16_color" >&5
+ echo "$as_me:13159: result: $enable_16_color" >&5
echo "${ECHO_T}$enable_16_color" >&6
test "$enable_16_color" = no && cat >>confdefs.h <<\EOF
#define OPT_AIX_COLORS 0
EOF
- echo "$as_me:13160: checking if you want 256 colors" >&5
+ echo "$as_me:13165: checking if you want 256 colors" >&5
echo $ECHO_N "checking if you want 256 colors... $ECHO_C" >&6
# Check whether --enable-256-color or --disable-256-color was given.
@@ -13174,7 +13179,7 @@ else
enable_256_color=no
fi;
- echo "$as_me:13177: result: $enable_256_color" >&5
+ echo "$as_me:13182: result: $enable_256_color" >&5
echo "${ECHO_T}$enable_256_color" >&6
if test "$enable_256_color" = yes ; then
CHARPROC_DEPS="$CHARPROC_DEPS 256colres.h"
@@ -13184,7 +13189,7 @@ echo "${ECHO_T}$enable_256_color" >&6
EOF
else
- echo "$as_me:13187: checking if you want 88 colors" >&5
+ echo "$as_me:13192: checking if you want 88 colors" >&5
echo $ECHO_N "checking if you want 88 colors... $ECHO_C" >&6
# Check whether --enable-88-color or --disable-88-color was given.
@@ -13201,7 +13206,7 @@ else
enable_88_color=no
fi;
- echo "$as_me:13204: result: $enable_88_color" >&5
+ echo "$as_me:13209: result: $enable_88_color" >&5
echo "${ECHO_T}$enable_88_color" >&6
if test "$enable_88_color" = yes ; then
CHARPROC_DEPS="$CHARPROC_DEPS 88colres.h"
@@ -13215,7 +13220,7 @@ EOF
fi
-echo "$as_me:13218: checking if you want blinking cursor" >&5
+echo "$as_me:13223: checking if you want blinking cursor" >&5
echo $ECHO_N "checking if you want blinking cursor... $ECHO_C" >&6
# Check whether --enable-blink-cursor or --disable-blink-cursor was given.
@@ -13232,13 +13237,13 @@ else
enable_blink_curs=yes
fi;
-echo "$as_me:13235: result: $enable_blink_curs" >&5
+echo "$as_me:13240: result: $enable_blink_curs" >&5
echo "${ECHO_T}$enable_blink_curs" >&6
test "$enable_blink_curs" = no && cat >>confdefs.h <<\EOF
#define OPT_BLINK_CURS 0
EOF
-echo "$as_me:13241: checking if you want to ignore Linux's broken palette-strings" >&5
+echo "$as_me:13246: checking if you want to ignore Linux's broken palette-strings" >&5
echo $ECHO_N "checking if you want to ignore Linux's broken palette-strings... $ECHO_C" >&6
case $host_os in #(vi
@@ -13262,7 +13267,7 @@ else
enable_broken_osc=$enableval
fi;
-echo "$as_me:13265: result: $enable_broken_osc" >&5
+echo "$as_me:13270: result: $enable_broken_osc" >&5
echo "${ECHO_T}$enable_broken_osc" >&6
if test "$enable_broken_osc" = yes ; then
cat >>confdefs.h <<\EOF
@@ -13276,7 +13281,7 @@ EOF
fi
-echo "$as_me:13279: checking if you want to allow broken string-terminators" >&5
+echo "$as_me:13284: checking if you want to allow broken string-terminators" >&5
echo $ECHO_N "checking if you want to allow broken string-terminators... $ECHO_C" >&6
# Check whether --enable-broken-st or --disable-broken-st was given.
@@ -13293,13 +13298,13 @@ else
enable_broken_st=yes
fi;
-echo "$as_me:13296: result: $enable_broken_st" >&5
+echo "$as_me:13301: result: $enable_broken_st" >&5
echo "${ECHO_T}$enable_broken_st" >&6
test "$enable_broken_st" = no && cat >>confdefs.h <<\EOF
#define OPT_BROKEN_ST 0
EOF
-echo "$as_me:13302: checking if you want printable 128-159" >&5
+echo "$as_me:13307: checking if you want printable 128-159" >&5
echo $ECHO_N "checking if you want printable 128-159... $ECHO_C" >&6
# Check whether --enable-c1-print or --disable-c1-print was given.
@@ -13316,7 +13321,7 @@ else
enable_c1_print=yes
fi;
-echo "$as_me:13319: result: $enable_c1_print" >&5
+echo "$as_me:13324: result: $enable_c1_print" >&5
echo "${ECHO_T}$enable_c1_print" >&6
test "$enable_c1_print" = no && cat >>confdefs.h <<\EOF
#define OPT_C1_PRINT 0
@@ -13324,7 +13329,7 @@ EOF
if test "$enable_ansi_color" = yes ; then
- echo "$as_me:13327: checking if you want bold colors mapped like IBM PC" >&5
+ echo "$as_me:13332: checking if you want bold colors mapped like IBM PC" >&5
echo $ECHO_N "checking if you want bold colors mapped like IBM PC... $ECHO_C" >&6
# Check whether --enable-bold-color or --disable-bold-color was given.
@@ -13341,13 +13346,13 @@ else
enable_pc_color=yes
fi;
- echo "$as_me:13344: result: $enable_pc_color" >&5
+ echo "$as_me:13349: result: $enable_pc_color" >&5
echo "${ECHO_T}$enable_pc_color" >&6
test "$enable_pc_color" = no && cat >>confdefs.h <<\EOF
#define OPT_PC_COLORS 0
EOF
- echo "$as_me:13350: checking if you want separate color-classes" >&5
+ echo "$as_me:13355: checking if you want separate color-classes" >&5
echo $ECHO_N "checking if you want separate color-classes... $ECHO_C" >&6
# Check whether --enable-color-class or --disable-color-class was given.
@@ -13364,13 +13369,13 @@ else
enable_color_class=yes
fi;
- echo "$as_me:13367: result: $enable_color_class" >&5
+ echo "$as_me:13372: result: $enable_color_class" >&5
echo "${ECHO_T}$enable_color_class" >&6
test "$enable_color_class" = no && cat >>confdefs.h <<\EOF
#define OPT_COLOR_CLASS FALSE
EOF
- echo "$as_me:13373: checking if you want color-mode enabled by default" >&5
+ echo "$as_me:13378: checking if you want color-mode enabled by default" >&5
echo $ECHO_N "checking if you want color-mode enabled by default... $ECHO_C" >&6
# Check whether --enable-color-mode or --disable-color-mode was given.
@@ -13387,7 +13392,7 @@ else
default_colormode=yes
fi;
- echo "$as_me:13390: result: $default_colormode" >&5
+ echo "$as_me:13395: result: $default_colormode" >&5
echo "${ECHO_T}$default_colormode" >&6
test "$default_colormode" = no && cat >>confdefs.h <<\EOF
#define DFT_COLORMODE FALSE
@@ -13395,7 +13400,7 @@ EOF
fi
-echo "$as_me:13398: checking if you want support for color highlighting" >&5
+echo "$as_me:13403: checking if you want support for color highlighting" >&5
echo $ECHO_N "checking if you want support for color highlighting... $ECHO_C" >&6
# Check whether --enable-highlighting or --disable-highlighting was given.
@@ -13412,13 +13417,13 @@ else
default_highlight=yes
fi;
-echo "$as_me:13415: result: $default_highlight" >&5
+echo "$as_me:13420: result: $default_highlight" >&5
echo "${ECHO_T}$default_highlight" >&6
test "$default_highlight" = no && cat >>confdefs.h <<\EOF
#define OPT_HIGHLIGHT_COLOR 0
EOF
-echo "$as_me:13421: checking if you want support for doublesize characters" >&5
+echo "$as_me:13426: checking if you want support for doublesize characters" >&5
echo $ECHO_N "checking if you want support for doublesize characters... $ECHO_C" >&6
# Check whether --enable-doublechars or --disable-doublechars was given.
@@ -13435,13 +13440,13 @@ else
enable_doublechars=yes
fi;
-echo "$as_me:13438: result: $enable_doublechars" >&5
+echo "$as_me:13443: result: $enable_doublechars" >&5
echo "${ECHO_T}$enable_doublechars" >&6
test "$enable_doublechars" = no && cat >>confdefs.h <<\EOF
#define OPT_DEC_CHRSET 0
EOF
-echo "$as_me:13444: checking if you want fallback-support for box characters" >&5
+echo "$as_me:13449: checking if you want fallback-support for box characters" >&5
echo $ECHO_N "checking if you want fallback-support for box characters... $ECHO_C" >&6
# Check whether --enable-boxchars or --disable-boxchars was given.
@@ -13458,13 +13463,13 @@ else
enable_boxchars=yes
fi;
-echo "$as_me:13461: result: $enable_boxchars" >&5
+echo "$as_me:13466: result: $enable_boxchars" >&5
echo "${ECHO_T}$enable_boxchars" >&6
test "$enable_boxchars" = no && cat >>confdefs.h <<\EOF
#define OPT_BOX_CHARS 0
EOF
-echo "$as_me:13467: checking if you want to allow spawning new xterms" >&5
+echo "$as_me:13472: checking if you want to allow spawning new xterms" >&5
echo $ECHO_N "checking if you want to allow spawning new xterms... $ECHO_C" >&6
# Check whether --enable-exec-xterm or --disable-exec-xterm was given.
@@ -13481,11 +13486,11 @@ else
enable_exec_xterm=no
fi;
-echo "$as_me:13484: result: $enable_exec_xterm" >&5
+echo "$as_me:13489: result: $enable_exec_xterm" >&5
echo "${ECHO_T}$enable_exec_xterm" >&6
if test "$enable_exec_xterm" = yes ; then
-echo "$as_me:13488: checking for proc tree with cwd-support" >&5
+echo "$as_me:13493: checking for proc tree with cwd-support" >&5
echo $ECHO_N "checking for proc tree with cwd-support... $ECHO_C" >&6
if test "${cf_cv_procfs_cwd+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13504,11 +13509,11 @@ do
done
fi
-echo "$as_me:13507: result: $cf_cv_procfs_cwd" >&5
+echo "$as_me:13512: result: $cf_cv_procfs_cwd" >&5
echo "${ECHO_T}$cf_cv_procfs_cwd" >&6
if test "$cf_cv_procfs_cwd" = no ; then
- { echo "$as_me:13511: WARNING: no suitable proc filesystem found" >&5
+ { echo "$as_me:13516: WARNING: no suitable proc filesystem found" >&5
echo "$as_me: WARNING: no suitable proc filesystem found" >&2;}
else
cat >>confdefs.h <<EOF
@@ -13522,7 +13527,7 @@ EOF
fi
fi
-echo "$as_me:13525: checking if you want to use FreeType library" >&5
+echo "$as_me:13530: checking if you want to use FreeType library" >&5
echo $ECHO_N "checking if you want to use FreeType library... $ECHO_C" >&6
# Check whether --enable-freetype or --disable-freetype was given.
@@ -13539,7 +13544,7 @@ else
enable_freetype=yes
fi;
-echo "$as_me:13542: result: $enable_freetype" >&5
+echo "$as_me:13547: result: $enable_freetype" >&5
echo "${ECHO_T}$enable_freetype" >&6
if test "$enable_freetype" = yes ; then
@@ -13549,7 +13554,7 @@ cf_extra_freetype_libs=
FREETYPE_CONFIG=none
FREETYPE_PARAMS=
-echo "$as_me:13552: checking for FreeType configuration script" >&5
+echo "$as_me:13557: checking for FreeType configuration script" >&5
echo $ECHO_N "checking for FreeType configuration script... $ECHO_C" >&6
# Check whether --with-freetype-config or --without-freetype-config was given.
@@ -13561,12 +13566,12 @@ else
fi;
test -z $cf_cv_x_freetype_cfgs && cf_cv_x_freetype_cfgs=auto
test $cf_cv_x_freetype_cfgs = no && cf_cv_x_freetype_cfgs=none
-echo "$as_me:13564: result: $cf_cv_x_freetype_cfgs" >&5
+echo "$as_me:13569: result: $cf_cv_x_freetype_cfgs" >&5
echo "${ECHO_T}$cf_cv_x_freetype_cfgs" >&6
case $cf_cv_x_freetype_cfgs in
none) #(vi
- echo "$as_me:13569: checking if you specified -D/-I options for FreeType" >&5
+ echo "$as_me:13574: checking if you specified -D/-I options for FreeType" >&5
echo $ECHO_N "checking if you specified -D/-I options for FreeType... $ECHO_C" >&6
# Check whether --with-freetype-cflags or --without-freetype-cflags was given.
@@ -13576,10 +13581,10 @@ if test "${with_freetype_cflags+set}" = set; then
else
cf_cv_x_freetype_incs=no
fi;
- echo "$as_me:13579: result: $cf_cv_x_freetype_incs" >&5
+ echo "$as_me:13584: result: $cf_cv_x_freetype_incs" >&5
echo "${ECHO_T}$cf_cv_x_freetype_incs" >&6
- echo "$as_me:13582: checking if you specified -L/-l options for FreeType" >&5
+ echo "$as_me:13587: checking if you specified -L/-l options for FreeType" >&5
echo $ECHO_N "checking if you specified -L/-l options for FreeType... $ECHO_C" >&6
# Check whether --with-freetype-libs or --without-freetype-libs was given.
@@ -13589,7 +13594,7 @@ if test "${with_freetype_libs+set}" = set; then
else
cf_cv_x_freetype_libs=no
fi;
- echo "$as_me:13592: result: $cf_cv_x_freetype_libs" >&5
+ echo "$as_me:13597: result: $cf_cv_x_freetype_libs" >&5
echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6
;;
auto) #(vi
@@ -13599,7 +13604,7 @@ auto) #(vi
else
# Extract the first word of "freetype-config", so it can be a program name with args.
set dummy freetype-config; ac_word=$2
-echo "$as_me:13602: checking for $ac_word" >&5
+echo "$as_me:13607: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_FREETYPE_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
Reply to: