INSTALL | 19 MANIFEST | 2 Tekproc.c | 4 aclocal.m4 | 108 + charproc.c | 22 configure | 2980 ++++++++++++++++++++++++----------------------- configure.in | 4 ctlseqs.ms | 48 ctlseqs.txt | 36 debian/changelog | 4 fontutils.c | 31 main.c | 28 menu.c | 6 menu.h | 10 misc.c | 250 +++ package/debian/changelog | 6 package/xterm.spec | 4 ptyx.h | 5 scrollbar.c | 4 trace.c | 13 trace.h | 11 util.c | 5 version.h | 4 xstrings.c | 6 xterm.h | 6 xterm.log.html | 48 xterm.man | 29 xtermcap.h | 6 xtermcfg.hin | 6 29 files changed, 2095 insertions(+), 1610 deletions(-)
New commits: commit f5d18646dfcb374ca40da64584a8625d7fc96b3a Author: Julien Cristau <jcris...@debian.org> Date: Wed Sep 7 20:53:07 2011 +0200 Bump changelog diff --git a/debian/changelog b/debian/changelog index 23aaac3..f3b052b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xterm (273-1) UNRELEASED; urgency=low +xterm (274-1) UNRELEASED; urgency=low [ Timo Aaltonen ] * Install .desktop files again. (Closes: #486317, LP: #129041) @@ -20,7 +20,7 @@ xterm (273-1) UNRELEASED; urgency=low - Disable rmm and smm features in xterm terminfo entry to match the behavior in ncurses-base (see #574396). - -- Julien Cristau <jcris...@debian.org> Sun, 28 Aug 2011 18:00:26 +0200 + -- Julien Cristau <jcris...@debian.org> Wed, 07 Sep 2011 20:52:57 +0200 xterm (271-1) unstable; urgency=low commit b7466d18be04cf6f831536156f12940e07d5a3bb Author: Julien Cristau <jcris...@debian.org> Date: Wed Sep 7 20:43:35 2011 +0200 Imported Upstream version 274 diff --git a/INSTALL b/INSTALL index 028375a..c8f28eb 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ --- $XTermId: INSTALL,v 1.125 2011/07/07 01:01:14 tom Exp $ +-- $XTermId: INSTALL,v 1.126 2011/08/30 09:51:01 tom Exp $ ------------------------------------------------------------------------------- -- Copyright 1997-2010,2011 by Thomas E. Dickey -- @@ -537,6 +537,23 @@ The options (in alphabetic order): at existing ".desktop" files for xterm and common terminal emulators, to use those. + --with-freetype-config configure script to use for FreeType + + Use a specific option value to tell the configure script to try + just one of the variations: + + "pkg*", e.g., pkg-config or pkgconfig uses whatever pkg-config + script was found. + + otherwise, the parameter value is used as the name of the script + to try, using --cflags and --libs options. + + Use --without-freetype-config to enable the --with-freetype-cflags + and --with-freetype-libs options. + + The default value "auto" tells the configure script to try the + pkg-config script first, then freetype-config and finally xft-config. + --with-freetype-cflags -D/-I options for compiling with FreeType library Override options provided by xft-config or freetype-config. diff --git a/MANIFEST b/MANIFEST index 083ef51..470da66 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,4 @@ -MANIFEST for xterm-273, version xterm-273 +MANIFEST for xterm-274, version xterm-274 -------------------------------------------------------------------------------- MANIFEST this file 256colres.h resource-definitions for 256-color mode diff --git a/Tekproc.c b/Tekproc.c index f07831e..1aa9282 100644 --- a/Tekproc.c +++ b/Tekproc.c @@ -1,4 +1,4 @@ -/* $XTermId: Tekproc.c,v 1.189 2011/07/10 22:19:32 tom Exp $ */ +/* $XTermId: Tekproc.c,v 1.190 2011/09/03 12:13:42 tom Exp $ */ /* * Copyright 2001-2010,2011 by Thomas E. Dickey @@ -826,7 +826,7 @@ Tinput(TekWidget tw) TCursorToggle(tw, TOGGLE); Ttoggled = False; } - if (XtAppPending(app_con) & XtIMXEvent) { + if (xtermAppPending() & XtIMXEvent) { #ifdef VMS Tselect_mask = X_mask; #else /* VMS */ diff --git a/aclocal.m4 b/aclocal.m4 index a78eb7e..f77b1d7 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $XTermId: aclocal.m4,v 1.310 2011/07/17 19:28:03 tom Exp $ +dnl $XTermId: aclocal.m4,v 1.313 2011/09/04 21:20:20 tom Exp $ dnl dnl --------------------------------------------------------------------------- dnl @@ -574,7 +574,7 @@ int main() { fi ])])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_TGETENT version: 17 updated: 2011/07/14 19:34:47 +dnl CF_FUNC_TGETENT version: 18 updated: 2011/08/09 21:06:37 dnl --------------- dnl Check for tgetent function in termcap library. If we cannot find this, dnl we'll use the $LINES and $COLUMNS environment variables to pass screen @@ -621,7 +621,7 @@ AC_CACHE_CHECK(for $cf_test_message function,cf_cv_lib_tgetent,[ cf_save_LIBS="$LIBS" cf_cv_lib_tgetent=no if test "$cf_full_tgetent" = yes ; then - cf_TERMLIB="termcap termlib ncurses curses" + cf_TERMLIB="otermcap termcap termlib ncurses curses" cf_TERMTST="buffer[[0]] == 0" else cf_TERMLIB="termlib ncurses curses" @@ -2048,7 +2048,7 @@ cf_cv_struct_lastlog=unknown])]) test $cf_cv_struct_lastlog != no && AC_DEFINE(USE_STRUCT_LASTLOG) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SVR4 version: 3 updated: 2000/05/31 10:16:52 +dnl CF_SVR4 version: 4 updated: 2011/09/04 17:17:53 dnl ------- dnl Check if this is an SVR4 system. We need the definition for xterm AC_DEFUN([CF_SVR4], @@ -2056,6 +2056,9 @@ AC_DEFUN([CF_SVR4], AC_CHECK_LIB(elf, elf_begin,[ AC_CACHE_CHECK(if this is an SVR4 system, cf_cv_svr4,[ AC_TRY_COMPILE([ +#if defined(__CYGWIN__) +make an error +#endif #include <elf.h> #include <sys/termio.h> ],[ @@ -3018,7 +3021,7 @@ AC_TRY_LINK([ test "$cf_cv_xkb_bell_ext" = yes && AC_DEFINE(HAVE_XKB_BELL_EXT) ]) dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 36 updated: 2011/07/02 15:36:04 +dnl CF_XOPEN_SOURCE version: 37 updated: 2011/08/06 20:32:05 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl or adapt to the vendor's definitions to get equivalent functionality, @@ -3070,7 +3073,7 @@ mirbsd*) #(vi # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h> ;; netbsd*) #(vi - # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw + cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ;; openbsd*) #(vi # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw @@ -3261,7 +3264,7 @@ elif test "$cf_x_athena_inc" != default ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA_LIBS version: 11 updated: 2011/07/17 15:25:45 +dnl CF_X_ATHENA_LIBS version: 12 updated: 2011/07/17 19:55:02 dnl ---------------- dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw. @@ -3311,6 +3314,7 @@ $cf_test((XtAppContext) 0)], LIBS="$cf_save" fi done # cf_libs + test -n "$cf_x_athena_lib" && break done # cf_lib done @@ -3365,7 +3369,7 @@ fi fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_X_FREETYPE version: 23 updated: 2010/11/08 20:19:21 +dnl CF_X_FREETYPE version: 24 updated: 2011/08/29 05:46:02 dnl ------------- dnl Check for X FreeType headers and libraries (XFree86 4.x, etc). dnl @@ -3382,44 +3386,75 @@ AC_DEFUN([CF_X_FREETYPE], [ AC_REQUIRE([CF_PKG_CONFIG]) +cf_cv_x_freetype_incs=no +cf_cv_x_freetype_libs=no cf_extra_freetype_libs= FREETYPE_CONFIG=none FREETYPE_PARAMS= -AC_MSG_CHECKING(if you specified -D/-I options for FreeType) -AC_ARG_WITH(freetype-cflags, - [ --with-freetype-cflags -D/-I options for compiling with FreeType], - [cf_cv_x_freetype_incs="$with_freetype_cflags"], - [cf_cv_x_freetype_incs=no]) -AC_MSG_RESULT($cf_cv_x_freetype_incs) - - -AC_MSG_CHECKING(if you specified -L/-l options for FreeType) -AC_ARG_WITH(freetype-libs, - [ --with-freetype-libs -L/-l options to link FreeType], - [cf_cv_x_freetype_libs="$with_freetype_libs"], - [cf_cv_x_freetype_libs=no]) -AC_MSG_RESULT($cf_cv_x_freetype_libs) - -if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xft; then - FREETYPE_CONFIG=$PKG_CONFIG - FREETYPE_PARAMS=xft -else - AC_PATH_PROG(FREETYPE_XFT_CONFIG, xft-config, none) +AC_MSG_CHECKING(for FreeType configuration script) +AC_ARG_WITH(freetype-config, + [ --with-freetype-config configure script to use for FreeType], + [cf_cv_x_freetype_cfgs="$withval"], + [cf_cv_x_freetype_cfgs=auto]) +test -z $cf_cv_x_freetype_cfgs && cf_cv_x_freetype_cfgs=auto +test $cf_cv_x_freetype_cfgs = no && cf_cv_x_freetype_cfgs=none +AC_MSG_RESULT($cf_cv_x_freetype_cfgs) + +case $cf_cv_x_freetype_cfgs in +none) #(vi + AC_MSG_CHECKING(if you specified -D/-I options for FreeType) + AC_ARG_WITH(freetype-cflags, + [ --with-freetype-cflags -D/-I options for compiling with FreeType], + [cf_cv_x_freetype_incs="$with_freetype_cflags"], + [cf_cv_x_freetype_incs=no]) + AC_MSG_RESULT($cf_cv_x_freetype_incs) + + AC_MSG_CHECKING(if you specified -L/-l options for FreeType) + AC_ARG_WITH(freetype-libs, + [ --with-freetype-libs -L/-l options to link FreeType], + [cf_cv_x_freetype_libs="$with_freetype_libs"], + [cf_cv_x_freetype_libs=no]) + AC_MSG_RESULT($cf_cv_x_freetype_libs) + ;; +auto) #(vi + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xft; then + FREETYPE_CONFIG=$PKG_CONFIG + FREETYPE_PARAMS=xft + else + AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, none) + if test "$FREETYPE_CONFIG" != none; then + FREETYPE_CONFIG=$FREETYPE_CONFIG + cf_extra_freetype_libs="-lXft" + else + AC_PATH_PROG(FREETYPE_OLD_CONFIG, xft-config, none) + if test "$FREETYPE_OLD_CONFIG" != none; then + FREETYPE_CONFIG=$FREETYPE_OLD_CONFIG + fi + fi + fi + ;; +pkg*) #(vi + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xft; then + FREETYPE_CONFIG=$cf_cv_x_freetype_cfgs + FREETYPE_PARAMS=xft + else + AC_MSG_WARN(cannot find pkg-config for Xft) + fi + ;; +*) #(vi + AC_PATH_PROG(FREETYPE_XFT_CONFIG, $cf_cv_x_freetype_cfgs, none) if test "$FREETYPE_XFT_CONFIG" != none; then FREETYPE_CONFIG=$FREETYPE_XFT_CONFIG else - cf_extra_freetype_libs="-lXft" - AC_PATH_PROG(FREETYPE_OLD_CONFIG, freetype-config, none) - if test "$FREETYPE_OLD_CONFIG" != none; then - FREETYPE_CONFIG=$FREETYPE_OLD_CONFIG - fi + AC_MSG_WARN(cannot find config script for Xft) fi -fi -AC_MSG_CHECKING(for FreeType config) -AC_MSG_RESULT($FREETYPE_CONFIG $FREETYPE_PARAMS) + ;; +esac if test "$FREETYPE_CONFIG" != none ; then + AC_MSG_CHECKING(for FreeType config) + AC_MSG_RESULT($FREETYPE_CONFIG $FREETYPE_PARAMS) if test "$cf_cv_x_freetype_incs" = no ; then AC_MSG_CHECKING(for $FREETYPE_CONFIG cflags) @@ -3432,7 +3467,6 @@ if test "$FREETYPE_CONFIG" != none ; then cf_cv_x_freetype_libs="$cf_extra_freetype_libs `$FREETYPE_CONFIG $FREETYPE_PARAMS --libs 2>/dev/null`" AC_MSG_RESULT($cf_cv_x_freetype_libs) fi - fi if test "$cf_cv_x_freetype_incs" = no ; then diff --git a/charproc.c b/charproc.c index ec212f8..c5697a0 100644 --- a/charproc.c +++ b/charproc.c @@ -1,4 +1,4 @@ -/* $XTermId: charproc.c,v 1.1127 2011/08/22 23:36:42 tom Exp $ */ +/* $XTermId: charproc.c,v 1.1132 2011/09/04 18:18:16 tom Exp $ */ /* * Copyright 1999-2010,2011 by Thomas E. Dickey @@ -435,6 +435,8 @@ static XtResource xterm_resources[] = Bres(XtNunderLine, XtCUnderLine, screen.underline, True), Bres(XtNvisualBell, XtCVisualBell, screen.visualbell, False), + Dres(XtNscaleHeight, XtCScaleHeight, screen.scale_height, "1.0"), + Ires(XtNbellSuppressTime, XtCBellSuppressTime, screen.bellSuppressTime, BELLSUPPRESSMSEC), Ires(XtNfontWarnings, XtCFontWarnings, misc.fontWarnings, fwResource), Ires(XtNinternalBorder, XtCBorderWidth, screen.border, DEFBORDER), @@ -3468,6 +3470,7 @@ updateCursor(TScreen * screen) } } +#if OPT_BLINK_CURS || OPT_BLINK_TEXT static void reallyStopBlinking(TScreen * screen) { @@ -3478,6 +3481,7 @@ reallyStopBlinking(TScreen * screen) xevents(); } } +#endif #ifdef VMS #define ptymask() (v_bufptr > v_bufstr ? pty_mask : 0) @@ -3671,7 +3675,7 @@ in_put(XtermWidget xw) * The blocking is optional, because it tends to increase the load * on the host. */ - if (XtAppPending(app_con)) { + if (xtermAppPending()) { select_timeout.tv_usec = 0; time_select = 1; } else if (screen->awaitInput) { @@ -3711,7 +3715,7 @@ in_put(XtermWidget xw) /* if there are X events already in our queue, it counts as being readable */ - if (XtAppPending(app_con) || + if (xtermAppPending() || FD_ISSET(ConnectionNumber(screen->display), &select_mask)) { xevents(); if (VTbuffer->update != update) /* HandleInterpret */ @@ -5615,7 +5619,7 @@ RequestResize(XtermWidget xw, int rows, int cols, Bool text) #endif XSync(screen->display, False); /* synchronize */ - if (XtAppPending(app_con)) + if (xtermAppPending()) xevents(); TRACE(("...RequestResize done\n")); @@ -6186,6 +6190,12 @@ VTInitialize(Widget wrequest, init_Bres(screen.scrollttyoutput); init_Bres(screen.scrollkey); + init_Dres(screen.scale_height); + if (TScreenOf(wnew)->scale_height < 0.9) + TScreenOf(wnew)->scale_height = (float) 0.9; + if (TScreenOf(wnew)->scale_height > 1.5) + TScreenOf(wnew)->scale_height = (float) 1.5; + init_Bres(misc.autoWrap); init_Bres(misc.login_shell); init_Bres(misc.reverseWrap); @@ -6926,7 +6936,7 @@ VTDestroy(Widget w GCC_UNUSED) TRACE_FREE_LEAK(screen->term_id); TRACE_FREE_LEAK(screen->charClass); TRACE_FREE_LEAK(screen->answer_back); - TRACE_FREE_LEAK(screen->printer_command); + TRACE_FREE_LEAK(screen->printer_state.printer_command); TRACE_FREE_LEAK(screen->keyboard_dialect); TRACE_FREE_LEAK(screen->disallowedColorOps); TRACE_FREE_LEAK(screen->disallowedFontOps); @@ -8430,7 +8440,7 @@ ReallyReset(XtermWidget xw, Bool full, Bool saved) &replyWidth, &replyHeight); repairSizeHints(); XSync(screen->display, False); /* synchronize */ - if (XtAppPending(app_con)) + if (xtermAppPending()) xevents(); } diff --git a/configure b/configure index 10ed580..0be183c 100755 --- a/configure +++ b/configure @@ -725,6 +725,7 @@ Optional Features: --disable-boxchars disable fallback-support for box chars --enable-exec-xterm enable "spawn-new-terminal" action --disable-freetype disable freetype library-support + --with-freetype-config configure script to use for FreeType --with-freetype-cflags -D/-I options for compiling with FreeType --with-freetype-libs -L/-l options to link FreeType --enable-hp-fkeys enable support for HP-style function keys @@ -960,7 +961,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:963: loading site script $ac_site_file" >&5 + { echo "$as_me:964: 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" @@ -971,7 +972,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:974: loading cache $cache_file" >&5 + { echo "$as_me:975: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -979,7 +980,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:982: creating cache $cache_file" >&5 + { echo "$as_me:983: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -995,21 +996,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:998: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:999: 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:1002: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:1003: 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:1008: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:1009: 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:1010: former value: $ac_old_val" >&5 + { echo "$as_me:1011: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:1012: current value: $ac_new_val" >&5 + { echo "$as_me:1013: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -1028,9 +1029,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if $ac_cache_corrupted; then - { echo "$as_me:1031: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1032: 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:1033: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1034: 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 @@ -1051,10 +1052,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1054: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1055: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1057: \$? = $ac_status" >&5 + echo "$as_me:1058: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -1082,7 +1083,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1085: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1086: 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 @@ -1092,11 +1093,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:1095: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1096: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1099: checking build system type" >&5 +echo "$as_me:1100: 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 @@ -1105,16 +1106,16 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1108: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1109: 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:1112: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1113: 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:1117: result: $ac_cv_build" >&5 +echo "$as_me:1118: 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/'` @@ -1122,7 +1123,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:1125: checking host system type" >&5 + echo "$as_me:1126: 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 @@ -1131,12 +1132,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:1134: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1135: 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:1139: result: $ac_cv_host" >&5 +echo "$as_me:1140: 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/'` @@ -1161,13 +1162,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1164: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1165: 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:1168: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1169: 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:1170: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1171: 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 @@ -1192,7 +1193,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:1195: checking for $ac_word" >&5 +echo "$as_me:1196: 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 @@ -1207,7 +1208,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:1210: found $ac_dir/$ac_word" >&5 +echo "$as_me:1211: found $ac_dir/$ac_word" >&5 break done @@ -1215,10 +1216,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1218: result: $CC" >&5 + echo "$as_me:1219: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1221: result: no" >&5 + echo "$as_me:1222: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1227,7 +1228,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:1230: checking for $ac_word" >&5 +echo "$as_me:1231: 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 @@ -1242,7 +1243,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:1245: found $ac_dir/$ac_word" >&5 +echo "$as_me:1246: found $ac_dir/$ac_word" >&5 break done @@ -1250,10 +1251,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1253: result: $ac_ct_CC" >&5 + echo "$as_me:1254: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1256: result: no" >&5 + echo "$as_me:1257: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1266,7 +1267,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:1269: checking for $ac_word" >&5 +echo "$as_me:1270: 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 @@ -1281,7 +1282,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:1284: found $ac_dir/$ac_word" >&5 +echo "$as_me:1285: found $ac_dir/$ac_word" >&5 break done @@ -1289,10 +1290,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1292: result: $CC" >&5 + echo "$as_me:1293: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1295: result: no" >&5 + echo "$as_me:1296: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1301,7 +1302,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:1304: checking for $ac_word" >&5 +echo "$as_me:1305: 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 @@ -1316,7 +1317,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:1319: found $ac_dir/$ac_word" >&5 +echo "$as_me:1320: found $ac_dir/$ac_word" >&5 break done @@ -1324,10 +1325,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1327: result: $ac_ct_CC" >&5 + echo "$as_me:1328: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1330: result: no" >&5 + echo "$as_me:1331: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1340,7 +1341,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:1343: checking for $ac_word" >&5 +echo "$as_me:1344: 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 @@ -1360,7 +1361,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then continue fi ac_cv_prog_CC="cc" -echo "$as_me:1363: found $ac_dir/$ac_word" >&5 +echo "$as_me:1364: found $ac_dir/$ac_word" >&5 break done @@ -1382,10 +1383,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1385: result: $CC" >&5 + echo "$as_me:1386: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1388: result: no" >&5 + echo "$as_me:1389: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1396,7 +1397,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:1399: checking for $ac_word" >&5 +echo "$as_me:1400: 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 @@ -1411,7 +1412,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:1414: found $ac_dir/$ac_word" >&5 +echo "$as_me:1415: found $ac_dir/$ac_word" >&5 break done @@ -1419,10 +1420,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1422: result: $CC" >&5 + echo "$as_me:1423: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1425: result: no" >&5 + echo "$as_me:1426: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1435,7 +1436,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:1438: checking for $ac_word" >&5 +echo "$as_me:1439: 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 @@ -1450,7 +1451,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:1453: found $ac_dir/$ac_word" >&5 +echo "$as_me:1454: found $ac_dir/$ac_word" >&5 break done @@ -1458,10 +1459,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1461: result: $ac_ct_CC" >&5 + echo "$as_me:1462: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1464: result: no" >&5 + echo "$as_me:1465: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1473,32 +1474,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1476: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1477: 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:1481:" \ +echo "$as_me:1482:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1484: \"$ac_compiler --version </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1485: \"$ac_compiler --version </dev/null >&5\"") >&5 (eval $ac_compiler --version </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1487: \$? = $ac_status" >&5 + echo "$as_me:1488: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1489: \"$ac_compiler -v </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1490: \"$ac_compiler -v </dev/null >&5\"") >&5 (eval $ac_compiler -v </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1492: \$? = $ac_status" >&5 + echo "$as_me:1493: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1494: \"$ac_compiler -V </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1495: \"$ac_compiler -V </dev/null >&5\"") >&5 (eval $ac_compiler -V </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1497: \$? = $ac_status" >&5 + echo "$as_me:1498: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1501 "configure" +#line 1502 "configure" #include "confdefs.h" int @@ -1514,13 +1515,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:1517: checking for C compiler default output" >&5 +echo "$as_me:1518: 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:1520: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1521: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1523: \$? = $ac_status" >&5 + echo "$as_me:1524: \$? = $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 @@ -1543,34 +1544,34 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1546: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1547: 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:1552: result: $ac_file" >&5 +echo "$as_me:1553: 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:1557: checking whether the C compiler works" >&5 +echo "$as_me:1558: 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:1563: \"$ac_try\"") >&5 + { (eval echo "$as_me:1564: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1566: \$? = $ac_status" >&5 + echo "$as_me:1567: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1573: error: cannot run C compiled programs. + { { echo "$as_me:1574: 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;} @@ -1578,24 +1579,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1581: result: yes" >&5 +echo "$as_me:1582: 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:1588: checking whether we are cross compiling" >&5 +echo "$as_me:1589: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1590: result: $cross_compiling" >&5 +echo "$as_me:1591: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1593: checking for executable suffix" >&5 +echo "$as_me:1594: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1595: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1596: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1598: \$? = $ac_status" >&5 + echo "$as_me:1599: \$? = $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 @@ -1611,25 +1612,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1614: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1615: 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:1620: result: $ac_cv_exeext" >&5 +echo "$as_me:1621: 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:1626: checking for object suffix" >&5 +echo "$as_me:1627: 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 1632 "configure" +#line 1633 "configure" #include "confdefs.h" int @@ -1641,10 +1642,10 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1644: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1645: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1647: \$? = $ac_status" >&5 + echo "$as_me:1648: \$? = $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 @@ -1656,24 +1657,24 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1659: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1660: 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 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1r1ng7-00068k...@vasks.debian.org