xterm: Changes to 'debian-unstable'
INSTALL | 15
MANIFEST | 2
Makefile.in | 56
aclocal.m4 | 31
button.c | 18
charproc.c | 53
configure | 3193 +++++++++++++++++++++++------------------------
configure.in | 3
debian/changelog | 8
fontutils.c | 4
main.c | 53
misc.c | 9
package/debian/changelog | 6
package/freebsd/Makefile | 2
package/xterm.spec | 68 -
print.c | 38
ptyx.h | 14
util.c | 4
version.h | 6
xterm.log.html | 256 ++-
xterm.man | 100 +
xtermcfg.hin | 3
22 files changed, 2105 insertions(+), 1837 deletions(-)
New commits:
commit b80ee6a5e233d573e8e26eb539e8788416633274
Author: Sven Joachim <svenjoac@gmx.de>
Date: Tue May 28 20:00:25 2013 +0200
Close bug #707899
diff --git a/debian/changelog b/debian/changelog
index 31b2896..c5fc09e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xterm (293-1) UNRELEASED; urgency=low
* New upstream release.
+ - Improve description of initialFont, set-vt-font and set-tex-text
+ in manpage (Closes: #707899).
-- Sven Joachim <svenjoac@gmx.de> Tue, 28 May 2013 19:58:30 +0200
commit c32314ee15e6871fb9bf0d9eb78adf783c7ac32a
Author: Sven Joachim <svenjoac@gmx.de>
Date: Tue May 28 19:58:44 2013 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index 0098b11..31b2896 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (293-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Sven Joachim <svenjoac@gmx.de> Tue, 28 May 2013 19:58:30 +0200
+
xterm (292-1) unstable; urgency=low
* New upstream release.
commit 9d791112866a5ac58ae9bd05f41f277cb8c099c0
Author: Sven Joachim <svenjoac@gmx.de>
Date: Tue May 28 19:56:26 2013 +0200
Imported Upstream version 293
diff --git a/INSTALL b/INSTALL
index 1918578..c31726d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.143 2013/04/17 09:13:09 tom Exp $
+-- $XTermId: INSTALL,v 1.147 2013/05/27 22:19:09 tom Exp $
-------------------------------------------------------------------------------
-- Copyright 1997-2012,2013 by Thomas E. Dickey
--
@@ -625,6 +625,19 @@ The options (in alphabetic order):
small sizes. This is used for window decoration, e.g., the
icon at the upper left corner in many window managers.
+ --with-icon-symlink=NAME create symbolic links to icon name (default: NONE)
+
+ This is a workaround for certain systems which translate icon names
+ containing "xterm", e.g., "xterm-color" into the single icon "xterm".
+ The option should also be harmless on a properly configured system.
+
+ If the option is used, its default value is "xterm". For each icon,
+ the makefile will strip the suffix (e.g., ".png"), as well as the part
+ of the filename which denotes the size (e.g., "_32x32" in an xpm file),
+ and constructs a link with that name to the icon.
+
+ If the option is unused, its default value is "NONE" (no link is made).
+
--with-icondir=DIR directory in which to install icon files (default: no)
The X libraries may automatically search these locations:
diff --git a/MANIFEST b/MANIFEST
index 0ea4ed9..25e9cc5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-292, version xterm-292
+MANIFEST for xterm-293, version xterm-293
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index b35582f..f9c3f20 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.216 2013/01/03 01:33:29 tom Exp $
+## $XTermId: Makefile.in,v 1.219 2013/05/27 19:39:59 tom Exp $
# -----------------------------------------------------------------------------
# this file is part of xterm
#
@@ -83,11 +83,15 @@ pixmapdir = @PIXMAPDIR@
#### End of system configuration section. ####
+ICON_NAME = @ICON_NAME@
+ICON_SYMLINK = @ICON_SYMLINK@
+
DESTDIR =
BINDIR = $(DESTDIR)$(bindir)
LIBDIR = $(DESTDIR)$(libdir)
MANDIR = $(DESTDIR)$(mandir)
APPSDIR = $(DESTDIR)$(appsdir)
+
@no_icondir@ICONDIR = $(DESTDIR)$(icondir)
@no_pixmapdir@PIXMAPDIR = $(DESTDIR)$(pixmapdir)
@@ -267,17 +271,29 @@ APP_NAMES = XTerm UXTerm KOI8RXTerm
@no_icondir@install-icon \
@no_icondir@install-full :: $(ICONDIR)
@no_icondir@ ACTUAL_XTERM=$(actual_xterm) \
-@no_icondir@ $(SHELL) -c 'for n in $(ICON_LIST); \
-@no_icondir@ do \
-@no_icondir@ x=$$ACTUAL_XTERM; \
-@no_icondir@ l=`echo "$$n" | cut -f1 -d:`; \
-@no_icondir@ r=`echo "$$n" | cut -f2 -d: |sed -e s,@ICON_NAME@,$$x-color,`; \
-@no_icondir@ test -z "$$r" && continue; \
+@no_icondir@ $(SHELL) -c '\
@no_icondir@ h=$(ICONDIR)/$(ICON_THEME); \
-@no_icondir@ d=$$h/`echo "$$r" | sed -e "s,/[^/]*$$,,"`; \
-@no_icondir@ test -d "$$d" || mkdir -p "$$d"; \
-@no_icondir@ echo installing icon $$h/$$r; \
-@no_icondir@ $(INSTALL_DATA) $$l $$h/$$r; \
+@no_icondir@ for n in $(ICON_LIST); \
+@no_icondir@ do \
+@no_icondir@ x=$$ACTUAL_XTERM; \
+@no_icondir@ l=`echo "$$n" | cut -f1 -d:`; \
+@no_icondir@ r=`echo "$$n" | cut -f2 -d: |sed -e s,$(ICON_NAME),$$x-color,`; \
+@no_icondir@ test -z "$$r" && continue; \
+@no_icondir@ d=$$h/`echo "$$r" | sed -e "s,/[^/]*$$,,"`; \
+@no_icondir@ test -d "$$d" || mkdir -p "$$d"; \
+@no_icondir@ echo "installing icon $$h/$$r"; \
+@no_icondir@ $(INSTALL_DATA) $$l $$h/$$r; \
+@no_icondir@ s=`echo "$$r" | sed -e '"'s,^.*\.,.,'"'`; \
+@no_icondir@ t=$(ICON_SYMLINK)$$s; \
+@no_icondir@ b=`basename $$n $$s | sed -e "s,_[1-9][0-9]*x.*,,"`; \
+@no_icondir@ if test "$(ICON_SYMLINK)" != NONE ; then \
+@no_icondir@ if test "$$r" != "$$t" ; then \
+@no_icondir@ if test "x$$b" = "x$(ICON_NAME)" ; then \
+@no_icondir@ echo "linking $$r -> $$t"; \
+@no_icondir@ ( cd $$h; rm -f $$t; $(LN_S) $$r $$t; ) \
+@no_icondir@ fi \
+@no_icondir@ fi \
+@no_icondir@ fi \
@no_icondir@ done'
@no_icondir@ @echo "... installed icons"
@@ -285,11 +301,25 @@ APP_NAMES = XTerm UXTerm KOI8RXTerm
@no_pixmapdir@install-icon \
@no_pixmapdir@install-full :: $(PIXMAPDIR)
@no_pixmapdir@ ACTUAL_XTERM=$(actual_xterm) \
-@no_pixmapdir@ $(SHELL) -c 'for n in $(srcdir)/icons/*xterm*_32x32.xpm $(srcdir)/icons/*xterm*_48x48.xpm; \
+@no_pixmapdir@ $(SHELL) -c '\
+@no_pixmapdir@ h=$(PIXMAPDIR); \
+@no_pixmapdir@ for n in $(srcdir)/icons/*xterm*_32x32.xpm $(srcdir)/icons/*xterm*_48x48.xpm; \
@no_pixmapdir@ do \
@no_pixmapdir@ l=`basename $$n`; \
@no_pixmapdir@ r=`echo "$$l" | sed -e "s,xterm,$$ACTUAL_XTERM,"`; \
-@no_pixmapdir@ $(INSTALL_DATA) $(srcdir)/icons/$$l $(PIXMAPDIR)/$$r; \
+@no_pixmapdir@ echo "installing pixmap $$h/$$r"; \
+@no_pixmapdir@ $(INSTALL_DATA) $(srcdir)/icons/$$l $$h/$$r; \
+@no_pixmapdir@ s=`echo "$$r" | sed -e '"'s,^.*\.,.,'"'`; \
+@no_pixmapdir@ t=$(ICON_SYMLINK)$$s; \
+@no_pixmapdir@ b=`basename $$n $$s | sed -e "s,_[1-9][0-9]*x.*,,"`; \
+@no_pixmapdir@ if test "$(ICON_SYMLINK)" != NONE ; then \
+@no_pixmapdir@ if test "x$$r" != "$$t" ; then \
+@no_pixmapdir@ if test "x$$b" = "x$(ICON_NAME)" ; then \
+@no_pixmapdir@ echo "linking $$r -> $$t"; \
+@no_pixmapdir@ ( cd $$h; rm -f $$t; $(LN_S) $$r $$t; ) \
+@no_pixmapdir@ fi \
+@no_pixmapdir@ fi \
+@no_pixmapdir@ fi \
@no_pixmapdir@ done'
@no_pixmapdir@ @echo "... installed icons"
diff --git a/aclocal.m4 b/aclocal.m4
index f1ca69f..c25a90b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.362 2013/04/17 09:33:50 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.365 2013/05/27 22:36:25 tom Exp $
dnl
dnl ---------------------------------------------------------------------------
dnl
@@ -3191,7 +3191,7 @@ fi
AC_SUBST(no_icondir)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ICON_NAME version: 1 updated: 2012/08/25 19:05:08
+dnl CF_WITH_ICON_NAME version: 2 updated: 2013/05/27 18:34:42
dnl -----------------
dnl Allow a default icon-name to be overridden.
dnl $1 = default icon name
@@ -3206,9 +3206,36 @@ xyes|xno|x)
ICON_NAME=$1
;;
esac
+AC_SUBST(ICON_NAME)
AC_MSG_RESULT($ICON_NAME)
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_WITH_ICON_SYMLINK version: 1 updated: 2013/05/27 18:34:42
+dnl --------------------
+dnl Workaround for systems which are (mis)configured to map all icon references
+dnl for xterm into "xterm" name. For instance, recent (2013) KDE ignores both
+dnl the name given in the .desktop file (xterm-color) and the application name
+dnl (xterm-dev).
+dnl
+dnl $1 = default icon name to use if symlink is wanted
+AC_DEFUN([CF_WITH_ICON_SYMLINK],[
+AC_MSG_CHECKING(for icon symlink to use)
+AC_ARG_WITH(icon-symlink,
+ [ --with-icon-symlink=XXX make symbolic link for icon name (default: $1)],
+ [ICON_SYMLINK="$withval"],
+ [ICON_SYMLINK=NONE])
+case "x$ICON_SYMLINK" in
+xyes)
+ ICON_SYMLINK=$1
+ ;;
+xno|x)
+ ICON_SYMLINK=NONE
+ ;;
+esac
+AC_SUBST(ICON_SYMLINK)
+AC_MSG_RESULT($ICON_SYMLINK)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_WITH_ICON_THEME version: 9 updated: 2013/04/17 05:31:24
dnl ------------------
dnl If asked, check for prerequisites and setup symbols to permit installing
diff --git a/button.c b/button.c
index 91b9811..a72a856 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.454 2013/04/25 01:05:41 Taketo.Kabe Exp $ */
+/* $XTermId: button.c,v 1.456 2013/05/12 22:16:26 tom Exp $ */
/*
* Copyright 1999-2012,2013 by Thomas E. Dickey
@@ -1652,6 +1652,7 @@ CutBuffer(Atom code)
cutbuffer = -1;
break;
}
+ TRACE(("CutBuffer(%d) = %d\n", (int) code, cutbuffer));
return cutbuffer;
}
@@ -1713,10 +1714,10 @@ xtermGetSelection(Widget w,
line = XFetchBuffer(XtDisplay(w), &inbytes, cutbuffer);
nbytes = (unsigned long) inbytes;
- if (nbytes > 0)
+ if (nbytes > 0) {
SelectionReceived(w, NULL, &selection, &type, (XtPointer) line,
&nbytes, &fmt8);
- else if (num_params > 1) {
+ } else if (num_params > 1) {
xtermGetSelection(w, ev_time, params + 1, num_params - 1, NULL);
}
#if OPT_PASTE64
@@ -1724,7 +1725,6 @@ xtermGetSelection(Widget w,
FinishPaste64(xw);
}
#endif
- return;
} else {
struct _SelectionList *list;
@@ -2877,14 +2877,16 @@ static int
class_of(LineData * ld, CELL * cell)
{
CELL temp = *cell;
+ int result = 0;
#if OPT_DEC_CHRSET
if (CSET_DOUBLE(GetLineDblCS(ld))) {
temp.col /= 2;
}
#endif
- assert(temp.col < (int) ld->lineSize);
- return CharacterClass((int) (ld->charData[temp.col]));
+ if (temp.col < (int) ld->lineSize)
+ result = CharacterClass((int) (ld->charData[temp.col]));
+ return result;
}
#if OPT_WIDE_CHARS
@@ -2918,10 +2920,6 @@ okPosition(TScreen * screen,
result = False;
}
}
- if (cell->col > screen->max_col) {
- /* Clicked on rightmost edge of the screen. Clamp to max_col */
- cell->col = screen->max_col;
- }
return result;
}
diff --git a/charproc.c b/charproc.c
index a95f2f6..d407529 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1287 2013/04/24 09:07:06 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1289 2013/05/26 21:18:52 tom Exp $ */
/*
* Copyright 1999-2012,2013 by Thomas E. Dickey
@@ -3945,15 +3945,13 @@ v_write(int f, const Char * data, unsigned len)
return;
}
}
-#ifdef DEBUG
- if (debug) {
- fprintf(stderr, "v_write called with %d bytes (%d left over)",
- len, v_bufptr - v_bufstr);
+ if_DEBUG({
+ fprintf(stderr, "v_write called with %d bytes (%ld left over)",
+ len, (long) (v_bufptr - v_bufstr));
if (len > 1 && len < 10)
fprintf(stderr, " \"%.*s\"", len, (const char *) data);
fprintf(stderr, "\n");
- }
-#endif
+ });
#ifdef VMS
if ((1 << f) != pty_mask) {
@@ -3984,11 +3982,10 @@ v_write(int f, const Char * data, unsigned len)
if (v_bufstr != v_buffer) {
/* there is unused space, move everything down */
/* possibly overlapping memmove here */
-#ifdef DEBUG
- if (debug)
- fprintf(stderr, "moving data down %d\n",
- v_bufstr - v_buffer);
-#endif
+ if_DEBUG({
+ fprintf(stderr, "moving data down %ld\n",
+ (long) (v_bufstr - v_buffer));
+ });
memmove(v_buffer, v_bufstr, (size_t) (v_bufptr - v_bufstr));
v_bufptr -= v_bufstr - v_buffer;
v_bufstr = v_buffer;
@@ -3999,11 +3996,10 @@ v_write(int f, const Char * data, unsigned len)
unsigned size = (unsigned) (v_bufptr - v_buffer);
v_buffer = TypeRealloc(Char, size + len, v_buffer);
if (v_buffer) {
-#ifdef DEBUG
- if (debug)
+ if_DEBUG({
fprintf(stderr, "expanded buffer to %d\n",
size + len);
-#endif
+ });
v_bufstr = v_buffer;
v_bufptr = v_buffer + size;
v_bufend = v_bufptr + len;
@@ -4054,19 +4050,18 @@ v_write(int f, const Char * data, unsigned len)
if (riten < 0)
#endif /* VMS */
{
-#ifdef DEBUG
- if (debug)
+ if_DEBUG({
perror("write");
-#endif
+ });
riten = 0;
}
-#ifdef DEBUG
- if (debug)
- fprintf(stderr, "write called with %d, wrote %d\n",
- v_bufptr - v_bufstr <= MAX_PTY_WRITE ?
- v_bufptr - v_bufstr : MAX_PTY_WRITE,
+ if_DEBUG({
+ fprintf(stderr, "write called with %ld, wrote %d\n",
+ ((long) ((v_bufptr - v_bufstr) <= MAX_PTY_WRITE)
+ ? (long) (v_bufptr - v_bufstr)
+ : MAX_PTY_WRITE),
riten);
-#endif
+ });
v_bufstr += riten;
if (v_bufstr >= v_bufptr) /* we wrote it all */
v_bufstr = v_bufptr = v_buffer;
@@ -4086,10 +4081,9 @@ v_write(int f, const Char * data, unsigned len)
v_bufstr = v_buffer + start;
v_bufptr = v_buffer + size;
v_bufend = v_buffer + allocsize;
-#ifdef DEBUG
- if (debug)
+ if_DEBUG({
fprintf(stderr, "shrunk buffer to %d\n", allocsize);
-#endif
+ });
} else {
/* should we print a warning if couldn't return memory? */
v_buffer = v_bufstr - start; /* restore clobbered pointer */
@@ -6531,10 +6525,7 @@ VTExpose(Widget w GCC_UNUSED,
XEvent * event,
Region region GCC_UNUSED)
{
-#ifdef DEBUG
- if (debug)
- fputs("Expose\n", stderr);
-#endif /* DEBUG */
+ DEBUG_MSG("Expose\n");
if (event->type == Expose)
HandleExposure(term, event);
}
diff --git a/configure b/configure
index 613bd90..a8a7ba7 100755
--- a/configure
+++ b/configure
@@ -695,6 +695,7 @@ Compile/Install Options:
--with-app-class=XXX override X applications class (default XTerm)
--with-app-defaults=DIR directory in which to install resource files (EPREFIX/lib/X11/app-defaults)
--with-icon-name=XXXX override icon name (default: xterm-color)
+ --with-icon-symlink=XXX make symbolic link for icon name (default: xterm)
--with-pixmapdir=DIR directory in which to install pixmaps (DATADIR/pixmaps)
--with-icondir=DIR directory in which to install icons for desktop
--with-icon-theme=XXX install icons into desktop theme (hicolor)
@@ -985,7 +986,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:988: loading site script $ac_site_file" >&5
+ { echo "$as_me:989: 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"
@@ -996,7 +997,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:999: loading cache $cache_file" >&5
+ { echo "$as_me:1000: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1004,7 +1005,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
esac
fi
else
- { echo "$as_me:1007: creating cache $cache_file" >&5
+ { echo "$as_me:1008: creating cache $cache_file" >&5
echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -1020,21 +1021,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:1023: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ { echo "$as_me:1024: 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:1027: error: \`$ac_var' was not set in the previous run" >&5
+ { echo "$as_me:1028: 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:1033: error: \`$ac_var' has changed since the previous run:" >&5
+ { echo "$as_me:1034: 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:1035: former value: $ac_old_val" >&5
+ { echo "$as_me:1036: former value: $ac_old_val" >&5
echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:1037: current value: $ac_new_val" >&5
+ { echo "$as_me:1038: current value: $ac_new_val" >&5
echo "$as_me: current value: $ac_new_val" >&2;}
ac_cache_corrupted=:
fi;;
@@ -1053,9 +1054,9 @@ echo "$as_me: current value: $ac_new_val" >&2;}
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:1056: error: changes in the environment can compromise the build" >&5
+ { echo "$as_me:1057: 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:1058: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ { { echo "$as_me:1059: 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
@@ -1076,10 +1077,10 @@ esac
echo "#! $SHELL" >conftest.sh
echo "exit 0" >>conftest.sh
chmod +x conftest.sh
-if { (echo "$as_me:1079: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1080: PATH=\".;.\"; conftest.sh") >&5
(PATH=".;."; conftest.sh) 2>&5
ac_status=$?
- echo "$as_me:1082: \$? = $ac_status" >&5
+ echo "$as_me:1083: \$? = $ac_status" >&5
(exit $ac_status); }; then
ac_path_separator=';'
else
@@ -1107,7 +1108,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:1110: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ { { echo "$as_me:1111: 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
@@ -1117,11 +1118,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:1120: error: cannot run $ac_config_sub" >&5
+ { { echo "$as_me:1121: error: cannot run $ac_config_sub" >&5
echo "$as_me: error: cannot run $ac_config_sub" >&2;}
{ (exit 1); exit 1; }; }
-echo "$as_me:1124: checking build system type" >&5
+echo "$as_me:1125: 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
@@ -1130,16 +1131,16 @@ else
test -z "$ac_cv_build_alias" &&
ac_cv_build_alias=`$ac_config_guess`
test -z "$ac_cv_build_alias" &&
- { { echo "$as_me:1133: error: cannot guess build type; you must specify one" >&5
+ { { echo "$as_me:1134: 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:1137: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ { { echo "$as_me:1138: 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:1142: result: $ac_cv_build" >&5
+echo "$as_me:1143: 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/'`
@@ -1147,7 +1148,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:1150: checking host system type" >&5
+ echo "$as_me:1151: 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
@@ -1156,12 +1157,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:1159: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ { { echo "$as_me:1160: 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:1164: result: $ac_cv_host" >&5
+echo "$as_me:1165: 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/'`
@@ -1187,13 +1188,13 @@ else
fi
test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1190: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1191: 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:1194: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "$as_me:1195: 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:1196: error: \"Please remove config.cache and try again.\"" >&5
+ { { echo "$as_me:1197: 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
@@ -1218,7 +1219,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:1221: checking for $ac_word" >&5
+echo "$as_me:1222: 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
@@ -1233,7 +1234,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:1236: found $ac_dir/$ac_word" >&5
+echo "$as_me:1237: found $ac_dir/$ac_word" >&5
break
done
@@ -1241,10 +1242,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1244: result: $CC" >&5
+ echo "$as_me:1245: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1247: result: no" >&5
+ echo "$as_me:1248: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1253,7 +1254,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:1256: checking for $ac_word" >&5
+echo "$as_me:1257: 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
@@ -1268,7 +1269,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:1271: found $ac_dir/$ac_word" >&5
+echo "$as_me:1272: found $ac_dir/$ac_word" >&5
break
done
@@ -1276,10 +1277,10 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1279: result: $ac_ct_CC" >&5
+ echo "$as_me:1280: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1282: result: no" >&5
+ echo "$as_me:1283: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1292,7 +1293,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:1295: checking for $ac_word" >&5
+echo "$as_me:1296: 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
@@ -1307,7 +1308,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:1310: found $ac_dir/$ac_word" >&5
+echo "$as_me:1311: found $ac_dir/$ac_word" >&5
break
done
@@ -1315,10 +1316,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1318: result: $CC" >&5
+ echo "$as_me:1319: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1321: result: no" >&5
+ echo "$as_me:1322: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1327,7 +1328,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:1330: checking for $ac_word" >&5
+echo "$as_me:1331: 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
@@ -1342,7 +1343,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:1345: found $ac_dir/$ac_word" >&5
+echo "$as_me:1346: found $ac_dir/$ac_word" >&5
break
done
@@ -1350,10 +1351,10 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1353: result: $ac_ct_CC" >&5
+ echo "$as_me:1354: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1356: result: no" >&5
+ echo "$as_me:1357: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1366,7 +1367,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:1369: checking for $ac_word" >&5
+echo "$as_me:1370: 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
@@ -1386,7 +1387,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
continue
fi
ac_cv_prog_CC="cc"
-echo "$as_me:1389: found $ac_dir/$ac_word" >&5
+echo "$as_me:1390: found $ac_dir/$ac_word" >&5
break
done
@@ -1408,10 +1409,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1411: result: $CC" >&5
+ echo "$as_me:1412: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1414: result: no" >&5
+ echo "$as_me:1415: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1422,7 +1423,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:1425: checking for $ac_word" >&5
+echo "$as_me:1426: 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
@@ -1437,7 +1438,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:1440: found $ac_dir/$ac_word" >&5
+echo "$as_me:1441: found $ac_dir/$ac_word" >&5
break
done
@@ -1445,10 +1446,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1448: result: $CC" >&5
+ echo "$as_me:1449: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1451: result: no" >&5
+ echo "$as_me:1452: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1461,7 +1462,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:1464: checking for $ac_word" >&5
+echo "$as_me:1465: 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
@@ -1476,7 +1477,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:1479: found $ac_dir/$ac_word" >&5
+echo "$as_me:1480: found $ac_dir/$ac_word" >&5
break
done
@@ -1484,10 +1485,10 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1487: result: $ac_ct_CC" >&5
+ echo "$as_me:1488: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1490: result: no" >&5
+ echo "$as_me:1491: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1499,32 +1500,32 @@ fi
fi
-test -z "$CC" && { { echo "$as_me:1502: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1503: 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:1507:" \
+echo "$as_me:1508:" \
"checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1510: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1511: \"$ac_compiler --version </dev/null >&5\"") >&5
(eval $ac_compiler --version </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1513: \$? = $ac_status" >&5
+ echo "$as_me:1514: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1515: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1516: \"$ac_compiler -v </dev/null >&5\"") >&5
(eval $ac_compiler -v </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1518: \$? = $ac_status" >&5
+ echo "$as_me:1519: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1520: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1521: \"$ac_compiler -V </dev/null >&5\"") >&5
(eval $ac_compiler -V </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1523: \$? = $ac_status" >&5
+ echo "$as_me:1524: \$? = $ac_status" >&5
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
-#line 1527 "configure"
+#line 1528 "configure"
#include "confdefs.h"
int
@@ -1540,13 +1541,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:1543: checking for C compiler default output" >&5
+echo "$as_me:1544: 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:1546: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1547: \"$ac_link_default\"") >&5
(eval $ac_link_default) 2>&5
ac_status=$?
- echo "$as_me:1549: \$? = $ac_status" >&5
+ echo "$as_me:1550: \$? = $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
@@ -1569,34 +1570,34 @@ done
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:1572: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1573: 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:1578: result: $ac_file" >&5
+echo "$as_me:1579: 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:1583: checking whether the C compiler works" >&5
+echo "$as_me:1584: 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:1589: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1590: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1592: \$? = $ac_status" >&5
+ echo "$as_me:1593: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { echo "$as_me:1599: error: cannot run C compiled programs.
+ { { echo "$as_me:1600: 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;}
@@ -1604,24 +1605,24 @@ If you meant to cross compile, use \`--host'." >&2;}
fi
fi
fi
-echo "$as_me:1607: result: yes" >&5
+echo "$as_me:1608: 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:1614: checking whether we are cross compiling" >&5
+echo "$as_me:1615: checking whether we are cross compiling" >&5
echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1616: result: $cross_compiling" >&5
+echo "$as_me:1617: result: $cross_compiling" >&5
echo "${ECHO_T}$cross_compiling" >&6
-echo "$as_me:1619: checking for executable suffix" >&5
+echo "$as_me:1620: checking for executable suffix" >&5
echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1621: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1622: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:1624: \$? = $ac_status" >&5
+ echo "$as_me:1625: \$? = $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
@@ -1637,25 +1638,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
esac
done
else
- { { echo "$as_me:1640: error: cannot compute EXEEXT: cannot compile and link" >&5
+ { { echo "$as_me:1641: 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:1646: result: $ac_cv_exeext" >&5
+echo "$as_me:1647: 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:1652: checking for object suffix" >&5
+echo "$as_me:1653: 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 1658 "configure"
+#line 1659 "configure"
#include "confdefs.h"
int
@@ -1667,10 +1668,10 @@ main ()
}
_ACEOF
Reply to: