Imakefile | 4
MANIFEST | 2
aclocal.m4 | 21
configure | 3122 +++++++++++++++++++++++-----------------------
debian/changelog | 2
graphics_sixel.c | 3
main.c | 18
package/debian/changelog | 6
package/freebsd/Makefile | 106 -
package/freebsd/pkg-plist | 7
package/xterm.spec | 4
precompose.c | 10
resize.c | 8
unicode/precompose.c.head | 1
version.h | 6
xterm.h | 6
xterm.log.html | 21
xterm_io.h | 17
xtermcfg.hin | 3
19 files changed, 1717 insertions(+), 1650 deletions(-)
New commits:
commit 47cab8c37d73dc0308366859d7b1310e0d706afb
Author: Sven Joachim <svenj...@gmx.de>
Date: Wed Aug 27 19:38:06 2014 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index 411b83a..8b3ae90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (309-1) UNRELEASED; urgency=low
+xterm (310-1) UNRELEASED; urgency=low
* New upstream release.
commit 63042043364f6150467f874353c7d86472bb868f
Author: Sven Joachim <svenj...@gmx.de>
Date: Wed Aug 27 19:33:48 2014 +0200
Imported Upstream version 310
diff --git a/Imakefile b/Imakefile
index 0c2b20e..f2119ec 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.110 2014/04/11 19:36:41 Ross.Combs Exp $
+XCOMM $XTermId: Imakefile,v 1.111 2014/07/22 22:29:17 tom Exp $
XCOMM
XCOMM Attention xterm porters
XCOMM
@@ -140,7 +140,7 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
# endif
#endif
-#if !defined(OS2Architecture) && !defined(__GNU__)
+#if !defined(OS2Architecture) && !defined(__GNU__) &&
!defined(Minix3Architecture)
#if defined(UseUtempter)
UTMPDEF = -DUSE_UTEMPTER
#else
diff --git a/MANIFEST b/MANIFEST
index 06f60d1..22b4d14 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-309, version xterm-309
+MANIFEST for xterm-310, version xterm-310
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/aclocal.m4 b/aclocal.m4
index dff8843..364e683 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.376 2014/07/13 18:36:02 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.378 2014/07/24 22:52:40 tom Exp $
dnl
dnl ---------------------------------------------------------------------------
dnl
@@ -84,7 +84,7 @@ define([CF_ACVERSION_COMPARE],
[ifelse([$8], , ,[$8])],
[ifelse([$9], , ,[$9])])])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
+dnl CF_ADD_CFLAGS version: 11 updated: 2014/07/22 05:32:57
dnl -------------
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
dnl The second parameter if given makes this macro verbose.
@@ -109,7 +109,7 @@ no)
-D*)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e
's/^-D[[^=]]*='\''\"[[^"]]*//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=yes
@@ -146,7 +146,7 @@ yes)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=no
;;
@@ -315,7 +315,7 @@ if test ".$system_name" != ".$cf_cv_system_name" ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_CFLAGS version: 2 updated: 2001/12/30 19:09:58
+dnl CF_CHECK_CFLAGS version: 3 updated: 2014/07/22 05:32:57
dnl ---------------
dnl Conditionally add to $CFLAGS and $CPPFLAGS values which are derived from
dnl a build-configuration such as imake. These have the pitfall that they
@@ -327,10 +327,10 @@ CF_VERBOSE(checking additions to CFLAGS)
cf_check_cflags="$CFLAGS"
cf_check_cppflags="$CPPFLAGS"
CF_ADD_CFLAGS($1,yes)
-if test "$cf_check_cflags" != "$CFLAGS" ; then
+if test "x$cf_check_cflags" != "x$CFLAGS" ; then
AC_TRY_LINK([#include <stdio.h>],[printf("Hello world");],,
[CF_VERBOSE(test-compile failed. Undoing change to \$CFLAGS)
- if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
+ if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
CF_VERBOSE(but keeping change to \$CPPFLAGS)
fi
CFLAGS="$cf_check_flags"])
@@ -3769,7 +3769,7 @@ then
fi
])
dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 46 updated: 2014/02/09 19:30:15
+dnl CF_XOPEN_SOURCE version: 47 updated: 2014/07/23 17:11:49
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,
@@ -3820,6 +3820,9 @@ irix[[56]].*) #(vi
linux*|gnu*|mint*|k*bsd*-gnu) #(vi
CF_GNU_SOURCE
;;
+minix*) #(vi
+ cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd
with this...
+ ;;
mirbsd*) #(vi
# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and
other headers which use u_int / u_short types
cf_XOPEN_SOURCE=
@@ -3856,7 +3859,7 @@ solaris2.*) #(vi
esac
if test -n "$cf_xopen_source" ; then
- CF_ADD_CFLAGS($cf_xopen_source)
+ CF_ADD_CFLAGS($cf_xopen_source,true)
fi
dnl In anything but the default case, we may have system-specific setting
diff --git a/configure b/configure
index fa2bf87..4d31614 100755
--- a/configure
+++ b/configure
@@ -2043,7 +2043,7 @@ no)
-D*)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e
's/^-D[^=]*='\''\"[^"]*//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=yes
@@ -2084,7 +2084,7 @@ yes)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=no
;;
@@ -2656,6 +2656,9 @@ echo "${ECHO_T}$cf_cv_gnu_source" >&6
test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
;;
+minix*) #(vi
+ cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd
with this...
+ ;;
mirbsd*) #(vi
# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and
other headers which use u_int / u_short types
cf_XOPEN_SOURCE=
@@ -2673,16 +2676,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
-echo "$as_me:2676: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:2679: checking if we should define _POSIX_C_SOURCE" >&5
echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
if test "${cf_cv_posix_c_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-echo "${as_me:-configure}:2682: testing if the symbol is already defined go no
further ..." 1>&5
+echo "${as_me:-configure}:2685: testing if the symbol is already defined go no
further ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 2685 "configure"
+#line 2688 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -2697,16 +2700,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2700: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2703: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2703: \$? = $ac_status" >&5
+ echo "$as_me:2706: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2706: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2709: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2709: \$? = $ac_status" >&5
+ echo "$as_me:2712: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_posix_c_source=no
else
@@ -2727,7 +2730,7 @@ cf_want_posix_source=no
esac
if test "$cf_want_posix_source" = yes ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 2730 "configure"
+#line 2733 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -2742,16 +2745,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2745: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2748: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2748: \$? = $ac_status" >&5
+ echo "$as_me:2751: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2751: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2754: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2754: \$? = $ac_status" >&5
+ echo "$as_me:2757: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -2762,15 +2765,15 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "${as_me:-configure}:2765: testing ifdef from value $cf_POSIX_C_SOURCE
..." 1>&5
+echo "${as_me:-configure}:2768: testing ifdef from value $cf_POSIX_C_SOURCE
..." 1>&5
CFLAGS="$cf_trim_CFLAGS"
CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
-echo "${as_me:-configure}:2770: testing if the second compile does not leave
our definition intact error ..." 1>&5
+echo "${as_me:-configure}:2773: testing if the second compile does not leave
our definition intact error ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 2773 "configure"
+#line 2776 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -2785,16 +2788,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2788: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2791: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2791: \$? = $ac_status" >&5
+ echo "$as_me:2794: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2794: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2797: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2797: \$? = $ac_status" >&5
+ echo "$as_me:2800: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -2810,7 +2813,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:2813: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:2816: result: $cf_cv_posix_c_source" >&5
echo "${ECHO_T}$cf_cv_posix_c_source" >&6
if test "$cf_cv_posix_c_source" != no ; then
@@ -2832,7 +2835,7 @@ no)
-D*)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e
's/^-D[^=]*='\''\"[^"]*//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=yes
@@ -2873,7 +2876,7 @@ yes)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=no
;;
@@ -2924,14 +2927,14 @@ solaris2.*) #(vi
;;
*)
-echo "$as_me:2927: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:2930: checking if we should define _XOPEN_SOURCE" >&5
echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
if test "${cf_cv_xopen_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 2934 "configure"
+#line 2937 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -2950,16 +2953,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2953: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2956: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2956: \$? = $ac_status" >&5
+ echo "$as_me:2959: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2959: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2962: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2962: \$? = $ac_status" >&5
+ echo "$as_me:2965: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -2968,7 +2971,7 @@ cat conftest.$ac_ext >&5
cf_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
cat >conftest.$ac_ext <<_ACEOF
-#line 2971 "configure"
+#line 2974 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -2987,16 +2990,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2990: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2993: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2993: \$? = $ac_status" >&5
+ echo "$as_me:2996: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2996: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2999: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2999: \$? = $ac_status" >&5
+ echo "$as_me:3002: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -3011,7 +3014,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:3014: result: $cf_cv_xopen_source" >&5
+echo "$as_me:3017: result: $cf_cv_xopen_source" >&5
echo "${ECHO_T}$cf_cv_xopen_source" >&6
if test "$cf_cv_xopen_source" != no ; then
@@ -3041,7 +3044,7 @@ no)
-D*)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e
's/^-D[^=]*='\''\"[^"]*//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=yes
@@ -3082,7 +3085,7 @@ yes)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=no
;;
@@ -3119,16 +3122,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
-echo "$as_me:3122: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:3125: checking if we should define _POSIX_C_SOURCE" >&5
echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
if test "${cf_cv_posix_c_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-echo "${as_me:-configure}:3128: testing if the symbol is already defined go no
further ..." 1>&5
+echo "${as_me:-configure}:3131: testing if the symbol is already defined go no
further ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 3131 "configure"
+#line 3134 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -3143,16 +3146,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3146: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3149: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3149: \$? = $ac_status" >&5
+ echo "$as_me:3152: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3152: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3155: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3155: \$? = $ac_status" >&5
+ echo "$as_me:3158: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_posix_c_source=no
else
@@ -3173,7 +3176,7 @@ cf_want_posix_source=no
esac
if test "$cf_want_posix_source" = yes ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 3176 "configure"
+#line 3179 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -3188,16 +3191,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3191: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3194: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3194: \$? = $ac_status" >&5
+ echo "$as_me:3197: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3197: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3200: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3200: \$? = $ac_status" >&5
+ echo "$as_me:3203: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -3208,15 +3211,15 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "${as_me:-configure}:3211: testing ifdef from value $cf_POSIX_C_SOURCE
..." 1>&5
+echo "${as_me:-configure}:3214: testing ifdef from value $cf_POSIX_C_SOURCE
..." 1>&5
CFLAGS="$cf_trim_CFLAGS"
CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
-echo "${as_me:-configure}:3216: testing if the second compile does not leave
our definition intact error ..." 1>&5
+echo "${as_me:-configure}:3219: testing if the second compile does not leave
our definition intact error ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 3219 "configure"
+#line 3222 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -3231,16 +3234,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3234: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3237: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3237: \$? = $ac_status" >&5
+ echo "$as_me:3240: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3240: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3243: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3243: \$? = $ac_status" >&5
+ echo "$as_me:3246: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -3256,7 +3259,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:3259: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:3262: result: $cf_cv_posix_c_source" >&5
echo "${ECHO_T}$cf_cv_posix_c_source" >&6
if test "$cf_cv_posix_c_source" != no ; then
@@ -3278,7 +3281,7 @@ no)
-D*)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e
's/^-D[^=]*='\''\"[^"]*//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=yes
@@ -3319,7 +3322,7 @@ yes)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=no
;;
@@ -3363,7 +3366,7 @@ no)
-D*)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e
's/^-D[^=]*='\''\"[^"]*//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=yes
@@ -3404,7 +3407,7 @@ yes)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=no
;;
@@ -3412,16 +3415,25 @@ esac
done
if test -n "$cf_new_cflags" ; then
+ test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6
+
+echo "${as_me:-configure}:3420: testing add to \$CFLAGS $cf_new_cflags ..."
1>&5
CFLAGS="$CFLAGS $cf_new_cflags"
fi
if test -n "$cf_new_cppflags" ; then
+ test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6
+
+echo "${as_me:-configure}:3428: testing add to \$CPPFLAGS $cf_new_cppflags
..." 1>&5
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
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}:3436: testing add to \$EXTRA_CPPFLAGS
$cf_new_extra_cppflags ..." 1>&5
EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
fi
@@ -3429,10 +3441,10 @@ fi
fi
if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
- echo "$as_me:3432: checking if _XOPEN_SOURCE really is set" >&5
+ echo "$as_me:3444: checking if _XOPEN_SOURCE really is set" >&5
echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 3435 "configure"
+#line 3447 "configure"
#include "confdefs.h"
#include <stdlib.h>
int
@@ -3447,16 +3459,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3450: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3462: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3453: \$? = $ac_status" >&5
+ echo "$as_me:3465: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3456: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3468: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3459: \$? = $ac_status" >&5
+ echo "$as_me:3471: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_XOPEN_SOURCE_set=yes
else
@@ -3465,12 +3477,12 @@ cat conftest.$ac_ext >&5
cf_XOPEN_SOURCE_set=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:3468: result: $cf_XOPEN_SOURCE_set" >&5
+ echo "$as_me:3480: result: $cf_XOPEN_SOURCE_set" >&5
echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
if test $cf_XOPEN_SOURCE_set = yes
then
cat >conftest.$ac_ext <<_ACEOF
-#line 3473 "configure"
+#line 3485 "configure"
#include "confdefs.h"
#include <stdlib.h>
int
@@ -3485,16 +3497,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3488: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3500: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3491: \$? = $ac_status" >&5
+ echo "$as_me:3503: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3494: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3506: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3497: \$? = $ac_status" >&5
+ echo "$as_me:3509: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_XOPEN_SOURCE_set_ok=yes
else
@@ -3505,19 +3517,19 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
if test $cf_XOPEN_SOURCE_set_ok = no
then
- { echo "$as_me:3508: WARNING: _XOPEN_SOURCE is lower
than requested" >&5
+ { echo "$as_me:3520: WARNING: _XOPEN_SOURCE is lower
than requested" >&5
echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
fi
else
-echo "$as_me:3513: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:3525: checking if we should define _XOPEN_SOURCE" >&5
echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
if test "${cf_cv_xopen_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 3520 "configure"
+#line 3532 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -3536,16 +3548,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3539: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3551: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3542: \$? = $ac_status" >&5
+ echo "$as_me:3554: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3545: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3557: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3548: \$? = $ac_status" >&5
+ echo "$as_me:3560: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -3554,7 +3566,7 @@ cat conftest.$ac_ext >&5
cf_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
cat >conftest.$ac_ext <<_ACEOF
-#line 3557 "configure"
+#line 3569 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -3573,16 +3585,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3576: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3588: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3579: \$? = $ac_status" >&5
+ echo "$as_me:3591: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3582: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3594: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3585: \$? = $ac_status" >&5
+ echo "$as_me:3597: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -3597,7 +3609,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:3600: result: $cf_cv_xopen_source" >&5
+echo "$as_me:3612: result: $cf_cv_xopen_source" >&5
echo "${ECHO_T}$cf_cv_xopen_source" >&6
if test "$cf_cv_xopen_source" != no ; then
@@ -3627,7 +3639,7 @@ no)
-D*)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e
's/^-D[^=]*='\''\"[^"]*//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=yes
@@ -3668,7 +3680,7 @@ yes)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=no
;;
@@ -3695,14 +3707,14 @@ fi
fi
fi
-echo "$as_me:3698: checking if SIGWINCH is defined" >&5
+echo "$as_me:3710: checking if SIGWINCH is defined" >&5
echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
if test "${cf_cv_define_sigwinch+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 3705 "configure"
+#line 3717 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -3717,23 +3729,23 @@ int x = SIGWINCH
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3720: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3732: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3723: \$? = $ac_status" >&5
+ echo "$as_me:3735: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3726: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3738: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3729: \$? = $ac_status" >&5
+ echo "$as_me:3741: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_define_sigwinch=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 3736 "configure"
+#line 3748 "configure"
#include "confdefs.h"
#undef _XOPEN_SOURCE
@@ -3751,16 +3763,16 @@ int x = SIGWINCH
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3754: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3766: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3757: \$? = $ac_status" >&5
+ echo "$as_me:3769: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3760: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3772: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3763: \$? = $ac_status" >&5
+ echo "$as_me:3775: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_define_sigwinch=maybe
else
@@ -3774,11 +3786,11 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:3777: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:3789: result: $cf_cv_define_sigwinch" >&5
echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
if test "$cf_cv_define_sigwinch" = maybe ; then
-echo "$as_me:3781: checking for actual SIGWINCH definition" >&5
+echo "$as_me:3793: checking for actual SIGWINCH definition" >&5
echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
if test "${cf_cv_fixup_sigwinch+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3789,7 +3801,7 @@ cf_sigwinch=32
while test $cf_sigwinch != 1
do
cat >conftest.$ac_ext <<_ACEOF
-#line 3792 "configure"
+#line 3804 "configure"
#include "confdefs.h"
#undef _XOPEN_SOURCE
@@ -3811,16 +3823,16 @@ int x = SIGWINCH
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3814: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3826: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3817: \$? = $ac_status" >&5
+ echo "$as_me:3829: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3820: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3832: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3823: \$? = $ac_status" >&5
+ echo "$as_me:3835: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_fixup_sigwinch=$cf_sigwinch
break
@@ -3834,7 +3846,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
done
fi
-echo "$as_me:3837: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:3849: result: $cf_cv_fixup_sigwinch" >&5
echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -3856,23 +3868,23 @@ wchar.h \
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3859: checking for $ac_header" >&5
+echo "$as_me:3871: 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 3865 "configure"
+#line 3877 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:3869: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3881: \"$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:3875: \$? = $ac_status" >&5
+ echo "$as_me:3887: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3891,7 +3903,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:3894: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:3906: 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
@@ -3901,13 +3913,13 @@ EOF
fi
done
-echo "$as_me:3904: checking whether time.h and sys/time.h may both be
included" >&5
+echo "$as_me:3916: checking whether time.h and sys/time.h may both be
included" >&5
echo $ECHO_N "checking whether time.h and sys/time.h may both be included...
$ECHO_C" >&6
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 3910 "configure"
+#line 3922 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -3923,16 +3935,16 @@ return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3926: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3938: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3929: \$? = $ac_status" >&5
+ echo "$as_me:3941: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3932: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3944: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3935: \$? = $ac_status" >&5
+ echo "$as_me:3947: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_header_time=yes
else
@@ -3942,7 +3954,7 @@ ac_cv_header_time=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:3945: result: $ac_cv_header_time" >&5
+echo "$as_me:3957: result: $ac_cv_header_time" >&5
echo "${ECHO_T}$ac_cv_header_time" >&6
if test $ac_cv_header_time = yes; then
@@ -3952,13 +3964,13 @@ EOF
fi
- echo "$as_me:3955: checking for nl_langinfo and CODESET" >&5
+ echo "$as_me:3967: checking for nl_langinfo and CODESET" >&5
echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
if test "${am_cv_langinfo_codeset+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 3961 "configure"
+#line 3973 "configure"
#include "confdefs.h"
#include <langinfo.h>
int
@@ -3970,16 +3982,16 @@ char* cs = nl_langinfo(CODESET);
}
--
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/e1xmhjq-0004lr...@moszumanska.debian.org
