INSTALL | 6
Imakefile | 15
MANIFEST | 3
Makefile.in | 4
THANKS | 7
VTparse.h | 2
XTerm.ad | 4
aclocal.m4 | 47
button.c | 10
charproc.c | 269 ++-
configure | 3366 ++++++++++++++++++++++++-----------------------
configure.in | 15
ctlseqs.ms | 104 +
ctlseqs.txt | 215 +--
debian/changelog | 8
graphics.c | 1409 +++++++++++++++++++
graphics.h | 66
menu.c | 72 -
menu.h | 18
misc.c | 248 ++-
package/debian/changelog | 12
package/debian/rules | 1
package/freebsd/Makefile | 2
package/xterm.spec | 5
plink.sh | 33
ptyx.h | 132 +
screen.c | 36
scrollbar.c | 3
util.c | 36
version.h | 6
xterm.h | 11
xterm.log.html | 60
xterm.man | 67
xtermcap.h | 4
xtermcfg.hin | 3
35 files changed, 4307 insertions(+), 1992 deletions(-)
New commits:
commit bd6b87cb4f4b2f3151b44ff9ab2bc90269ca6c0d
Author: Sven Joachim <svenj...@gmx.de>
Date: Sun Jul 7 11:43:52 2013 +0200
Close bug #714527
diff --git a/debian/changelog b/debian/changelog
index 27800be..d88ef98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xterm (295-1) UNRELEASED; urgency=low
* New upstream release.
+ - Amend fix from xterm 292 by removing now-unneeded chunk which
+ introduced problem in selection (Closes: #714527).
-- Sven Joachim <svenj...@gmx.de> Sun, 07 Jul 2013 11:42:34 +0200
commit f2f2abf10f24bb36012d84fab279f30a87c4989d
Author: Sven Joachim <svenj...@gmx.de>
Date: Sun Jul 7 11:42:39 2013 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index 14b11f6..27800be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (295-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Sven Joachim <svenj...@gmx.de> Sun, 07 Jul 2013 11:42:34 +0200
+
xterm (293-1) unstable; urgency=low
* New upstream release.
commit 03c940de3dd124a2baa8c1c324d07a23b0aa4b69
Author: Sven Joachim <svenj...@gmx.de>
Date: Sun Jul 7 08:30:46 2013 +0200
Imported Upstream version 295
diff --git a/MANIFEST b/MANIFEST
index 5c9f348..03fd848 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-294, version xterm-294
+MANIFEST for xterm-295, version xterm-295
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/aclocal.m4 b/aclocal.m4
index c25a90b..e32778e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.365 2013/05/27 22:36:25 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.368 2013/07/07 01:30:48 tom Exp $
dnl
dnl ---------------------------------------------------------------------------
dnl
@@ -2322,7 +2322,23 @@ foo.c_ospeed = B9600;
test "$cf_cv_termio_c_ispeed" = yes &&
AC_DEFINE(HAVE_TERMIO_C_ISPEED,1,[define 1 if we have IRIX 6.5 baud-rate
redefinitions])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_TRY_PKG_CONFIG version: 4 updated: 2010/06/14 17:42:30
+dnl CF_TRIM_X_LIBS version: 1 updated: 2013/07/06 21:27:06
+dnl --------------
+dnl Trim extra base X libraries added as a workaround for inconsistent library
+dnl dependencies returned by "new" pkg-config files.
+AC_DEFUN([CF_TRIM_X_LIBS],[
+ for cf_trim_lib in Xmu Xt X11
+ do
+ case "$LIBS" in
+ *-l$cf_trim_lib\ *-l$cf_trim_lib*)
+ LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e
's/-l'$cf_trim_lib' //' -e 's/ $//'`
+ CF_VERBOSE(..trimmed $LIBS)
+ ;;
+ esac
+ done
+])
+dnl ---------------------------------------------------------------------------
+dnl CF_TRY_PKG_CONFIG version: 5 updated: 2013/07/06 21:27:06
dnl -----------------
dnl This is a simple wrapper to use for pkg-config, for libraries which may be
dnl available in that form.
@@ -2343,6 +2359,8 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists
$1; then
CF_ADD_LIBS($cf_pkgconfig_libs)
ifelse([$2],,:,[$2])
else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
ifelse([$3],,:,[$3])
fi
])
@@ -3822,7 +3840,7 @@ make an error
fi
])
dnl ---------------------------------------------------------------------------
-dnl CF_X_ATHENA version: 20 updated: 2010/11/09 05:18:02
+dnl CF_X_ATHENA version: 21 updated: 2013/07/06 21:27:06
dnl -----------
dnl Check for Xaw (Athena) libraries
dnl
@@ -3881,6 +3899,8 @@ if test "$PKG_CONFIG" != none ; then
CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x_athena)
AC_DEFINE_UNQUOTED($cf_x_athena_LIBS)
+ CF_TRIM_X_LIBS
+
AC_CACHE_CHECK(for usable $cf_x_athena/Xmu package,cf_cv_xaw_compat,[
AC_TRY_LINK([
#include <X11/Xmu/CharSet.h>
@@ -3896,7 +3916,15 @@ int check = XmuCompareISOLatin1("big", "small")
;;
*)
CF_VERBOSE(work around broken package)
-
CF_TRY_PKG_CONFIG(xmu,,[CF_ADD_LIB_AFTER(-lXt,-lXmu)])
+ cf_save_xmu="$LIBS"
+ cf_first_lib=`echo "$cf_save_xmu" | sed
-e 's/^[ ][ ]*//' -e 's/ .*//'`
+ CF_TRY_PKG_CONFIG(xmu,[
+ LIBS="$cf_save_xmu"
+
CF_ADD_LIB_AFTER($cf_first_lib,$cf_pkgconfig_libs)
+ ],[
+
CF_ADD_LIB_AFTER($cf_first_lib,-lXmu)
+ ])
+ CF_TRIM_X_LIBS
;;
esac
fi
@@ -4031,7 +4059,7 @@ CF_TRY_PKG_CONFIG(Xext,,[
[CF_ADD_LIB(Xext)])])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_X_FONTCONFIG version: 4 updated: 2011/07/04 10:01:31
+dnl CF_X_FONTCONFIG version: 5 updated: 2013/07/06 21:27:06
dnl ---------------
dnl Check for fontconfig library, a dependency of the X FreeType library.
AC_DEFUN([CF_X_FONTCONFIG],
@@ -4058,7 +4086,14 @@ then
;;
*)
CF_VERBOSE(work around broken package)
-
CF_TRY_PKG_CONFIG(fontconfig,,[CF_ADD_LIB_AFTER(-lXft,-lfontconfig)])
+ cf_save_fontconfig="$LIBS"
+ CF_TRY_PKG_CONFIG(fontconfig,[
+ CF_ADD_CFLAGS($cf_pkgconfig_incs)
+ LIBS="$cf_save_fontconfig"
+ CF_ADD_LIB_AFTER(-lXft,$cf_pkgconfig_libs)
+ ],[
+ CF_ADD_LIB_AFTER(-lXft,-lfontconfig)
+ ])
;;
esac
fi
diff --git a/configure b/configure
index 530ea1e..1f4a5e6 100755
--- a/configure
+++ b/configure
@@ -9218,15 +9218,17 @@ fi
LIBS="$cf_pkgconfig_libs $LIBS"
:
else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
test -n "$verbose" && echo " ...before $LIBS" 1>&6
-echo "${as_me:-configure}:9224: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:9226: testing ...before $LIBS ..." 1>&5
LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt -lX11
," -e 's/ / /g'`
test -n "$verbose" && echo " ...after $LIBS" 1>&6
-echo "${as_me:-configure}:9229: testing ...after $LIBS ..." 1>&5
+echo "${as_me:-configure}:9231: testing ...after $LIBS ..." 1>&5
fi
@@ -9234,14 +9236,14 @@ fi
;;
esac
-echo "$as_me:9237: checking for usable X Toolkit package" >&5
+echo "$as_me:9239: checking for usable X Toolkit package" >&5
echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
if test "${cf_cv_xt_ice_compat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 9244 "configure"
+#line 9246 "configure"
#include "confdefs.h"
#include <X11/Shell.h>
@@ -9256,16 +9258,16 @@ int num = IceConnectionNumber(0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9259: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9261: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9262: \$? = $ac_status" >&5
+ echo "$as_me:9264: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9265: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9267: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9268: \$? = $ac_status" >&5
+ echo "$as_me:9270: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xt_ice_compat=yes
else
@@ -9275,7 +9277,7 @@ cf_cv_xt_ice_compat=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:9278: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:9280: result: $cf_cv_xt_ice_compat" >&5
echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
if test "$cf_cv_xt_ice_compat" = no
@@ -9289,22 +9291,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
*)
test -n "$verbose" && echo " work around
broken ICE dependency" 1>&6
-echo "${as_me:-configure}:9292: testing work around broken ICE dependency ..."
1>&5
+echo "${as_me:-configure}:9294: testing work around broken ICE dependency ..."
1>&5
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
test -n "$verbose" && echo " found package ice" 1>&6
-echo "${as_me:-configure}:9297: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:9299: testing found package ice ..." 1>&5
cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`"
test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs"
1>&6
-echo "${as_me:-configure}:9303: testing package ice CFLAGS: $cf_pkgconfig_incs
..." 1>&5
+echo "${as_me:-configure}:9305: testing package ice CFLAGS: $cf_pkgconfig_incs
..." 1>&5
test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs"
1>&6
-echo "${as_me:-configure}:9307: testing package ice LIBS: $cf_pkgconfig_libs
..." 1>&5
+echo "${as_me:-configure}:9309: testing package ice LIBS: $cf_pkgconfig_libs
..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
@@ -9389,17 +9391,17 @@ fi
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
test -n "$verbose" && echo " found package sm" 1>&6
-echo "${as_me:-configure}:9392: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:9394: testing found package sm ..." 1>&5
cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`"
test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs"
1>&6
-echo "${as_me:-configure}:9398: testing package sm CFLAGS: $cf_pkgconfig_incs
..." 1>&5
+echo "${as_me:-configure}:9400: testing package sm CFLAGS: $cf_pkgconfig_incs
..." 1>&5
test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs"
1>&6
-echo "${as_me:-configure}:9402: testing package sm LIBS: $cf_pkgconfig_libs
..." 1>&5
+echo "${as_me:-configure}:9404: testing package sm LIBS: $cf_pkgconfig_libs
..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
@@ -9482,19 +9484,23 @@ fi
LIBS="$cf_pkgconfig_libs $LIBS"
:
else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
:
fi
else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
test -n "$verbose" && echo " ...before $LIBS" 1>&6
-echo "${as_me:-configure}:9492: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:9498: testing ...before $LIBS ..." 1>&5
LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt
$X_PRE_LIBS ," -e 's/ / /g'`
test -n "$verbose" && echo " ...after $LIBS" 1>&6
-echo "${as_me:-configure}:9497: testing ...after $LIBS ..." 1>&5
+echo "${as_me:-configure}:9503: testing ...after $LIBS ..." 1>&5
fi
@@ -9507,12 +9513,14 @@ fi
cf_have_X_LIBS=yes
else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
LDFLAGS="$X_LIBS $LDFLAGS"
test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
-echo "${as_me:-configure}:9515: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:9523: testing checking additions to CFLAGS ..." 1>&5
cf_check_cflags="$CFLAGS"
cf_check_cppflags="$CPPFLAGS"
@@ -9583,7 +9591,7 @@ done
if test -n "$cf_new_cflags" ; then
test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
-echo "${as_me:-configure}:9586: testing add to \$CFLAGS $cf_new_cflags ..."
1>&5
+echo "${as_me:-configure}:9594: testing add to \$CFLAGS $cf_new_cflags ..."
1>&5
CFLAGS="$CFLAGS $cf_new_cflags"
fi
@@ -9591,7 +9599,7 @@ fi
if test -n "$cf_new_cppflags" ; then
test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
-echo "${as_me:-configure}:9594: testing add to \$CPPFLAGS $cf_new_cppflags
..." 1>&5
+echo "${as_me:-configure}:9602: testing add to \$CPPFLAGS $cf_new_cppflags
..." 1>&5
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
fi
@@ -9599,14 +9607,14 @@ fi
if test -n "$cf_new_extra_cppflags" ; then
test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS
$cf_new_extra_cppflags" 1>&6
-echo "${as_me:-configure}:9602: testing add to \$EXTRA_CPPFLAGS
$cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:9610: testing add to \$EXTRA_CPPFLAGS
$cf_new_extra_cppflags ..." 1>&5
EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
fi
if test "$cf_check_cflags" != "$CFLAGS" ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 9609 "configure"
+#line 9617 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -9618,16 +9626,16 @@ printf("Hello world");
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9621: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9629: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9624: \$? = $ac_status" >&5
+ echo "$as_me:9632: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9627: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9635: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9630: \$? = $ac_status" >&5
+ echo "$as_me:9638: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -9635,12 +9643,12 @@ else
cat conftest.$ac_ext >&5
test -n "$verbose" && echo " test-compile failed. Undoing change to
\$CFLAGS" 1>&6
-echo "${as_me:-configure}:9638: testing test-compile failed. Undoing change
to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:9646: testing test-compile failed. Undoing change
to \$CFLAGS ..." 1>&5
if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
test -n "$verbose" && echo " but keeping change to
\$CPPFLAGS" 1>&6
-echo "${as_me:-configure}:9643: testing but keeping change to \$CPPFLAGS ..."
1>&5
+echo "${as_me:-configure}:9651: testing but keeping change to \$CPPFLAGS ..."
1>&5
fi
CFLAGS="$cf_check_flags"
@@ -9648,13 +9656,13 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
- echo "$as_me:9651: checking for XOpenDisplay" >&5
+ echo "$as_me:9659: checking for XOpenDisplay" >&5
echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
if test "${ac_cv_func_XOpenDisplay+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 9657 "configure"
+#line 9665 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char XOpenDisplay (); below. */
@@ -9685,16 +9693,16 @@ f = XOpenDisplay; /* workaround for ICC 12.0.3 */ if (f
== 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9688: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9696: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9691: \$? = $ac_status" >&5
+ echo "$as_me:9699: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9694: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9702: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9697: \$? = $ac_status" >&5
+ echo "$as_me:9705: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_XOpenDisplay=yes
else
@@ -9704,13 +9712,13 @@ ac_cv_func_XOpenDisplay=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:9707: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:9715: result: $ac_cv_func_XOpenDisplay" >&5
echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
if test $ac_cv_func_XOpenDisplay = yes; then
:
else
- echo "$as_me:9713: checking for XOpenDisplay in -lX11" >&5
+ echo "$as_me:9721: checking for XOpenDisplay in -lX11" >&5
echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9718,7 +9726,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 9721 "configure"
+#line 9729 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -9737,16 +9745,16 @@ XOpenDisplay ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9740: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9748: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9743: \$? = $ac_status" >&5
+ echo "$as_me:9751: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9746: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9754: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9749: \$? = $ac_status" >&5
+ echo "$as_me:9757: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_X11_XOpenDisplay=yes
else
@@ -9757,7 +9765,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:9760: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:9768: result: $ac_cv_lib_X11_XOpenDisplay" >&5
echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
if test $ac_cv_lib_X11_XOpenDisplay = yes; then
LIBS="-lX11 $LIBS"
@@ -9765,13 +9773,13 @@ fi
fi
- echo "$as_me:9768: checking for XtAppInitialize" >&5
+ echo "$as_me:9776: checking for XtAppInitialize" >&5
echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
if test "${ac_cv_func_XtAppInitialize+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 9774 "configure"
+#line 9782 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char XtAppInitialize (); below. */
@@ -9802,16 +9810,16 @@ f = XtAppInitialize; /* workaround for ICC 12.0.3 */ if
(f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9805: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9813: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9808: \$? = $ac_status" >&5
+ echo "$as_me:9816: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9811: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9819: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9814: \$? = $ac_status" >&5
+ echo "$as_me:9822: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_XtAppInitialize=yes
else
@@ -9821,13 +9829,13 @@ ac_cv_func_XtAppInitialize=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:9824: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:9832: result: $ac_cv_func_XtAppInitialize" >&5
echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
if test $ac_cv_func_XtAppInitialize = yes; then
:
else
- echo "$as_me:9830: checking for XtAppInitialize in -lXt" >&5
+ echo "$as_me:9838: checking for XtAppInitialize in -lXt" >&5
echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9835,7 +9843,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 9838 "configure"
+#line 9846 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -9854,16 +9862,16 @@ XtAppInitialize ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9857: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9865: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9860: \$? = $ac_status" >&5
+ echo "$as_me:9868: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9863: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9871: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9866: \$? = $ac_status" >&5
+ echo "$as_me:9874: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Xt_XtAppInitialize=yes
else
@@ -9874,7 +9882,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:9877: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:9885: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
@@ -9891,7 +9899,7 @@ fi
fi
if test $cf_have_X_LIBS = no ; then
- { echo "$as_me:9894: WARNING: Unable to successfully link X Toolkit
library (-lXt) with
+ { echo "$as_me:9902: WARNING: Unable to successfully link X Toolkit
library (-lXt) with
test program. You will have to check and add the proper libraries by hand
to makefile." >&5
echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt)
with
@@ -9909,23 +9917,23 @@ for ac_header in \
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9912: checking for $ac_header" >&5
+echo "$as_me:9920: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 9918 "configure"
+#line 9926 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:9922: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9930: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:9928: \$? = $ac_status" >&5
+ echo "$as_me:9936: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9944,7 +9952,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:9947: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9955: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -9959,7 +9967,7 @@ ICON_SUFFIX=.xbm
cf_save_cppflags="${CPPFLAGS}"
cf_save_ldflags="${LDFLAGS}"
-echo "$as_me:9962: checking if you want to use the Xpm library for colored
icon" >&5
+echo "$as_me:9970: checking if you want to use the Xpm library for colored
icon" >&5
echo $ECHO_N "checking if you want to use the Xpm library for colored icon...
$ECHO_C" >&6
# Check whether --with-xpm or --without-xpm was given.
@@ -9969,7 +9977,7 @@ if test "${with_xpm+set}" = set; then
else
cf_Xpm_library=yes
fi;
-echo "$as_me:9972: result: $cf_Xpm_library" >&5
+echo "$as_me:9980: result: $cf_Xpm_library" >&5
echo "${ECHO_T}$cf_Xpm_library" >&6
if test "$cf_Xpm_library" != no ; then
@@ -9977,23 +9985,23 @@ if test "$cf_Xpm_library" != no ; then
CPPFLAGS="$CPPFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib"
fi
- echo "$as_me:9980: checking for X11/xpm.h" >&5
+ echo "$as_me:9988: checking for X11/xpm.h" >&5
echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6
if test "${ac_cv_header_X11_xpm_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 9986 "configure"
+#line 9994 "configure"
#include "confdefs.h"
#include <X11/xpm.h>
_ACEOF
-if { (eval echo "$as_me:9990: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9998: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:9996: \$? = $ac_status" >&5
+ echo "$as_me:10004: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10012,11 +10020,11 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:10015: result: $ac_cv_header_X11_xpm_h" >&5
+echo "$as_me:10023: result: $ac_cv_header_X11_xpm_h" >&5
echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6
if test $ac_cv_header_X11_xpm_h = yes; then
- echo "$as_me:10019: checking for XpmCreatePixmapFromData in -lXpm" >&5
+ echo "$as_me:10027: checking for XpmCreatePixmapFromData in -lXpm" >&5
echo $ECHO_N "checking for XpmCreatePixmapFromData in -lXpm... $ECHO_C" >&6
if test "${ac_cv_lib_Xpm_XpmCreatePixmapFromData+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10024,7 +10032,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXpm -lX11 $X_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10027 "configure"
+#line 10035 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10043,16 +10051,16 @@ XpmCreatePixmapFromData ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10046: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10054: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10049: \$? = $ac_status" >&5
+ echo "$as_me:10057: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10052: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10060: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10055: \$? = $ac_status" >&5
+ echo "$as_me:10063: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes
else
@@ -10063,7 +10071,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10066: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
+echo "$as_me:10074: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
echo "${ECHO_T}$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6
if test $ac_cv_lib_Xpm_XpmCreatePixmapFromData = yes; then
@@ -10085,7 +10093,7 @@ fi
cf_x_athena=${cf_x_athena:-Xaw}
-echo "$as_me:10088: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:10096: checking if you want to link with Xaw 3d library" >&5
echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
withval=
@@ -10096,14 +10104,14 @@ if test "${with_Xaw3d+set}" = set; then
fi;
if test "$withval" = yes ; then
cf_x_athena=Xaw3d
- echo "$as_me:10099: result: yes" >&5
+ echo "$as_me:10107: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
- echo "$as_me:10102: result: no" >&5
+ echo "$as_me:10110: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:10106: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:10114: checking if you want to link with neXT Athena library" >&5
echo $ECHO_N "checking if you want to link with neXT Athena library...
$ECHO_C" >&6
withval=
@@ -10114,14 +10122,14 @@ if test "${with_neXtaw+set}" = set; then
fi;
if test "$withval" = yes ; then
cf_x_athena=neXtaw
- echo "$as_me:10117: result: yes" >&5
+ echo "$as_me:10125: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
- echo "$as_me:10120: result: no" >&5
+ echo "$as_me:10128: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:10124: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:10132: checking if you want to link with Athena-Plus library" >&5
echo $ECHO_N "checking if you want to link with Athena-Plus library...
$ECHO_C" >&6
withval=
@@ -10132,10 +10140,10 @@ if test "${with_XawPlus+set}" = set; then
fi;
if test "$withval" = yes ; then
cf_x_athena=XawPlus
- echo "$as_me:10135: result: yes" >&5
+ echo "$as_me:10143: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
- echo "$as_me:10138: result: no" >&5
+ echo "$as_me:10146: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -10155,17 +10163,17 @@ if test "$PKG_CONFIG" != none ; then
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
test -n "$verbose" && echo " found package $cf_athena_pkg" 1>&6
-echo "${as_me:-configure}:10158: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:10166: testing found package $cf_athena_pkg ..." 1>&5
cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
cf_pkgconfig_libs="`$PKG_CONFIG --libs $cf_athena_pkg 2>/dev/null`"
test -n "$verbose" && echo " package $cf_athena_pkg CFLAGS:
$cf_pkgconfig_incs" 1>&6
-echo "${as_me:-configure}:10164: testing package $cf_athena_pkg CFLAGS:
$cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:10172: testing package $cf_athena_pkg CFLAGS:
$cf_pkgconfig_incs ..." 1>&5
test -n "$verbose" && echo " package $cf_athena_pkg LIBS:
$cf_pkgconfig_libs" 1>&6
-echo "${as_me:-configure}:10168: testing package $cf_athena_pkg LIBS:
$cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:10176: testing package $cf_athena_pkg LIBS:
$cf_pkgconfig_libs ..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
@@ -10255,14 +10263,27 @@ cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed
y%abcdefghijklmnopqrstuvwxy
#define $cf_x_athena_LIBS 1
EOF
-echo "$as_me:10258: checking for usable $cf_x_athena/Xmu package" >&5
+ for cf_trim_lib in Xmu Xt X11
+ do
+ case "$LIBS" in
+ *-l$cf_trim_lib\ *-l$cf_trim_lib*)
+ LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e
's/-l'$cf_trim_lib' //' -e 's/ $//'`
+ test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6
+
+echo "${as_me:-configure}:10273: testing ..trimmed $LIBS ..." 1>&5
+
+ ;;
+ esac
+ done
+
+echo "$as_me:10279: checking for usable $cf_x_athena/Xmu package" >&5
echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
if test "${cf_cv_xaw_compat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10265 "configure"
+#line 10286 "configure"
#include "confdefs.h"
#include <X11/Xmu/CharSet.h>
@@ -10278,16 +10299,16 @@ int check = XmuCompareISOLatin1("big", "small")
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10281: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10302: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10284: \$? = $ac_status" >&5
+ echo "$as_me:10305: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10287: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10308: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10290: \$? = $ac_status" >&5
+ echo "$as_me:10311: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xaw_compat=yes
else
@@ -10297,7 +10318,7 @@ cf_cv_xaw_compat=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:10300: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:10321: result: $cf_cv_xaw_compat" >&5
echo "${ECHO_T}$cf_cv_xaw_compat" >&6
if test "$cf_cv_xaw_compat" = no
@@ -10309,22 +10330,25 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
*)
test -n "$verbose" && echo " work
around broken package" 1>&6
-echo "${as_me:-configure}:10312: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:10333: testing work around broken package ..." 1>&5
+
+ cf_save_xmu="$LIBS"
+ cf_first_lib=`echo "$cf_save_xmu" | sed
-e 's/^ *//' -e 's/ .*//'`
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
test -n "$verbose" && echo " found package xmu" 1>&6
-echo "${as_me:-configure}:10317: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:10341: testing found package xmu ..." 1>&5
cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
cf_pkgconfig_libs="`$PKG_CONFIG --libs xmu 2>/dev/null`"
test -n "$verbose" && echo " package xmu CFLAGS: $cf_pkgconfig_incs"
1>&6
-echo "${as_me:-configure}:10323: testing package xmu CFLAGS:
$cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:10347: testing package xmu CFLAGS:
$cf_pkgconfig_incs ..." 1>&5
test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs"
1>&6
-echo "${as_me:-configure}:10327: testing package xmu LIBS: $cf_pkgconfig_libs
..." 1>&5
+echo "${as_me:-configure}:10351: testing package xmu LIBS: $cf_pkgconfig_libs
..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
@@ -10405,26 +10429,54 @@ if test -n "$cf_new_extra_cppflags" ; then
fi
LIBS="$cf_pkgconfig_libs $LIBS"
- :
+
+ LIBS="$cf_save_xmu"
+
+test -n "$verbose" && echo " ...before $LIBS" 1>&6
+
+echo "${as_me:-configure}:10437: testing ...before $LIBS ..." 1>&5
+
+LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,$cf_first_lib
,$cf_first_lib $cf_pkgconfig_libs ," -e 's/ / /g'`
+test -n "$verbose" && echo " ...after $LIBS" 1>&6
+
+echo "${as_me:-configure}:10442: testing ...after $LIBS ..." 1>&5
+
else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
test -n "$verbose" && echo " ...before $LIBS" 1>&6
-echo "${as_me:-configure}:10413: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:10450: testing ...before $LIBS ..." 1>&5
-LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt -lXmu
," -e 's/ / /g'`
+LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,$cf_first_lib
,$cf_first_lib -lXmu ," -e 's/ / /g'`
test -n "$verbose" && echo " ...after $LIBS" 1>&6
-echo "${as_me:-configure}:10418: testing ...after $LIBS ..." 1>&5
+echo "${as_me:-configure}:10455: testing ...after $LIBS ..." 1>&5
fi
+ for cf_trim_lib in Xmu Xt X11
+ do
+ case "$LIBS" in
+ *-l$cf_trim_lib\ *-l$cf_trim_lib*)
+ LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e
's/-l'$cf_trim_lib' //' -e 's/ $//'`
+ test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6
+
+echo "${as_me:-configure}:10466: testing ..trimmed $LIBS ..." 1>&5
+
+ ;;
+ esac
+ done
+
;;
esac
fi
break
else
+ cf_pkgconfig_incs=
+ cf_pkgconfig_libs=
:
fi
@@ -10436,17 +10488,17 @@ if test -z "$cf_x_athena_lib" ; then
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
test -n "$verbose" && echo " found package Xext" 1>&6
-echo "${as_me:-configure}:10439: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:10491: testing found package Xext ..." 1>&5
cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
cf_pkgconfig_libs="`$PKG_CONFIG --libs Xext 2>/dev/null`"
test -n "$verbose" && echo " package Xext CFLAGS:
$cf_pkgconfig_incs" 1>&6
-echo "${as_me:-configure}:10445: testing package Xext CFLAGS:
$cf_pkgconfig_incs ..." 1>&5
--
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/e1uvlpb-0006v7...@vasks.debian.org
