Imakefile | 15
MANIFEST | 2
XTerm.ad | 6
aclocal.m4 | 33
button.c | 19
charproc.c | 12
configure | 3743 ++++++++++++++++++++++-------------------------
configure.in | 16
ctlseqs.ms | 16
ctlseqs.txt | 10
html.c | 304 +++
menu.c | 50
menu.h | 10
misc.c | 64
package/debian/changelog | 6
package/debian/rules | 1
package/freebsd/Makefile | 2
package/xterm.spec | 8
print.c | 12
ptyx.h | 8
svg.c | 288 +++
uxterm.desktop | 5
version.h | 6
xterm.appdata.xml | 10
xterm.dat | 2
xterm.desktop | 5
xterm.h | 21
xterm.log.html | 33
xterm.man | 119 +
xtermcfg.hin | 5
30 files changed, 2819 insertions(+), 2012 deletions(-)
New commits:
commit dabaa890d428573a9cfa4a13a5e42d229df66887
Author: Sven Joachim <svenj...@gmx.de>
Date: Wed Mar 9 17:28:12 2016 +0100
Imported Upstream version 323
diff --git a/Imakefile b/Imakefile
index f2119ec..bbe389a 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.111 2014/07/22 22:29:17 tom Exp $
+XCOMM $XTermId: Imakefile,v 1.112 2016/01/28 01:56:53 Jens.Schweikhardt Exp $
XCOMM
XCOMM Attention xterm porters
XCOMM
@@ -165,6 +165,9 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
#if !HasPutenv
PUTENVDEF = -DNOPUTENV
#endif
+#ifdef DumpsXTerm
+ DUMPSDEF = -DOPT_SCREEN_DUMPS=1
+#endif
#ifdef RegisXTerm
SIXELDEF = -DOPT_REGIS_GRAPHICS=1
#endif
@@ -180,11 +183,15 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */
XKB_DEFINES = XkbClientDefines
PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT)
- DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES)
$(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF)
$(IMAKEDEFINES) $(SIXELDEF) $(TRACEDEF)
+ DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES)
$(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF)
$(IMAKEDEFINES) $(SIXELDEF) $(TRACEDEF) $(DUMPSDEF)
INCLUDES = -I. $(XRFINCLUDES)
MAINSRC = main.c
MAINOBJ = main.o
+#ifdef DumpsXTerm
+ DUMPSSRC = html.c svg.c
+ DUMPSOBJ = html.o svg.o
+#endif
#ifdef RegisXTerm
SIXELSRC = graphics_regis.c
SIXELOBJ = graphics_regis.o
@@ -202,13 +209,13 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
linedata.c menu.c misc.c print.c ptydata.c scrollback.c \
screen.c scrollbar.c tabs.c util.c version.c xstrings.c \
xtermcap.c TekPrsTbl.c Tekproc.c VTPrsTbl.c \
- $(MAINSRC) $(EXTRASRC) $(UTF8SRC) $(SIXELSRC) $(TRACESRC)
+ $(MAINSRC) $(EXTRASRC) $(UTF8SRC) $(SIXELSRC) $(TRACESRC)
$(DUMPSSRC)
OBJS1 = button.o cachedGCs.o charproc.o charsets.o cursor.o \
data.o doublechr.o fontutils.o input.o \
linedata.o menu.o misc.o print.o ptydata.o scrollback.o \
screen.o scrollbar.o tabs.o util.o version.o xstrings.o \
xtermcap.o TekPrsTbl.o Tekproc.o VTPrsTbl.o \
- $(MAINOBJ) $(EXTRAOBJ) $(UTF8OBJ) $(SIXELOBJ) $(TRACEOBJ)
+ $(MAINOBJ) $(EXTRAOBJ) $(UTF8OBJ) $(SIXELOBJ) $(TRACEOBJ)
$(DUMPSOBJ)
SRCS2 = resize.c version.c xstrings.c
OBJS2 = resize.o version.o xstrings.o
SRCS = $(SRCS1) $(SRCS2)
diff --git a/MANIFEST b/MANIFEST
index 1009b48..067c42e 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-322, version xterm-322
+MANIFEST for xterm-323, version xterm-323
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/XTerm.ad b/XTerm.ad
index 69e578b..716b175 100644
--- a/XTerm.ad
+++ b/XTerm.ad
@@ -1,8 +1,8 @@
-! $XTermId: XTerm.ad,v 1.99 2013/06/23 08:57:13 Ross.Combs Exp $
+! $XTermId: XTerm.ad,v 1.101 2016/01/28 02:15:29 tom Exp $
! -----------------------------------------------------------------------------
! this file is part of xterm
!
-! Copyright 1996-2010,2011 by Thomas E. Dickey
+! Copyright 1996-2011,2016 by Thomas E. Dickey
!
! All Rights Reserved
!
@@ -52,6 +52,8 @@
*mainMenu*print-on-error*Label: Print-All on Error
*mainMenu*print*Label: Print Window
*mainMenu*print-redir*Label: Redirect to Printer
+*mainMenu*dump-html*Label: XHTML Screen Dump
+*mainMenu*dump-svg*Label: SVG Screen Dump
*mainMenu*8-bit control*Label: 8-Bit Controls
*mainMenu*backarrow key*Label: Backarrow Key (BS/DEL)
*mainMenu*num-lock*Label: Alt/NumLock Modifiers
diff --git a/aclocal.m4 b/aclocal.m4
index 6dfb3d7..ef41c84 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,8 @@
-dnl $XTermId: aclocal.m4,v 1.405 2015/12/27 22:35:12 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.406 2016/03/07 01:30:21 tom Exp $
dnl
dnl ---------------------------------------------------------------------------
dnl
-dnl Copyright 1997-2014,2015 by Thomas E. Dickey
+dnl Copyright 1997-2015,2016 by Thomas E. Dickey
dnl
dnl All Rights Reserved
dnl
@@ -1723,26 +1723,18 @@ AC_CACHE_CHECK(if we should define
_POSIX_C_SOURCE,cf_cv_posix_c_source,[
make an error
#endif],
[cf_cv_posix_c_source=no],
- [cf_want_posix_source=no
- case .$cf_POSIX_C_SOURCE in
- (.[[12]]??*)
+ [case .$cf_POSIX_C_SOURCE in
+ (.[[12]]??*|.2)
cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
;;
- (.2)
- cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
- cf_want_posix_source=yes
- ;;
(.*)
- cf_want_posix_source=yes
;;
esac
- if test "$cf_want_posix_source" = yes ; then
- AC_TRY_COMPILE([#include <sys/types.h>],[
+ AC_TRY_COMPILE([#include <sys/types.h>],[
#ifdef _POSIX_SOURCE
make an error
#endif],[],
cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE")
- fi
CF_MSG_LOG(ifdef from value $cf_POSIX_C_SOURCE)
CFLAGS="$cf_trim_CFLAGS"
CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
@@ -1763,6 +1755,17 @@ if test "$cf_cv_posix_c_source" != no ; then
CF_ADD_CFLAGS($cf_cv_posix_c_source)
fi
+AC_CACHE_CHECK(if we should define _POSIX_SOURCE,cf_cv_posix_source,[
+ AC_TRY_COMPILE([#include <sys/types.h>],[
+#ifdef _POSIX_SOURCE
+make an error
+#endif],[cf_cv_posix_source=yes],
+ [cf_cv_posix_source=no])
+])
+
+if test "$cf_cv_posix_source" != no ; then
+ CF_ADD_CFLAGS(-D_POSIX_SOURCE)
+fi
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_POSIX_SAVED_IDS version: 8 updated: 2012/10/04 20:12:20
@@ -3982,7 +3985,6 @@ case $host_os in
(mirbsd*)
# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and
other headers which use u_int / u_short types
cf_XOPEN_SOURCE=
- CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
;;
(netbsd*)
cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6
for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
@@ -4017,10 +4019,11 @@ case $host_os in
;;
(*)
CF_TRY_XOPEN_SOURCE
- CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
;;
esac
+CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
+
if test -n "$cf_xopen_source" ; then
CF_ADD_CFLAGS($cf_xopen_source,true)
fi
diff --git a/button.c b/button.c
index c89da83..630e212 100644
--- a/button.c
+++ b/button.c
@@ -1,7 +1,7 @@
-/* $XTermId: button.c,v 1.498 2015/12/31 11:26:38 tom Exp $ */
+/* $XTermId: button.c,v 1.501 2016/03/06 19:16:35 tom Exp $ */
/*
- * Copyright 1999-2014,2015 by Thomas E. Dickey
+ * Copyright 1999-2015,2016 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -4230,7 +4230,8 @@ _OwnSelection(XtermWidget xw,
} else if (keepClipboard(atoms[i])) {
Char *buf;
TRACE(("saving selection to clipboard buffer\n"));
- if ((buf = (Char *) malloc((size_t) screen->selection_length)) == 0)
+ if ((buf = (Char *) malloc((size_t) screen->selection_length))
+ == 0)
SysError(ERROR_BMALLOC2);
XtFree((char *) screen->clipboard_data);
@@ -5086,10 +5087,16 @@ expandFormat(XtermWidget xw,
/* execute the command after forking. The main process frees its data */
static void
-executeCommand(char **argv)
+executeCommand(pid_t pid, char **argv)
{
+ char *child_cwd = ProcGetCWD(pid);
+
+ (void) pid;
if (argv != 0 && argv[0] != 0) {
if (fork() == 0) {
+ if (child_cwd) {
+ IGNORE_RC(chdir(child_cwd)); /* We don't care if this fails
*/
+ }
execvp(argv[0], argv);
exit(EXIT_FAILURE);
}
@@ -5126,7 +5133,7 @@ reallyExecFormatted(Widget w, char *format, char *data,
CELL *start, CELL *finis
for (argc = 0; argv[argc] != 0; ++argc) {
argv[argc] = expandFormat(xw, argv[argc], data, start, finish);
}
- executeCommand(argv);
+ executeCommand(TScreenOf(xw)->pid, argv);
freeArgv(blob, argv);
}
}
@@ -5173,7 +5180,7 @@ HandleExecSelectable(Widget w,
argv[argc] = expandFormat(xw, argv[argc], data,
&start, &finish);
}
- executeCommand(argv);
+ executeCommand(TScreenOf(xw)->pid, argv);
freeArgv(blob, argv);
}
free(data);
diff --git a/charproc.c b/charproc.c
index 44ffff3..d4cf1d9 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,7 +1,7 @@
-/* $XTermId: charproc.c,v 1.1414 2015/12/30 09:38:49 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1417 2016/02/12 00:18:59 tom Exp $ */
/*
- * Copyright 1999-2014,2015 by Thomas E. Dickey
+ * Copyright 1999-2015,2016 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -326,6 +326,10 @@ static XtActionsRec actionsList[] = {
#if OPT_DEC_SOFTFONT
{ "set-font-loading", HandleFontLoading },
#endif
+#if OPT_SCREEN_DUMPS
+ { "dump-html", HandleDumpHtml },
+ { "dump-svg", HandleDumpSvg },
+#endif
#if OPT_EXEC_XTERM
{ "spawn-new-terminal", HandleSpawnTerminal },
#endif
@@ -7857,9 +7861,11 @@ VTInitialize(Widget wrequest,
init_Bres(screen.cursor_underline);
/* resources allow for underline or block, not (yet) bar */
InitCursorShape(TScreenOf(wnew), TScreenOf(request));
+#if OPT_BLINK_CURS
TRACE(("cursor_shape:%d blinks:%s\n",
TScreenOf(wnew)->cursor_shape,
BtoS(TScreenOf(wnew)->cursor_blink)));
+#endif
#if OPT_BLINK_TEXT
init_Ires(screen.blink_as_bold);
#endif
@@ -10638,9 +10644,11 @@ ReallyReset(XtermWidget xw, Bool full, Bool saved)
/* make cursor visible */
screen->cursor_set = ON;
InitCursorShape(screen, screen);
+#if OPT_BLINK_CURS
TRACE(("cursor_shape:%d blinks:%s\n",
screen->cursor_shape,
BtoS(screen->cursor_blink)));
+#endif
/* reset scrolling region */
reset_margins(screen);
diff --git a/configure b/configure
index 939e52f..7ec2fde 100755
--- a/configure
+++ b/configure
@@ -786,6 +786,7 @@ Optional Features:
--disable-luit enable luit filter (Unicode translation)
--enable-dabbrev enable dynamic-abbreviation support
--enable-dec-locator enable DECterm Locator support
+ --enable-screen-dumps enable XHTML and SVG screen dumps
--enable-regis-graphics enable ReGIS graphics support
--enable-sixel-graphics enable sixel graphics support
--disable-rectangles disable VT420 rectangle support
@@ -993,7 +994,7 @@ if test -z "$CONFIG_SITE"; then
fi
for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
- { echo "$as_me:996: loading site script $ac_site_file" >&5
+ { echo "$as_me:997: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
cat "$ac_site_file" >&5
. "$ac_site_file"
@@ -1004,7 +1005,7 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { echo "$as_me:1007: loading cache $cache_file" >&5
+ { echo "$as_me:1008: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1012,7 +1013,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
esac
fi
else
- { echo "$as_me:1015: creating cache $cache_file" >&5
+ { echo "$as_me:1016: creating cache $cache_file" >&5
echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -1028,21 +1029,21 @@ for ac_var in `(set) 2>&1 |
eval ac_new_val="\$ac_env_${ac_var}_value"
case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:1031: error: \`$ac_var' was set to \`$ac_old_val' in the
previous run" >&5
+ { echo "$as_me:1032: error: \`$ac_var' was set to \`$ac_old_val' in the
previous run" >&5
echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run"
>&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:1035: error: \`$ac_var' was not set in the previous run"
>&5
+ { echo "$as_me:1036: error: \`$ac_var' was not set in the previous run"
>&5
echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:1041: error: \`$ac_var' has changed since the previous
run:" >&5
+ { echo "$as_me:1042: error: \`$ac_var' has changed since the previous
run:" >&5
echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:1043: former value: $ac_old_val" >&5
+ { echo "$as_me:1044: former value: $ac_old_val" >&5
echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:1045: current value: $ac_new_val" >&5
+ { echo "$as_me:1046: current value: $ac_new_val" >&5
echo "$as_me: current value: $ac_new_val" >&2;}
ac_cache_corrupted=:
fi;;
@@ -1061,9 +1062,9 @@ echo "$as_me: current value: $ac_new_val" >&2;}
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:1064: error: changes in the environment can compromise the
build" >&5
+ { echo "$as_me:1065: error: changes in the environment can compromise the
build" >&5
echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:1066: error: run \`make distclean' and/or \`rm $cache_file'
and start over" >&5
+ { { echo "$as_me:1067: error: run \`make distclean' and/or \`rm $cache_file'
and start over" >&5
echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start
over" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1084,10 +1085,10 @@ esac
echo "#! $SHELL" >conftest.sh
echo "exit 0" >>conftest.sh
chmod +x conftest.sh
-if { (echo "$as_me:1087: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1088: PATH=\".;.\"; conftest.sh") >&5
(PATH=".;."; conftest.sh) 2>&5
ac_status=$?
- echo "$as_me:1090: \$? = $ac_status" >&5
+ echo "$as_me:1091: \$? = $ac_status" >&5
(exit $ac_status); }; then
ac_path_separator=';'
else
@@ -1115,7 +1116,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:1118: error: cannot find install-sh or install.sh in
$srcdir $srcdir/.. $srcdir/../.." >&5
+ { { echo "$as_me:1119: error: cannot find install-sh or install.sh in
$srcdir $srcdir/.. $srcdir/../.." >&5
echo "$as_me: error: cannot find install-sh or install.sh in $srcdir
$srcdir/.. $srcdir/../.." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1125,11 +1126,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This
should be Cygnus configure.
# Make sure we can run config.sub.
$ac_config_sub sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:1128: error: cannot run $ac_config_sub" >&5
+ { { echo "$as_me:1129: error: cannot run $ac_config_sub" >&5
echo "$as_me: error: cannot run $ac_config_sub" >&2;}
{ (exit 1); exit 1; }; }
-echo "$as_me:1132: checking build system type" >&5
+echo "$as_me:1133: checking build system type" >&5
echo $ECHO_N "checking build system type... $ECHO_C" >&6
if test "${ac_cv_build+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1138,16 +1139,16 @@ else
test -z "$ac_cv_build_alias" &&
ac_cv_build_alias=`$ac_config_guess`
test -z "$ac_cv_build_alias" &&
- { { echo "$as_me:1141: error: cannot guess build type; you must specify one"
>&5
+ { { echo "$as_me:1142: error: cannot guess build type; you must specify one"
>&5
echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
{ (exit 1); exit 1; }; }
ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
- { { echo "$as_me:1145: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ { { echo "$as_me:1146: error: $ac_config_sub $ac_cv_build_alias failed." >&5
echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:1150: result: $ac_cv_build" >&5
+echo "$as_me:1151: result: $ac_cv_build" >&5
echo "${ECHO_T}$ac_cv_build" >&6
build=$ac_cv_build
build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1155,7 +1156,7 @@ build_vendor=`echo $ac_cv_build | sed
's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
- echo "$as_me:1158: checking host system type" >&5
+ echo "$as_me:1159: checking host system type" >&5
echo $ECHO_N "checking host system type... $ECHO_C" >&6
if test "${ac_cv_host+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1164,12 +1165,12 @@ else
test -z "$ac_cv_host_alias" &&
ac_cv_host_alias=$ac_cv_build_alias
ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
- { { echo "$as_me:1167: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ { { echo "$as_me:1168: error: $ac_config_sub $ac_cv_host_alias failed" >&5
echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:1172: result: $ac_cv_host" >&5
+echo "$as_me:1173: result: $ac_cv_host" >&5
echo "${ECHO_T}$ac_cv_host" >&6
host=$ac_cv_host
host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1195,13 +1196,13 @@ else
fi
test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1198: result: Configuring for
$cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1199: result: Configuring for
$cf_cv_system_name" >&5
echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
if test ".$system_name" != ".$cf_cv_system_name" ; then
- echo "$as_me:1202: result: Cached system name ($system_name) does not
agree with actual ($cf_cv_system_name)" >&5
+ echo "$as_me:1203: result: Cached system name ($system_name) does not
agree with actual ($cf_cv_system_name)" >&5
echo "${ECHO_T}Cached system name ($system_name) does not agree with actual
($cf_cv_system_name)" >&6
- { { echo "$as_me:1204: error: \"Please remove config.cache and try
again.\"" >&5
+ { { echo "$as_me:1205: error: \"Please remove config.cache and try
again.\"" >&5
echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1226,7 +1227,7 @@ ac_main_return=return
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program
name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1229: checking for $ac_word" >&5
+echo "$as_me:1230: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1241,7 +1242,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_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1244: found $ac_dir/$ac_word" >&5
+echo "$as_me:1245: found $ac_dir/$ac_word" >&5
break
done
@@ -1249,10 +1250,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1252: result: $CC" >&5
+ echo "$as_me:1253: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1255: result: no" >&5
+ echo "$as_me:1256: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1261,7 +1262,7 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-echo "$as_me:1264: checking for $ac_word" >&5
+echo "$as_me:1265: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1276,7 +1277,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_ac_ct_CC="gcc"
-echo "$as_me:1279: found $ac_dir/$ac_word" >&5
+echo "$as_me:1280: found $ac_dir/$ac_word" >&5
break
done
@@ -1284,10 +1285,10 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1287: result: $ac_ct_CC" >&5
+ echo "$as_me:1288: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1290: result: no" >&5
+ echo "$as_me:1291: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1300,7 +1301,7 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program
name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1303: checking for $ac_word" >&5
+echo "$as_me:1304: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1315,7 +1316,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_CC="${ac_tool_prefix}cc"
-echo "$as_me:1318: found $ac_dir/$ac_word" >&5
+echo "$as_me:1319: found $ac_dir/$ac_word" >&5
break
done
@@ -1323,10 +1324,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1326: result: $CC" >&5
+ echo "$as_me:1327: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1329: result: no" >&5
+ echo "$as_me:1330: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1335,7 +1336,7 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-echo "$as_me:1338: checking for $ac_word" >&5
+echo "$as_me:1339: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1350,7 +1351,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_ac_ct_CC="cc"
-echo "$as_me:1353: found $ac_dir/$ac_word" >&5
+echo "$as_me:1354: found $ac_dir/$ac_word" >&5
break
done
@@ -1358,10 +1359,10 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1361: result: $ac_ct_CC" >&5
+ echo "$as_me:1362: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1364: result: no" >&5
+ echo "$as_me:1365: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1374,7 +1375,7 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-echo "$as_me:1377: checking for $ac_word" >&5
+echo "$as_me:1378: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1394,7 +1395,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
continue
fi
ac_cv_prog_CC="cc"
-echo "$as_me:1397: found $ac_dir/$ac_word" >&5
+echo "$as_me:1398: found $ac_dir/$ac_word" >&5
break
done
@@ -1416,10 +1417,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1419: result: $CC" >&5
+ echo "$as_me:1420: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1422: result: no" >&5
+ echo "$as_me:1423: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1430,7 +1431,7 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a
program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1433: checking for $ac_word" >&5
+echo "$as_me:1434: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1445,7 +1446,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_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1448: found $ac_dir/$ac_word" >&5
+echo "$as_me:1449: found $ac_dir/$ac_word" >&5
break
done
@@ -1453,10 +1454,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1456: result: $CC" >&5
+ echo "$as_me:1457: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1459: result: no" >&5
+ echo "$as_me:1460: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1469,7 +1470,7 @@ if test -z "$CC"; then
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:1472: checking for $ac_word" >&5
+echo "$as_me:1473: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1484,7 +1485,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_ac_ct_CC="$ac_prog"
-echo "$as_me:1487: found $ac_dir/$ac_word" >&5
+echo "$as_me:1488: found $ac_dir/$ac_word" >&5
break
done
@@ -1492,10 +1493,10 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1495: result: $ac_ct_CC" >&5
+ echo "$as_me:1496: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1498: result: no" >&5
+ echo "$as_me:1499: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1507,32 +1508,32 @@ fi
fi
-test -z "$CC" && { { echo "$as_me:1510: error: no acceptable cc found in
\$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1511: error: no acceptable cc found in
\$PATH" >&5
echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
-echo "$as_me:1515:" \
+echo "$as_me:1516:" \
"checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1518: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1519: \"$ac_compiler --version </dev/null >&5\"") >&5
(eval $ac_compiler --version </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1521: \$? = $ac_status" >&5
+ echo "$as_me:1522: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1523: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1524: \"$ac_compiler -v </dev/null >&5\"") >&5
(eval $ac_compiler -v </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1526: \$? = $ac_status" >&5
+ echo "$as_me:1527: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1528: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1529: \"$ac_compiler -V </dev/null >&5\"") >&5
(eval $ac_compiler -V </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1531: \$? = $ac_status" >&5
+ echo "$as_me:1532: \$? = $ac_status" >&5
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
-#line 1535 "configure"
+#line 1536 "configure"
#include "confdefs.h"
int
@@ -1548,13 +1549,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-echo "$as_me:1551: checking for C compiler default output" >&5
+echo "$as_me:1552: checking for C compiler default output" >&5
echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1554: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1555: \"$ac_link_default\"") >&5
(eval $ac_link_default) 2>&5
ac_status=$?
- echo "$as_me:1557: \$? = $ac_status" >&5
+ echo "$as_me:1558: \$? = $ac_status" >&5
(exit $ac_status); }; then
# Find the output, starting from the most likely. This scheme is
# not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1577,34 +1578,34 @@ done
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:1580: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1581: error: C compiler cannot create executables" >&5
echo "$as_me: error: C compiler cannot create executables" >&2;}
{ (exit 77); exit 77; }; }
fi
ac_exeext=$ac_cv_exeext
-echo "$as_me:1586: result: $ac_file" >&5
+echo "$as_me:1587: result: $ac_file" >&5
echo "${ECHO_T}$ac_file" >&6
# Check the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-echo "$as_me:1591: checking whether the C compiler works" >&5
+echo "$as_me:1592: checking whether the C compiler works" >&5
echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
if { ac_try='./$ac_file'
- { (eval echo "$as_me:1597: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1598: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1600: \$? = $ac_status" >&5
+ echo "$as_me:1601: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { echo "$as_me:1607: error: cannot run C compiled programs.
+ { { echo "$as_me:1608: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'." >&5
echo "$as_me: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'." >&2;}
@@ -1612,24 +1613,24 @@ If you meant to cross compile, use \`--host'." >&2;}
fi
fi
fi
-echo "$as_me:1615: result: yes" >&5
+echo "$as_me:1616: result: yes" >&5
echo "${ECHO_T}yes" >&6
rm -f a.out a.exe conftest$ac_cv_exeext
ac_clean_files=$ac_clean_files_save
# Check the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-echo "$as_me:1622: checking whether we are cross compiling" >&5
+echo "$as_me:1623: checking whether we are cross compiling" >&5
echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1624: result: $cross_compiling" >&5
+echo "$as_me:1625: result: $cross_compiling" >&5
echo "${ECHO_T}$cross_compiling" >&6
-echo "$as_me:1627: checking for executable suffix" >&5
+echo "$as_me:1628: checking for executable suffix" >&5
echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1629: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1630: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:1632: \$? = $ac_status" >&5
+ echo "$as_me:1633: \$? = $ac_status" >&5
(exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
@@ -1645,25 +1646,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls
conftest.*) 2>/dev/null`; do
esac
done
else
- { { echo "$as_me:1648: error: cannot compute EXEEXT: cannot compile and
link" >&5
+ { { echo "$as_me:1649: error: cannot compute EXEEXT: cannot compile and
link" >&5
echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f conftest$ac_cv_exeext
-echo "$as_me:1654: result: $ac_cv_exeext" >&5
+echo "$as_me:1655: result: $ac_cv_exeext" >&5
echo "${ECHO_T}$ac_cv_exeext" >&6
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-echo "$as_me:1660: checking for object suffix" >&5
+echo "$as_me:1661: checking for object suffix" >&5
echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 1666 "configure"
+#line 1667 "configure"
#include "confdefs.h"
int
@@ -1675,10 +1676,10 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1678: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1679: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1681: \$? = $ac_status" >&5
+ echo "$as_me:1682: \$? = $ac_status" >&5
(exit $ac_status); }; then
for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
case $ac_file in
@@ -1690,24 +1691,24 @@ done
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:1693: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1694: error: cannot compute OBJEXT: cannot compile" >&5
echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-echo "$as_me:1700: result: $ac_cv_objext" >&5
+echo "$as_me:1701: result: $ac_cv_objext" >&5
echo "${ECHO_T}$ac_cv_objext" >&6
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-echo "$as_me:1704: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1705: checking whether we are using the GNU C compiler" >&5
echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 1710 "configure"
+#line 1711 "configure"
#include "confdefs.h"
int
@@ -1722,16 +1723,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1725: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1726: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1728: \$? = $ac_status" >&5
+ echo "$as_me:1729: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1731: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1732: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1734: \$? = $ac_status" >&5
+ echo "$as_me:1735: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_compiler_gnu=yes
else
@@ -1743,19 +1744,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:1746: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1747: result: $ac_cv_c_compiler_gnu" >&5
echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
GCC=`test $ac_compiler_gnu = yes && echo yes`
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
CFLAGS="-g"
-echo "$as_me:1752: checking whether $CC accepts -g" >&5
+echo "$as_me:1753: checking whether $CC accepts -g" >&5
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
if test "${ac_cv_prog_cc_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 1758 "configure"
+#line 1759 "configure"
#include "confdefs.h"
int
@@ -1767,16 +1768,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1770: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1771: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1773: \$? = $ac_status" >&5
+ echo "$as_me:1774: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1776: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1777: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1779: \$? = $ac_status" >&5
+ echo "$as_me:1780: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_g=yes
else
@@ -1786,7 +1787,7 @@ ac_cv_prog_cc_g=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:1789: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1790: result: $ac_cv_prog_cc_g" >&5
echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
@@ -1813,16 +1814,16 @@ cat >conftest.$ac_ext <<_ACEOF
#endif
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1816: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1817: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1819: \$? = $ac_status" >&5
+ echo "$as_me:1820: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
