INSTALL | 12
MANIFEST | 2
THANKS | 6
Tekproc.c | 8
aclocal.m4 | 68
charproc.c | 27
config.guess | 164 -
config.sub | 15
configure | 6077 +++++++++++++++++++++++++++++------------------
debian/changelog | 6
fontutils.c | 4
graphics.c | 125
graphics.h | 4
graphics_regis.c | 3600 +++++++++++++++++++++++----
main.c | 6
menu.c | 14
package/debian/changelog | 6
package/debian/rules | 2
package/freebsd/Makefile | 2
package/xterm.spec | 5
scrollbar.c | 40
version.h | 6
xterm.h | 6
xterm.log.html | 62
24 files changed, 7128 insertions(+), 3139 deletions(-)
New commits:
commit 49783fb745b0a9b0f5b8adf0a234d0971e367521
Author: Sven Joachim <svenj...@gmx.de>
Date: Fri Jul 25 17:00:52 2014 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index 4cde7b8..411b83a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (309-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Sven Joachim <svenj...@gmx.de> Fri, 25 Jul 2014 17:00:31 +0200
+
xterm (308-1) unstable; urgency=medium
* New upstream release.
commit fffb2571529ed6c77a752cc64711ff70d6ef10ea
Author: Sven Joachim <svenj...@gmx.de>
Date: Fri Jul 25 16:56:41 2014 +0200
Imported Upstream version 309
diff --git a/INSTALL b/INSTALL
index 66336c4..4d442d2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.151 2014/05/08 07:58:06 tom Exp $
+-- $XTermId: INSTALL,v 1.152 2014/07/12 22:40:36 Steve.Wall Exp $
-------------------------------------------------------------------------------
-- Copyright 1997-2013,2014 by Thomas E. Dickey
--
@@ -461,7 +461,7 @@ The options (in alphabetic order):
--enable-narrowproto enable narrow prototypes for X libraries
- Originally xterm was built using imake rather than a configure script.
+ Originally xterm was built using imake rather than a configure script.
One feature of imake that is not possible to guess within the
configure script is the wide-prototype compile-time definition
NARROWPROTO. When this is not set properly, the Athena widget
@@ -540,6 +540,10 @@ The options (in alphabetic order):
Look for, compile and link with the Xaw 3d widget library.
+ --with-Xaw3dxft link with Xaw 3d xft library
+
+ Look for, compile and link with the Xaw 3d xft widget library.
+
--with-XawPlus link with Athena-Plus library
Look for, compile and link with the Xaw Plus widget library.
@@ -601,7 +605,7 @@ The options (in alphabetic order):
just one of the variations:
"pkg*", e.g., pkg-config or pkgconfig uses whatever pkg-config
- script was found.
+ script was found.
otherwise, the parameter value is used as the name of the script
to try, using --cflags and --libs options.
@@ -724,7 +728,7 @@ The options (in alphabetic order):
If xterm is installed setuid'd to root, change the group of the tty
device to the given value on startup. Three cases are possible:
-
+
a) If this option is not given, the configure script will attempt to
find a suitable value (usually "tty"), and verify that it exists in
the group database.
diff --git a/MANIFEST b/MANIFEST
index 1cfa15b..06f60d1 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-308, version xterm-308
+MANIFEST for xterm-309, version xterm-309
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/THANKS b/THANKS
index 1b83740..e953827 100644
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
--- $XTermId: THANKS,v 1.12 2014/03/03 19:31:41 tom Exp $
+-- $XTermId: THANKS,v 1.14 2014/07/12 14:41:17 tom Exp $
-- vile:txtmode fk=8bit
There's no AUTHORS file in this distribution; it would be redundant since
I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996.
@@ -157,7 +157,7 @@ Rob Braun
Robert Brady
Robert Earl
Robin Cutshaw
-Romain Francois
+Romain Francoise
Ross Combs
Ross Paterson
Ryan Johnson
@@ -167,7 +167,7 @@ Sergei Laskavy
Sergey Vlasov
Slava Semushin
Stefan Dirsch
-Steve Wall
+Stephen P Wall
Stuart Lissaman
Sven Verdoolaege
Taketo Kabe
diff --git a/Tekproc.c b/Tekproc.c
index 5289bc0..6f8da47 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.196 2014/04/12 00:55:22 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.198 2014/07/12 22:55:02 tom Exp $ */
/*
* Copyright 2001-2012,2014 by Thomas E. Dickey
@@ -90,6 +90,8 @@
#include <X11/Xaw/Form.h>
#elif defined(HAVE_LIB_XAW3D)
#include <X11/Xaw3d/Form.h>
+#elif defined(HAVE_LIB_XAW3DXFT)
+#include <X11/Xaw3dxft/Form.h>
#elif defined(HAVE_LIB_NEXTAW)
#include <X11/neXtaw/Form.h>
#elif defined(HAVE_LIB_XAWPLUS)
@@ -924,7 +926,7 @@ TekConfigure(Widget w)
/*ARGSUSED*/
void
TekExpose(Widget w,
- XEvent * event GCC_UNUSED,
+ XEvent *event GCC_UNUSED,
Region region GCC_UNUSED)
{
TekWidget tw = getTekWidget(w);
@@ -1936,7 +1938,7 @@ TekCopy(TekWidget tw)
/*ARGSUSED*/
void
HandleGINInput(Widget w,
- XEvent * event GCC_UNUSED,
+ XEvent *event GCC_UNUSED,
String *param_list,
Cardinal *nparamsp)
{
diff --git a/aclocal.m4 b/aclocal.m4
index 358972b..dff8843 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.373 2014/04/14 19:16:55 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.376 2014/07/13 18:36:02 tom Exp $
dnl
dnl ---------------------------------------------------------------------------
dnl
@@ -58,7 +58,7 @@ AC_DEFUN([AM_LANGINFO_CODESET],
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56
+dnl CF_ACVERSION_CHECK version: 5 updated: 2014/06/04 19:11:49
dnl ------------------
dnl Conditionally generate script according to whether we're using a given
autoconf.
dnl
@@ -67,7 +67,7 @@ dnl $2 = code to use if AC_ACVERSION is at least as high as
$1.
dnl $3 = code to use if AC_ACVERSION is older than $1.
define([CF_ACVERSION_CHECK],
[
-ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl
+ifdef([AC_ACVERSION],
,[ifdef([AC_AUTOCONF_VERSION],[m4_copy([AC_AUTOCONF_VERSION],[AC_ACVERSION])],[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])])dnl
ifdef([m4_version_compare],
[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
[CF_ACVERSION_COMPARE(
@@ -180,13 +180,31 @@ dnl $1 = library to add, without the "-l"
dnl $2 = variable to update (default $LIBS)
AC_DEFUN([CF_ADD_LIB],[CF_ADD_LIBS(-l$1,ifelse($2,,LIBS,[$2]))])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ADD_LIBS version: 1 updated: 2010/06/02 05:03:05
+dnl CF_ADD_LIBS version: 2 updated: 2014/07/13 14:33:27
dnl -----------
-dnl Add one or more libraries, used to enforce consistency.
+dnl Add one or more libraries, used to enforce consistency. Libraries are
+dnl prepended to an existing list, since their dependencies are assumed to
+dnl already exist in the list.
dnl
dnl $1 = libraries to add, with the "-l", etc.
dnl $2 = variable to update (default $LIBS)
-AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1
[$]ifelse($2,,LIBS,[$2])"])dnl
+AC_DEFUN([CF_ADD_LIBS],[
+cf_add_libs="$1"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in [$]ifelse($2,,LIBS,[$2])
+do
+ for cf_add_2lib in $cf_add_libs
+ do
+ if test "x$cf_add_1lib" = "x$cf_add_2lib"
+ then
+ cf_add_1lib=
+ break
+ fi
+ done
+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+ifelse($2,,LIBS,[$2])="$cf_add_libs"
+])dnl
dnl ---------------------------------------------------------------------------
dnl CF_ADD_LIB_AFTER version: 3 updated: 2013/07/09 21:27:22
dnl ----------------
@@ -1841,7 +1859,7 @@ done
])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_PROG_CC version: 3 updated: 2012/10/06 15:31:55
+dnl CF_PROG_CC version: 4 updated: 2014/07/12 18:57:58
dnl ----------
dnl standard check for CC, plus followup sanity checks
dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name
@@ -1851,7 +1869,7 @@ CF_GCC_VERSION
CF_ACVERSION_CHECK(2.52,
[AC_PROG_CC_STDC],
[CF_ANSI_CC_REQD])
-CF_CC_ENV_FLAGS
+CF_CC_ENV_FLAGS
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_PROG_GROFF version: 1 updated: 2013/01/02 20:37:18
@@ -3284,11 +3302,11 @@ 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 CF_WITH_ICON_THEME version: 10 updated: 2014/07/12 18:57:58
dnl ------------------
dnl If asked, check for prerequisites and setup symbols to permit installing
dnl one or more application icons in the Red Hat icon-theme directory
-dnl hierarchy.
+dnl hierarchy.
dnl
dnl If the prerequisites are missing, give a warning and revert to the long-
dnl standing pixmaps directory.
@@ -3871,7 +3889,7 @@ make an error
fi
])
dnl ---------------------------------------------------------------------------
-dnl CF_X_ATHENA version: 21 updated: 2013/07/06 21:27:06
+dnl CF_X_ATHENA version: 22 updated: 2014/07/12 18:57:58
dnl -----------
dnl Check for Xaw (Athena) libraries
dnl
@@ -3891,6 +3909,17 @@ else
AC_MSG_RESULT(no)
fi
+AC_MSG_CHECKING(if you want to link with Xaw 3d xft library)
+withval=
+AC_ARG_WITH(Xaw3dxft,
+ [ --with-Xaw3dxft link with Xaw 3d xft library])
+if test "$withval" = yes ; then
+ cf_x_athena=Xaw3dxft
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+
AC_MSG_CHECKING(if you want to link with neXT Athena library)
withval=
AC_ARG_WITH(neXtaw,
@@ -4280,15 +4309,28 @@ AC_SUBST(HAVE_TYPE_FCCHAR32)
AC_SUBST(HAVE_TYPE_XFTCHARSPEC)
])
dnl ---------------------------------------------------------------------------
-dnl CF_X_TOOLKIT version: 21 updated: 2012/10/04 06:57:36
+dnl CF_X_TOOLKIT version: 22 updated: 2014/07/13 14:33:27
dnl ------------
dnl Check for X Toolkit libraries
-dnl
AC_DEFUN([CF_X_TOOLKIT],
[
AC_REQUIRE([AC_PATH_XTRA])
AC_REQUIRE([CF_CHECK_CACHE])
+# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new), and (and
+# in some cases has installed dummy files in the former, other cases replaced
+# it with a link to the new location). This complicates the configure script.
+# Check for that pitfall, and recover using pkg-config
+#
+# If none of these are set, the configuration is almost certainly broken.
+if test -z "${X_CFLAGS}${X_PRE_LIBS}${X_LIBS}${X_EXTRA_LIBS}"
+then
+ CF_TRY_PKG_CONFIG(x11,,[AC_MSG_WARN(unable to find X11 library)])
+ CF_TRY_PKG_CONFIG(ice,,[AC_MSG_WARN(unable to find ICE library)])
+ CF_TRY_PKG_CONFIG(sm,,[AC_MSG_WARN(unable to find SM library)])
+ CF_TRY_PKG_CONFIG(xt,,[AC_MSG_WARN(unable to find Xt library)])
+fi
+
cf_have_X_LIBS=no
CF_TRY_PKG_CONFIG(xt,[
diff --git a/charproc.c b/charproc.c
index eb7a118..4faed18 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1363 2014/06/13 00:53:14 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1367 2014/07/12 22:49:54 Steve.Wall Exp $ */
/*
* Copyright 1999-2013,2014 by Thomas E. Dickey
@@ -94,6 +94,8 @@
#include <X11/Xaw/XawImP.h>
#elif defined(HAVE_LIB_XAW3D)
#include <X11/Xaw3d/XawImP.h>
+#elif defined(HAVE_LIB_XAW3DXFT)
+#include <X11/Xaw3dxft/XawImP.h>
#elif defined(HAVE_LIB_NEXTAW)
#include <X11/neXtaw/XawImP.h>
#elif defined(HAVE_LIB_XAWPLUS)
@@ -544,7 +546,7 @@ static XtResource xterm_resources[] =
#if OPT_BLINK_CURS
Bres(XtNcursorBlink, XtCCursorBlink, screen.cursor_blink, False),
#endif
- Bres(XtNcursorUnderline, XtCCursorUnderline, screen.cursor_underline,
False),
+ Bres(XtNcursorUnderLine, XtCCursorUnderLine, screen.cursor_underline,
False),
#if OPT_BLINK_TEXT
Bres(XtNshowBlinkAsBold, XtCCursorBlink, screen.blink_as_bold,
DEFBLINKASBOLD),
@@ -3394,7 +3396,8 @@ doparsing(XtermWidget xw, unsigned c, struct ParseState
*sp)
change = False;
break;
}
-
+ TRACE(("cursor_shape:%d blinks:%s\n",
+ screen->cursor_shape, BtoS(blinks)));
if (change) {
xtermSetCursorBox(screen);
screen->cursor_blink_esc = blinks;
@@ -7495,6 +7498,11 @@ initializeKeyboardType(XtermWidget xw)
: keyboardIsDefault;
}
+#define InitCursorShape(target, source) \
+ target->cursor_shape = source->cursor_underline \
+ ? CURSOR_UNDERLINE \
+ : CURSOR_BLOCK
+
/* ARGSUSED */
static void
VTInitialize(Widget wrequest,
@@ -7724,10 +7732,12 @@ VTInitialize(Widget wrequest,
init_Ires(screen.blink_off);
TScreenOf(wnew)->cursor_blink_res = TScreenOf(wnew)->cursor_blink;
#endif
+ init_Bres(screen.cursor_underline);
/* resources allow for underline or block, not (yet) bar */
- TScreenOf(wnew)->cursor_shape = request->screen.cursor_underline
- ? CURSOR_UNDERLINE
- : CURSOR_BLOCK;
+ InitCursorShape(TScreenOf(wnew), TScreenOf(request));
+ TRACE(("cursor_shape:%d blinks:%s\n",
+ TScreenOf(wnew)->cursor_shape,
+ BtoS(TScreenOf(wnew)->cursor_blink)));
#if OPT_BLINK_TEXT
init_Ires(screen.blink_as_bold);
#endif
@@ -10366,7 +10376,10 @@ ReallyReset(XtermWidget xw, Bool full, Bool saved)
/* make cursor visible */
screen->cursor_set = ON;
- screen->cursor_shape = CURSOR_BLOCK;
+ InitCursorShape(screen, screen);
+ TRACE(("cursor_shape:%d blinks:%s\n",
+ screen->cursor_shape,
+ BtoS(screen->cursor_blink)));
/* reset scrolling region */
reset_margins(screen);
diff --git a/config.guess b/config.guess
index 9afd676..1f5c50c 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2013-11-29'
+timestamp='2014-03-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +149,7 @@ Linux|GNU|GNU/*)
LIBC=gnu
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's,
,,g'`
;;
esac
@@ -826,7 +826,7 @@ EOF
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
- i*:MSYS*:*)
+ *:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i*:windows32*:*)
@@ -969,10 +969,10 @@ EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
- or1k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ openrisc*:Linux:*:*)
+ echo or1k-unknown-linux-${LIBC}
exit ;;
- or32:Linux:*:*)
+ or32:Linux:*:* | or1k*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
@@ -1371,154 +1371,6 @@ EOF
exit ;;
esac
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know.... */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
- "4"
-#else
- ""
-#endif
- ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
- if (version < 4)
- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
- else
- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
- printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
- printf ("ns32k-encore-mach\n"); exit (0);
-#else
- printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
- printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
- printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
- struct utsname un;
-
- uname(&un);
-
- if (strncmp(un.version, "V2", 2) == 0) {
- printf ("i386-sequent-ptx2\n"); exit (0);
- }
- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
- printf ("i386-sequent-ptx1\n"); exit (0);
- }
- printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-# include <sys/param.h>
-# if defined (BSD)
-# if BSD == 43
- printf ("vax-dec-bsd4.3\n"); exit (0);
-# else
-# if BSD == 199006
- printf ("vax-dec-bsd4.3reno\n"); exit (0);
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# endif
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# else
- printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
- printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
- exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
- { echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
- case `getsysinfo -f cpu_type` in
- c1*)
- echo c1-convex-bsd
- exit ;;
- c2*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
- exit ;;
- c34*)
- echo c34-convex-bsd
- exit ;;
- c38*)
- echo c38-convex-bsd
- exit ;;
- c4*)
- echo c4-convex-bsd
- exit ;;
- esac
-fi
-
cat >&2 <<EOF
$0: unable to guess system type
diff --git a/config.sub b/config.sub
index 61cb4bc..6acbfac 100755
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2013-10-01'
+timestamp='2014-04-03'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patc...@gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -296,8 +296,7 @@ case $basic_machine in
| nds32 | nds32le | nds32be \
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
- | open8 \
- | or1k | or32 \
+ | open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
@@ -415,6 +414,7 @@ case $basic_machine in
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
+ | or1k*-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -1376,7 +1376,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* |
-tirtos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1594,9 +1594,6 @@ case $basic_machine in
mips*-*)
os=-elf
;;
- or1k-*)
- os=-elf
- ;;
or32-*)
os=-coff
;;
diff --git a/configure b/configure
index 0ea37c7..fa2bf87 100755
--- a/configure
+++ b/configure
@@ -714,6 +714,7 @@ Compile/Install Options:
--with-pkg-config{=path} enable/disable use of pkg-config
--with-xpm=DIR use Xpm library for colored icon, may specify path
--with-Xaw3d link with Xaw 3d library
+ --with-Xaw3dxft link with Xaw 3d xft library
--with-neXtaw link with neXT Athena library
--with-XawPlus link with Athena-Plus library
--enable-narrowproto enable narrow prototypes for X libraries
@@ -989,7 +990,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:992: loading site script $ac_site_file" >&5
+ { echo "$as_me:993: 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"
@@ -1000,7 +1001,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:1003: loading cache $cache_file" >&5
+ { echo "$as_me:1004: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1008,7 +1009,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
esac
fi
else
- { echo "$as_me:1011: creating cache $cache_file" >&5
+ { echo "$as_me:1012: creating cache $cache_file" >&5
echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -1024,21 +1025,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:1027: error: \`$ac_var' was set to \`$ac_old_val' in the
previous run" >&5
+ { echo "$as_me:1028: 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:1031: error: \`$ac_var' was not set in the previous run"
>&5
+ { echo "$as_me:1032: 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:1037: error: \`$ac_var' has changed since the previous
run:" >&5
+ { echo "$as_me:1038: 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:1039: former value: $ac_old_val" >&5
+ { echo "$as_me:1040: former value: $ac_old_val" >&5
echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:1041: current value: $ac_new_val" >&5
+ { echo "$as_me:1042: current value: $ac_new_val" >&5
echo "$as_me: current value: $ac_new_val" >&2;}
ac_cache_corrupted=:
fi;;
@@ -1057,9 +1058,9 @@ echo "$as_me: current value: $ac_new_val" >&2;}
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:1060: error: changes in the environment can compromise the
build" >&5
+ { echo "$as_me:1061: 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:1062: error: run \`make distclean' and/or \`rm $cache_file'
and start over" >&5
+ { { echo "$as_me:1063: 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
@@ -1080,10 +1081,10 @@ esac
echo "#! $SHELL" >conftest.sh
echo "exit 0" >>conftest.sh
chmod +x conftest.sh
-if { (echo "$as_me:1083: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1084: PATH=\".;.\"; conftest.sh") >&5
(PATH=".;."; conftest.sh) 2>&5
ac_status=$?
- echo "$as_me:1086: \$? = $ac_status" >&5
+ echo "$as_me:1087: \$? = $ac_status" >&5
(exit $ac_status); }; then
ac_path_separator=';'
else
@@ -1111,7 +1112,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:1114: error: cannot find install-sh or install.sh in
$srcdir $srcdir/.. $srcdir/../.." >&5
+ { { echo "$as_me:1115: 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
@@ -1121,11 +1122,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:1124: error: cannot run $ac_config_sub" >&5
+ { { echo "$as_me:1125: error: cannot run $ac_config_sub" >&5
echo "$as_me: error: cannot run $ac_config_sub" >&2;}
{ (exit 1); exit 1; }; }
-echo "$as_me:1128: checking build system type" >&5
+echo "$as_me:1129: 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
@@ -1134,16 +1135,16 @@ else
test -z "$ac_cv_build_alias" &&
ac_cv_build_alias=`$ac_config_guess`
test -z "$ac_cv_build_alias" &&
- { { echo "$as_me:1137: error: cannot guess build type; you must specify one"
>&5
+ { { echo "$as_me:1138: 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:1141: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ { { echo "$as_me:1142: 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:1146: result: $ac_cv_build" >&5
+echo "$as_me:1147: 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/'`
@@ -1151,7 +1152,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:1154: checking host system type" >&5
+ echo "$as_me:1155: 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
@@ -1160,12 +1161,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:1163: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ { { echo "$as_me:1164: 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:1168: result: $ac_cv_host" >&5
+echo "$as_me:1169: 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/'`
@@ -1191,13 +1192,13 @@ else
fi
test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1194: result: Configuring for
$cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1195: 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:1198: result: Cached system name ($system_name) does not
agree with actual ($cf_cv_system_name)" >&5
+ echo "$as_me:1199: 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:1200: error: \"Please remove config.cache and try
again.\"" >&5
+ { { echo "$as_me:1201: 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
@@ -1222,7 +1223,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:1225: checking for $ac_word" >&5
+echo "$as_me:1226: 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
@@ -1237,7 +1238,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:1240: found $ac_dir/$ac_word" >&5
+echo "$as_me:1241: found $ac_dir/$ac_word" >&5
break
done
@@ -1245,10 +1246,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1248: result: $CC" >&5
+ echo "$as_me:1249: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1251: result: no" >&5
+ echo "$as_me:1252: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1257,7 +1258,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:1260: checking for $ac_word" >&5
+echo "$as_me:1261: 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
@@ -1272,7 +1273,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:1275: found $ac_dir/$ac_word" >&5
+echo "$as_me:1276: found $ac_dir/$ac_word" >&5
break
done
@@ -1280,10 +1281,10 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1283: result: $ac_ct_CC" >&5
+ echo "$as_me:1284: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1286: result: no" >&5
+ echo "$as_me:1287: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1296,7 +1297,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:1299: checking for $ac_word" >&5
+echo "$as_me:1300: 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
@@ -1311,7 +1312,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:1314: found $ac_dir/$ac_word" >&5
+echo "$as_me:1315: found $ac_dir/$ac_word" >&5
break
done
@@ -1319,10 +1320,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1322: result: $CC" >&5
+ echo "$as_me:1323: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1325: result: no" >&5
+ echo "$as_me:1326: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1331,7 +1332,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:1334: checking for $ac_word" >&5
+echo "$as_me:1335: 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
@@ -1346,7 +1347,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:1349: found $ac_dir/$ac_word" >&5
+echo "$as_me:1350: found $ac_dir/$ac_word" >&5
break
done
@@ -1354,10 +1355,10 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1357: result: $ac_ct_CC" >&5
+ echo "$as_me:1358: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1360: result: no" >&5
+ echo "$as_me:1361: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1370,7 +1371,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:1373: checking for $ac_word" >&5
+echo "$as_me:1374: 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
@@ -1390,7 +1391,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
continue
fi
ac_cv_prog_CC="cc"
-echo "$as_me:1393: found $ac_dir/$ac_word" >&5
+echo "$as_me:1394: found $ac_dir/$ac_word" >&5
break
done
@@ -1412,10 +1413,10 @@ fi
fi
CC=$ac_cv_prog_CC
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xah4c-0005wv...@moszumanska.debian.org
