aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2004-09-30 01:20:39 +0000
committerMiles Bader2004-09-30 01:20:39 +0000
commited1ae069fd2c8652f6cec917ba94f5f95546cdd7 (patch)
tree59b7c3c4d32d5da944e3d135e653974240d72bbf
parentda39f3418de1cbfd09f62f526991d4977af657b1 (diff)
parent14e20e1309c68b214db1b6d3c369a2c2bdaeb4e2 (diff)
downloademacs-ed1ae069fd2c8652f6cec917ba94f5f95546cdd7.tar.gz
emacs-ed1ae069fd2c8652f6cec917ba94f5f95546cdd7.zip
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-48
Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-581 Fix exec-shield autoconf test * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-582 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-584 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-585 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-586 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-38 Update from CVS
Diffstat
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure539
-rw-r--r--configure.in2
-rw-r--r--etc/NEWS29
-rw-r--r--lisp/ChangeLog31
-rw-r--r--lisp/diff-mode.el9
-rw-r--r--lisp/gnus/ChangeLog4
-rw-r--r--lisp/gnus/gnus.el32
-rw-r--r--lisp/newcomment.el9
-rw-r--r--lisp/textmodes/paragraphs.el5
-rw-r--r--lispref/ChangeLog9
-rw-r--r--lispref/display.texi84
-rw-r--r--src/ChangeLog36
-rw-r--r--src/dispextern.h28
-rw-r--r--src/fringe.c151
-rw-r--r--src/w32term.c17
-rw-r--r--src/xdisp.c9
17 files changed, 461 insertions, 538 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b77d509727..596fc6023a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12004-09-29 Miles Bader <miles@gnu.org>
2
3 * configure.in (HAVE_EXECSHIELD): Test correct env variable to see
4 if setarch is present.
5
12004-09-25 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 62004-09-25 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 7
3 * configure.in (HAVE_EXECSHIELD): Only define on x86. 8 * configure.in (HAVE_EXECSHIELD): Only define on x86.
diff --git a/configure b/configure
index 6cbdf0b2e99..817d0fc09d9 100755
--- a/configure
+++ b/configure
@@ -984,7 +984,7 @@ esac
984 else 984 else
985 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 985 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
986 fi 986 fi
987 cd $ac_popdir 987 cd "$ac_popdir"
988 done 988 done
989fi 989fi
990 990
@@ -3250,8 +3250,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3250 cat conftest.err >&5 3250 cat conftest.err >&5
3251 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3251 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3252 (exit $ac_status); } && 3252 (exit $ac_status); } &&
3253 { ac_try='test -z "$ac_c_werror_flag" 3253 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3254 || test ! -s conftest.err'
3255 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3254 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3256 (eval $ac_try) 2>&5 3255 (eval $ac_try) 2>&5
3257 ac_status=$? 3256 ac_status=$?
@@ -3309,8 +3308,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3309 cat conftest.err >&5 3308 cat conftest.err >&5
3310 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3309 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3311 (exit $ac_status); } && 3310 (exit $ac_status); } &&
3312 { ac_try='test -z "$ac_c_werror_flag" 3311 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3313 || test ! -s conftest.err'
3314 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3312 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3315 (eval $ac_try) 2>&5 3313 (eval $ac_try) 2>&5
3316 ac_status=$? 3314 ac_status=$?
@@ -3426,8 +3424,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3426 cat conftest.err >&5 3424 cat conftest.err >&5
3427 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3425 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3428 (exit $ac_status); } && 3426 (exit $ac_status); } &&
3429 { ac_try='test -z "$ac_c_werror_flag" 3427 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3430 || test ! -s conftest.err'
3431 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3428 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3432 (eval $ac_try) 2>&5 3429 (eval $ac_try) 2>&5
3433 ac_status=$? 3430 ac_status=$?
@@ -3481,8 +3478,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3481 cat conftest.err >&5 3478 cat conftest.err >&5
3482 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3479 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3483 (exit $ac_status); } && 3480 (exit $ac_status); } &&
3484 { ac_try='test -z "$ac_c_werror_flag" 3481 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3485 || test ! -s conftest.err'
3486 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3482 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3487 (eval $ac_try) 2>&5 3483 (eval $ac_try) 2>&5
3488 ac_status=$? 3484 ac_status=$?
@@ -3527,8 +3523,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3527 cat conftest.err >&5 3523 cat conftest.err >&5
3528 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3524 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3529 (exit $ac_status); } && 3525 (exit $ac_status); } &&
3530 { ac_try='test -z "$ac_c_werror_flag" 3526 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3531 || test ! -s conftest.err'
3532 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3527 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3533 (eval $ac_try) 2>&5 3528 (eval $ac_try) 2>&5
3534 ac_status=$? 3529 ac_status=$?
@@ -3572,8 +3567,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3572 cat conftest.err >&5 3567 cat conftest.err >&5
3573 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3568 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3574 (exit $ac_status); } && 3569 (exit $ac_status); } &&
3575 { ac_try='test -z "$ac_c_werror_flag" 3570 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3576 || test ! -s conftest.err'
3577 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3571 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3578 (eval $ac_try) 2>&5 3572 (eval $ac_try) 2>&5
3579 ac_status=$? 3573 ac_status=$?
@@ -4206,8 +4200,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4206 cat conftest.err >&5 4200 cat conftest.err >&5
4207 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4201 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4208 (exit $ac_status); } && 4202 (exit $ac_status); } &&
4209 { ac_try='test -z "$ac_c_werror_flag" 4203 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4210 || test ! -s conftest.err'
4211 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4204 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4212 (eval $ac_try) 2>&5 4205 (eval $ac_try) 2>&5
4213 ac_status=$? 4206 ac_status=$?
@@ -4343,7 +4336,7 @@ echo "${ECHO_T}no" >&6
4343fi 4336fi
4344 4337
4345 4338
4346 if test "$setarch" != no && test "$machine" = "intel386"; then 4339 if test "$SETARCH" != no && test "$machine" = "intel386"; then
4347 4340
4348cat >>confdefs.h <<\_ACEOF 4341cat >>confdefs.h <<\_ACEOF
4349#define HAVE_EXECSHIELD 1 4342#define HAVE_EXECSHIELD 1
@@ -4568,8 +4561,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4568 cat conftest.err >&5 4561 cat conftest.err >&5
4569 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4562 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4570 (exit $ac_status); } && 4563 (exit $ac_status); } &&
4571 { ac_try='test -z "$ac_c_werror_flag" 4564 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4572 || test ! -s conftest.err'
4573 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4565 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4574 (eval $ac_try) 2>&5 4566 (eval $ac_try) 2>&5
4575 ac_status=$? 4567 ac_status=$?
@@ -4598,8 +4590,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4598 cat conftest.err >&5 4590 cat conftest.err >&5
4599 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4591 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4600 (exit $ac_status); } && 4592 (exit $ac_status); } &&
4601 { ac_try='test -z "$ac_c_werror_flag" 4593 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4602 || test ! -s conftest.err'
4603 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4594 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4604 (eval $ac_try) 2>&5 4595 (eval $ac_try) 2>&5
4605 ac_status=$? 4596 ac_status=$?
@@ -4669,8 +4660,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4669 cat conftest.err >&5 4660 cat conftest.err >&5
4670 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4661 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4671 (exit $ac_status); } && 4662 (exit $ac_status); } &&
4672 { ac_try='test -z "$ac_c_werror_flag" 4663 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4673 || test ! -s conftest.err'
4674 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4664 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4675 (eval $ac_try) 2>&5 4665 (eval $ac_try) 2>&5
4676 ac_status=$? 4666 ac_status=$?
@@ -4722,8 +4712,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4722 cat conftest.err >&5 4712 cat conftest.err >&5
4723 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4713 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4724 (exit $ac_status); } && 4714 (exit $ac_status); } &&
4725 { ac_try='test -z "$ac_c_werror_flag" 4715 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4726 || test ! -s conftest.err'
4727 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4716 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4728 (eval $ac_try) 2>&5 4717 (eval $ac_try) 2>&5
4729 ac_status=$? 4718 ac_status=$?
@@ -4794,8 +4783,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4794 cat conftest.err >&5 4783 cat conftest.err >&5
4795 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4784 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4796 (exit $ac_status); } && 4785 (exit $ac_status); } &&
4797 { ac_try='test -z "$ac_c_werror_flag" 4786 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4798 || test ! -s conftest.err'
4799 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4787 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4800 (eval $ac_try) 2>&5 4788 (eval $ac_try) 2>&5
4801 ac_status=$? 4789 ac_status=$?
@@ -4847,8 +4835,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4847 cat conftest.err >&5 4835 cat conftest.err >&5
4848 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4836 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4849 (exit $ac_status); } && 4837 (exit $ac_status); } &&
4850 { ac_try='test -z "$ac_c_werror_flag" 4838 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4851 || test ! -s conftest.err'
4852 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4839 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4853 (eval $ac_try) 2>&5 4840 (eval $ac_try) 2>&5
4854 ac_status=$? 4841 ac_status=$?
@@ -4918,8 +4905,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4918 cat conftest.err >&5 4905 cat conftest.err >&5
4919 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4906 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4920 (exit $ac_status); } && 4907 (exit $ac_status); } &&
4921 { ac_try='test -z "$ac_c_werror_flag" 4908 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
4922 || test ! -s conftest.err'
4923 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4909 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4924 (eval $ac_try) 2>&5 4910 (eval $ac_try) 2>&5
4925 ac_status=$? 4911 ac_status=$?
@@ -5089,8 +5075,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5089 cat conftest.err >&5 5075 cat conftest.err >&5
5090 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5076 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5091 (exit $ac_status); } && 5077 (exit $ac_status); } &&
5092 { ac_try='test -z "$ac_c_werror_flag" 5078 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5093 || test ! -s conftest.err'
5094 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5079 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5095 (eval $ac_try) 2>&5 5080 (eval $ac_try) 2>&5
5096 ac_status=$? 5081 ac_status=$?
@@ -5159,8 +5144,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5159 cat conftest.err >&5 5144 cat conftest.err >&5
5160 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5145 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5161 (exit $ac_status); } && 5146 (exit $ac_status); } &&
5162 { ac_try='test -z "$ac_c_werror_flag" 5147 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5163 || test ! -s conftest.err'
5164 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5148 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5165 (eval $ac_try) 2>&5 5149 (eval $ac_try) 2>&5
5166 ac_status=$? 5150 ac_status=$?
@@ -5314,8 +5298,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5314 cat conftest.err >&5 5298 cat conftest.err >&5
5315 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5299 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5316 (exit $ac_status); } && 5300 (exit $ac_status); } &&
5317 { ac_try='test -z "$ac_c_werror_flag" 5301 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5318 || test ! -s conftest.err'
5319 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5302 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5320 (eval $ac_try) 2>&5 5303 (eval $ac_try) 2>&5
5321 ac_status=$? 5304 ac_status=$?
@@ -5408,8 +5391,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5408 cat conftest.err >&5 5391 cat conftest.err >&5
5409 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5392 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5410 (exit $ac_status); } && 5393 (exit $ac_status); } &&
5411 { ac_try='test -z "$ac_c_werror_flag" 5394 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5412 || test ! -s conftest.err'
5413 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5395 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5414 (eval $ac_try) 2>&5 5396 (eval $ac_try) 2>&5
5415 ac_status=$? 5397 ac_status=$?
@@ -5612,8 +5594,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5612 cat conftest.err >&5 5594 cat conftest.err >&5
5613 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5595 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5614 (exit $ac_status); } && 5596 (exit $ac_status); } &&
5615 { ac_try='test -z "$ac_c_werror_flag" 5597 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5616 || test ! -s conftest.err'
5617 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5598 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5618 (eval $ac_try) 2>&5 5599 (eval $ac_try) 2>&5
5619 ac_status=$? 5600 ac_status=$?
@@ -5778,8 +5759,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5778 cat conftest.err >&5 5759 cat conftest.err >&5
5779 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5760 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5780 (exit $ac_status); } && 5761 (exit $ac_status); } &&
5781 { ac_try='test -z "$ac_c_werror_flag" 5762 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5782 || test ! -s conftest.err'
5783 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5763 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5784 (eval $ac_try) 2>&5 5764 (eval $ac_try) 2>&5
5785 ac_status=$? 5765 ac_status=$?
@@ -5842,8 +5822,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5842 cat conftest.err >&5 5822 cat conftest.err >&5
5843 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5823 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5844 (exit $ac_status); } && 5824 (exit $ac_status); } &&
5845 { ac_try='test -z "$ac_c_werror_flag" 5825 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5846 || test ! -s conftest.err'
5847 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5826 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5848 (eval $ac_try) 2>&5 5827 (eval $ac_try) 2>&5
5849 ac_status=$? 5828 ac_status=$?
@@ -5916,8 +5895,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5916 cat conftest.err >&5 5895 cat conftest.err >&5
5917 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5896 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5918 (exit $ac_status); } && 5897 (exit $ac_status); } &&
5919 { ac_try='test -z "$ac_c_werror_flag" 5898 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5920 || test ! -s conftest.err'
5921 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5899 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5922 (eval $ac_try) 2>&5 5900 (eval $ac_try) 2>&5
5923 ac_status=$? 5901 ac_status=$?
@@ -6003,8 +5981,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6003 cat conftest.err >&5 5981 cat conftest.err >&5
6004 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5982 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6005 (exit $ac_status); } && 5983 (exit $ac_status); } &&
6006 { ac_try='test -z "$ac_c_werror_flag" 5984 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6007 || test ! -s conftest.err'
6008 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5985 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6009 (eval $ac_try) 2>&5 5986 (eval $ac_try) 2>&5
6010 ac_status=$? 5987 ac_status=$?
@@ -6077,8 +6054,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6077 cat conftest.err >&5 6054 cat conftest.err >&5
6078 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6055 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6079 (exit $ac_status); } && 6056 (exit $ac_status); } &&
6080 { ac_try='test -z "$ac_c_werror_flag" 6057 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6081 || test ! -s conftest.err'
6082 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6058 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6083 (eval $ac_try) 2>&5 6059 (eval $ac_try) 2>&5
6084 ac_status=$? 6060 ac_status=$?
@@ -6148,8 +6124,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6148 cat conftest.err >&5 6124 cat conftest.err >&5
6149 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6125 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6150 (exit $ac_status); } && 6126 (exit $ac_status); } &&
6151 { ac_try='test -z "$ac_c_werror_flag" 6127 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6152 || test ! -s conftest.err'
6153 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6128 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6154 (eval $ac_try) 2>&5 6129 (eval $ac_try) 2>&5
6155 ac_status=$? 6130 ac_status=$?
@@ -6208,8 +6183,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6208 cat conftest.err >&5 6183 cat conftest.err >&5
6209 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6184 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6210 (exit $ac_status); } && 6185 (exit $ac_status); } &&
6211 { ac_try='test -z "$ac_c_werror_flag" 6186 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6212 || test ! -s conftest.err'
6213 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6187 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6214 (eval $ac_try) 2>&5 6188 (eval $ac_try) 2>&5
6215 ac_status=$? 6189 ac_status=$?
@@ -6278,8 +6252,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6278 cat conftest.err >&5 6252 cat conftest.err >&5
6279 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6253 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6280 (exit $ac_status); } && 6254 (exit $ac_status); } &&
6281 { ac_try='test -z "$ac_c_werror_flag" 6255 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6282 || test ! -s conftest.err'
6283 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6256 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6284 (eval $ac_try) 2>&5 6257 (eval $ac_try) 2>&5
6285 ac_status=$? 6258 ac_status=$?
@@ -6340,8 +6313,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6340 cat conftest.err >&5 6313 cat conftest.err >&5
6341 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6314 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6342 (exit $ac_status); } && 6315 (exit $ac_status); } &&
6343 { ac_try='test -z "$ac_c_werror_flag" 6316 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6344 || test ! -s conftest.err'
6345 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6317 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6346 (eval $ac_try) 2>&5 6318 (eval $ac_try) 2>&5
6347 ac_status=$? 6319 ac_status=$?
@@ -6407,8 +6379,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6407 cat conftest.err >&5 6379 cat conftest.err >&5
6408 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6380 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6409 (exit $ac_status); } && 6381 (exit $ac_status); } &&
6410 { ac_try='test -z "$ac_c_werror_flag" 6382 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6411 || test ! -s conftest.err'
6412 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6383 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6413 (eval $ac_try) 2>&5 6384 (eval $ac_try) 2>&5
6414 ac_status=$? 6385 ac_status=$?
@@ -6554,8 +6525,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6554 cat conftest.err >&5 6525 cat conftest.err >&5
6555 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6526 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6556 (exit $ac_status); } && 6527 (exit $ac_status); } &&
6557 { ac_try='test -z "$ac_c_werror_flag" 6528 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6558 || test ! -s conftest.err'
6559 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6529 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6560 (eval $ac_try) 2>&5 6530 (eval $ac_try) 2>&5
6561 ac_status=$? 6531 ac_status=$?
@@ -6619,8 +6589,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6619 cat conftest.err >&5 6589 cat conftest.err >&5
6620 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6590 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6621 (exit $ac_status); } && 6591 (exit $ac_status); } &&
6622 { ac_try='test -z "$ac_c_werror_flag" 6592 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6623 || test ! -s conftest.err'
6624 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6593 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6625 (eval $ac_try) 2>&5 6594 (eval $ac_try) 2>&5
6626 ac_status=$? 6595 ac_status=$?
@@ -6685,8 +6654,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6685 cat conftest.err >&5 6654 cat conftest.err >&5
6686 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6655 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6687 (exit $ac_status); } && 6656 (exit $ac_status); } &&
6688 { ac_try='test -z "$ac_c_werror_flag" 6657 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6689 || test ! -s conftest.err'
6690 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6658 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6691 (eval $ac_try) 2>&5 6659 (eval $ac_try) 2>&5
6692 ac_status=$? 6660 ac_status=$?
@@ -6732,8 +6700,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6732 cat conftest.err >&5 6700 cat conftest.err >&5
6733 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6701 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6734 (exit $ac_status); } && 6702 (exit $ac_status); } &&
6735 { ac_try='test -z "$ac_c_werror_flag" 6703 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6736 || test ! -s conftest.err'
6737 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6704 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6738 (eval $ac_try) 2>&5 6705 (eval $ac_try) 2>&5
6739 ac_status=$? 6706 ac_status=$?
@@ -6807,8 +6774,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6807 cat conftest.err >&5 6774 cat conftest.err >&5
6808 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6775 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6809 (exit $ac_status); } && 6776 (exit $ac_status); } &&
6810 { ac_try='test -z "$ac_c_werror_flag" 6777 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6811 || test ! -s conftest.err'
6812 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6778 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6813 (eval $ac_try) 2>&5 6779 (eval $ac_try) 2>&5
6814 ac_status=$? 6780 ac_status=$?
@@ -6873,8 +6839,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6873 cat conftest.err >&5 6839 cat conftest.err >&5
6874 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6840 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6875 (exit $ac_status); } && 6841 (exit $ac_status); } &&
6876 { ac_try='test -z "$ac_c_werror_flag" 6842 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6877 || test ! -s conftest.err'
6878 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6843 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6879 (eval $ac_try) 2>&5 6844 (eval $ac_try) 2>&5
6880 ac_status=$? 6845 ac_status=$?
@@ -6918,8 +6883,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6918 cat conftest.err >&5 6883 cat conftest.err >&5
6919 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6884 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6920 (exit $ac_status); } && 6885 (exit $ac_status); } &&
6921 { ac_try='test -z "$ac_c_werror_flag" 6886 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6922 || test ! -s conftest.err'
6923 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6887 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6924 (eval $ac_try) 2>&5 6888 (eval $ac_try) 2>&5
6925 ac_status=$? 6889 ac_status=$?
@@ -6990,8 +6954,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6990 cat conftest.err >&5 6954 cat conftest.err >&5
6991 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6955 echo "$as_me:$LINENO: \$? = $ac_status" >&5
6992 (exit $ac_status); } && 6956 (exit $ac_status); } &&
6993 { ac_try='test -z "$ac_c_werror_flag" 6957 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6994 || test ! -s conftest.err'
6995 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6958 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6996 (eval $ac_try) 2>&5 6959 (eval $ac_try) 2>&5
6997 ac_status=$? 6960 ac_status=$?
@@ -7041,8 +7004,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7041 cat conftest.err >&5 7004 cat conftest.err >&5
7042 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7005 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7043 (exit $ac_status); } && 7006 (exit $ac_status); } &&
7044 { ac_try='test -z "$ac_c_werror_flag" 7007 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7045 || test ! -s conftest.err'
7046 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7008 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7047 (eval $ac_try) 2>&5 7009 (eval $ac_try) 2>&5
7048 ac_status=$? 7010 ac_status=$?
@@ -7113,8 +7075,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7113 cat conftest.err >&5 7075 cat conftest.err >&5
7114 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7076 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7115 (exit $ac_status); } && 7077 (exit $ac_status); } &&
7116 { ac_try='test -z "$ac_c_werror_flag" 7078 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7117 || test ! -s conftest.err'
7118 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7079 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7119 (eval $ac_try) 2>&5 7080 (eval $ac_try) 2>&5
7120 ac_status=$? 7081 ac_status=$?
@@ -7164,8 +7125,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7164 cat conftest.err >&5 7125 cat conftest.err >&5
7165 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7126 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7166 (exit $ac_status); } && 7127 (exit $ac_status); } &&
7167 { ac_try='test -z "$ac_c_werror_flag" 7128 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7168 || test ! -s conftest.err'
7169 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7129 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7170 (eval $ac_try) 2>&5 7130 (eval $ac_try) 2>&5
7171 ac_status=$? 7131 ac_status=$?
@@ -7236,8 +7196,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7236 cat conftest.err >&5 7196 cat conftest.err >&5
7237 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7197 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7238 (exit $ac_status); } && 7198 (exit $ac_status); } &&
7239 { ac_try='test -z "$ac_c_werror_flag" 7199 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7240 || test ! -s conftest.err'
7241 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7200 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7242 (eval $ac_try) 2>&5 7201 (eval $ac_try) 2>&5
7243 ac_status=$? 7202 ac_status=$?
@@ -7287,8 +7246,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7287 cat conftest.err >&5 7246 cat conftest.err >&5
7288 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7247 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7289 (exit $ac_status); } && 7248 (exit $ac_status); } &&
7290 { ac_try='test -z "$ac_c_werror_flag" 7249 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7291 || test ! -s conftest.err'
7292 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7250 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7293 (eval $ac_try) 2>&5 7251 (eval $ac_try) 2>&5
7294 ac_status=$? 7252 ac_status=$?
@@ -7359,8 +7317,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7359 cat conftest.err >&5 7317 cat conftest.err >&5
7360 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7318 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7361 (exit $ac_status); } && 7319 (exit $ac_status); } &&
7362 { ac_try='test -z "$ac_c_werror_flag" 7320 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7363 || test ! -s conftest.err'
7364 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7321 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7365 (eval $ac_try) 2>&5 7322 (eval $ac_try) 2>&5
7366 ac_status=$? 7323 ac_status=$?
@@ -7410,8 +7367,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7410 cat conftest.err >&5 7367 cat conftest.err >&5
7411 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7368 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7412 (exit $ac_status); } && 7369 (exit $ac_status); } &&
7413 { ac_try='test -z "$ac_c_werror_flag" 7370 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7414 || test ! -s conftest.err'
7415 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7371 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7416 (eval $ac_try) 2>&5 7372 (eval $ac_try) 2>&5
7417 ac_status=$? 7373 ac_status=$?
@@ -7482,8 +7438,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7482 cat conftest.err >&5 7438 cat conftest.err >&5
7483 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7439 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7484 (exit $ac_status); } && 7440 (exit $ac_status); } &&
7485 { ac_try='test -z "$ac_c_werror_flag" 7441 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7486 || test ! -s conftest.err'
7487 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7442 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7488 (eval $ac_try) 2>&5 7443 (eval $ac_try) 2>&5
7489 ac_status=$? 7444 ac_status=$?
@@ -7533,8 +7488,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7533 cat conftest.err >&5 7488 cat conftest.err >&5
7534 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7489 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7535 (exit $ac_status); } && 7490 (exit $ac_status); } &&
7536 { ac_try='test -z "$ac_c_werror_flag" 7491 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7537 || test ! -s conftest.err'
7538 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7492 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7539 (eval $ac_try) 2>&5 7493 (eval $ac_try) 2>&5
7540 ac_status=$? 7494 ac_status=$?
@@ -7621,8 +7575,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7621 cat conftest.err >&5 7575 cat conftest.err >&5
7622 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7576 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7623 (exit $ac_status); } && 7577 (exit $ac_status); } &&
7624 { ac_try='test -z "$ac_c_werror_flag" 7578 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7625 || test ! -s conftest.err'
7626 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7579 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7627 (eval $ac_try) 2>&5 7580 (eval $ac_try) 2>&5
7628 ac_status=$? 7581 ac_status=$?
@@ -7728,8 +7681,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7728 cat conftest.err >&5 7681 cat conftest.err >&5
7729 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7682 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7730 (exit $ac_status); } && 7683 (exit $ac_status); } &&
7731 { ac_try='test -z "$ac_c_werror_flag" 7684 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7732 || test ! -s conftest.err'
7733 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7685 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7734 (eval $ac_try) 2>&5 7686 (eval $ac_try) 2>&5
7735 ac_status=$? 7687 ac_status=$?
@@ -7789,8 +7741,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7789 cat conftest.err >&5 7741 cat conftest.err >&5
7790 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7742 echo "$as_me:$LINENO: \$? = $ac_status" >&5
7791 (exit $ac_status); } && 7743 (exit $ac_status); } &&
7792 { ac_try='test -z "$ac_c_werror_flag" 7744 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
7793 || test ! -s conftest.err'
7794 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7745 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7795 (eval $ac_try) 2>&5 7746 (eval $ac_try) 2>&5
7796 ac_status=$? 7747 ac_status=$?
@@ -7912,6 +7863,7 @@ fi
7912echo "$as_me:$LINENO: checking for X" >&5 7863echo "$as_me:$LINENO: checking for X" >&5
7913echo $ECHO_N "checking for X... $ECHO_C" >&6 7864echo $ECHO_N "checking for X... $ECHO_C" >&6
7914 7865
7866ac_path_x_has_been_run=yes
7915 7867
7916# Check whether --with-x or --without-x was given. 7868# Check whether --with-x or --without-x was given.
7917if test "${with_x+set}" = set; then 7869if test "${with_x+set}" = set; then
@@ -8004,7 +7956,7 @@ ac_x_header_dirs='
8004/usr/openwin/share/include' 7956/usr/openwin/share/include'
8005 7957
8006if test "$ac_x_includes" = no; then 7958if test "$ac_x_includes" = no; then
8007 # Guess where to find include files, by looking for Intrinsic.h. 7959 # Guess where to find include files, by looking for a specified header file.
8008 # First, try using that file with no special directory specified. 7960 # First, try using that file with no special directory specified.
8009 cat >conftest.$ac_ext <<_ACEOF 7961 cat >conftest.$ac_ext <<_ACEOF
8010/* confdefs.h. */ 7962/* confdefs.h. */
@@ -8078,8 +8030,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8078 cat conftest.err >&5 8030 cat conftest.err >&5
8079 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8031 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8080 (exit $ac_status); } && 8032 (exit $ac_status); } &&
8081 { ac_try='test -z "$ac_c_werror_flag" 8033 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8082 || test ! -s conftest.err'
8083 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8034 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8084 (eval $ac_try) 2>&5 8035 (eval $ac_try) 2>&5
8085 ac_status=$? 8036 ac_status=$?
@@ -8139,8 +8090,12 @@ else
8139 # Update the cache value to reflect the command line values. 8090 # Update the cache value to reflect the command line values.
8140 ac_cv_have_x="have_x=yes \ 8091 ac_cv_have_x="have_x=yes \
8141 ac_x_includes=$x_includes ac_x_libraries=$x_libraries" 8092 ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
8142 echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 8093 # It might be that x_includes is empty (headers are found in the
8143echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 8094 # standard search path. Then output the corresponding message
8095 ac_out_x_includes=$x_includes
8096 test "x$x_includes" = x && ac_out_x_includes="in standard search path"
8097 echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
8098echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
8144fi 8099fi
8145 8100
8146if test "$no_x" = yes; then 8101if test "$no_x" = yes; then
@@ -8304,8 +8259,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8304 cat conftest.err >&5 8259 cat conftest.err >&5
8305 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8260 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8306 (exit $ac_status); } && 8261 (exit $ac_status); } &&
8307 { ac_try='test -z "$ac_c_werror_flag" 8262 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8308 || test ! -s conftest.err'
8309 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8263 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8310 (eval $ac_try) 2>&5 8264 (eval $ac_try) 2>&5
8311 ac_status=$? 8265 ac_status=$?
@@ -8400,8 +8354,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8400 cat conftest.err >&5 8354 cat conftest.err >&5
8401 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8355 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8402 (exit $ac_status); } && 8356 (exit $ac_status); } &&
8403 { ac_try='test -z "$ac_c_werror_flag" 8357 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8404 || test ! -s conftest.err'
8405 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8358 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8406 (eval $ac_try) 2>&5 8359 (eval $ac_try) 2>&5
8407 ac_status=$? 8360 ac_status=$?
@@ -8460,8 +8413,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8460 cat conftest.err >&5 8413 cat conftest.err >&5
8461 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8414 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8462 (exit $ac_status); } && 8415 (exit $ac_status); } &&
8463 { ac_try='test -z "$ac_c_werror_flag" 8416 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8464 || test ! -s conftest.err'
8465 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8417 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8466 (eval $ac_try) 2>&5 8418 (eval $ac_try) 2>&5
8467 ac_status=$? 8419 ac_status=$?
@@ -8545,8 +8497,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8545 cat conftest.err >&5 8497 cat conftest.err >&5
8546 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8498 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8547 (exit $ac_status); } && 8499 (exit $ac_status); } &&
8548 { ac_try='test -z "$ac_c_werror_flag" 8500 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8549 || test ! -s conftest.err'
8550 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8501 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8551 (eval $ac_try) 2>&5 8502 (eval $ac_try) 2>&5
8552 ac_status=$? 8503 ac_status=$?
@@ -8730,8 +8681,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8730 cat conftest.err >&5 8681 cat conftest.err >&5
8731 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8682 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8732 (exit $ac_status); } && 8683 (exit $ac_status); } &&
8733 { ac_try='test -z "$ac_c_werror_flag" 8684 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8734 || test ! -s conftest.err'
8735 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8685 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8736 (eval $ac_try) 2>&5 8686 (eval $ac_try) 2>&5
8737 ac_status=$? 8687 ac_status=$?
@@ -8983,8 +8933,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8983 cat conftest.err >&5 8933 cat conftest.err >&5
8984 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8934 echo "$as_me:$LINENO: \$? = $ac_status" >&5
8985 (exit $ac_status); } && 8935 (exit $ac_status); } &&
8986 { ac_try='test -z "$ac_c_werror_flag" 8936 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8987 || test ! -s conftest.err'
8988 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8937 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8989 (eval $ac_try) 2>&5 8938 (eval $ac_try) 2>&5
8990 ac_status=$? 8939 ac_status=$?
@@ -9051,8 +9000,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
9051 cat conftest.err >&5 9000 cat conftest.err >&5
9052 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9001 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9053 (exit $ac_status); } && 9002 (exit $ac_status); } &&
9054 { ac_try='test -z "$ac_c_werror_flag" 9003 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9055 || test ! -s conftest.err'
9056 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9004 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9057 (eval $ac_try) 2>&5 9005 (eval $ac_try) 2>&5
9058 ac_status=$? 9006 ac_status=$?
@@ -9121,8 +9069,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
9121 cat conftest.err >&5 9069 cat conftest.err >&5
9122 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9070 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9123 (exit $ac_status); } && 9071 (exit $ac_status); } &&
9124 { ac_try='test -z "$ac_c_werror_flag" 9072 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9125 || test ! -s conftest.err'
9126 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9073 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9127 (eval $ac_try) 2>&5 9074 (eval $ac_try) 2>&5
9128 ac_status=$? 9075 ac_status=$?
@@ -9207,8 +9154,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
9207 cat conftest.err >&5 9154 cat conftest.err >&5
9208 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9155 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9209 (exit $ac_status); } && 9156 (exit $ac_status); } &&
9210 { ac_try='test -z "$ac_c_werror_flag" 9157 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9211 || test ! -s conftest.err'
9212 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9158 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9213 (eval $ac_try) 2>&5 9159 (eval $ac_try) 2>&5
9214 ac_status=$? 9160 ac_status=$?
@@ -9285,8 +9231,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
9285 cat conftest.err >&5 9231 cat conftest.err >&5
9286 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9232 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9287 (exit $ac_status); } && 9233 (exit $ac_status); } &&
9288 { ac_try='test -z "$ac_c_werror_flag" 9234 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9289 || test ! -s conftest.err'
9290 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9235 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9291 (eval $ac_try) 2>&5 9236 (eval $ac_try) 2>&5
9292 ac_status=$? 9237 ac_status=$?
@@ -9340,8 +9285,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
9340 cat conftest.err >&5 9285 cat conftest.err >&5
9341 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9286 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9342 (exit $ac_status); } && 9287 (exit $ac_status); } &&
9343 { ac_try='test -z "$ac_c_werror_flag" 9288 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9344 || test ! -s conftest.err'
9345 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9289 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9346 (eval $ac_try) 2>&5 9290 (eval $ac_try) 2>&5
9347 ac_status=$? 9291 ac_status=$?
@@ -9410,8 +9354,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
9410 cat conftest.err >&5 9354 cat conftest.err >&5
9411 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9355 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9412 (exit $ac_status); } && 9356 (exit $ac_status); } &&
9413 { ac_try='test -z "$ac_c_werror_flag" 9357 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9414 || test ! -s conftest.err'
9415 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9358 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9416 (eval $ac_try) 2>&5 9359 (eval $ac_try) 2>&5
9417 ac_status=$? 9360 ac_status=$?
@@ -9515,8 +9458,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
9515 cat conftest.err >&5 9458 cat conftest.err >&5
9516 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9459 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9517 (exit $ac_status); } && 9460 (exit $ac_status); } &&
9518 { ac_try='test -z "$ac_c_werror_flag" 9461 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9519 || test ! -s conftest.err'
9520 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9462 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9521 (eval $ac_try) 2>&5 9463 (eval $ac_try) 2>&5
9522 ac_status=$? 9464 ac_status=$?
@@ -9583,8 +9525,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
9583 cat conftest.err >&5 9525 cat conftest.err >&5
9584 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9526 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9585 (exit $ac_status); } && 9527 (exit $ac_status); } &&
9586 { ac_try='test -z "$ac_c_werror_flag" 9528 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9587 || test ! -s conftest.err'
9588 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9529 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9589 (eval $ac_try) 2>&5 9530 (eval $ac_try) 2>&5
9590 ac_status=$? 9531 ac_status=$?
@@ -9654,8 +9595,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
9654 cat conftest.err >&5 9595 cat conftest.err >&5
9655 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9596 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9656 (exit $ac_status); } && 9597 (exit $ac_status); } &&
9657 { ac_try='test -z "$ac_c_werror_flag" 9598 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9658 || test ! -s conftest.err'
9659 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9599 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9660 (eval $ac_try) 2>&5 9600 (eval $ac_try) 2>&5
9661 ac_status=$? 9601 ac_status=$?
@@ -9893,8 +9833,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
9893 cat conftest.err >&5 9833 cat conftest.err >&5
9894 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9834 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9895 (exit $ac_status); } && 9835 (exit $ac_status); } &&
9896 { ac_try='test -z "$ac_c_werror_flag" 9836 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9897 || test ! -s conftest.err'
9898 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9837 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9899 (eval $ac_try) 2>&5 9838 (eval $ac_try) 2>&5
9900 ac_status=$? 9839 ac_status=$?
@@ -9968,8 +9907,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
9968 cat conftest.err >&5 9907 cat conftest.err >&5
9969 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9908 echo "$as_me:$LINENO: \$? = $ac_status" >&5
9970 (exit $ac_status); } && 9909 (exit $ac_status); } &&
9971 { ac_try='test -z "$ac_c_werror_flag" 9910 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9972 || test ! -s conftest.err'
9973 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9911 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9974 (eval $ac_try) 2>&5 9912 (eval $ac_try) 2>&5
9975 ac_status=$? 9913 ac_status=$?
@@ -10041,8 +9979,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10041 cat conftest.err >&5 9979 cat conftest.err >&5
10042 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9980 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10043 (exit $ac_status); } && 9981 (exit $ac_status); } &&
10044 { ac_try='test -z "$ac_c_werror_flag" 9982 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10045 || test ! -s conftest.err'
10046 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9983 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10047 (eval $ac_try) 2>&5 9984 (eval $ac_try) 2>&5
10048 ac_status=$? 9985 ac_status=$?
@@ -10124,8 +10061,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10124 cat conftest.err >&5 10061 cat conftest.err >&5
10125 echo "$as_me:$LINENO: \$? = $ac_status" >&5 10062 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10126 (exit $ac_status); } && 10063 (exit $ac_status); } &&
10127 { ac_try='test -z "$ac_c_werror_flag" 10064 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10128 || test ! -s conftest.err'
10129 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 10065 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10130 (eval $ac_try) 2>&5 10066 (eval $ac_try) 2>&5
10131 ac_status=$? 10067 ac_status=$?
@@ -10204,8 +10140,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10204 cat conftest.err >&5 10140 cat conftest.err >&5
10205 echo "$as_me:$LINENO: \$? = $ac_status" >&5 10141 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10206 (exit $ac_status); } && 10142 (exit $ac_status); } &&
10207 { ac_try='test -z "$ac_c_werror_flag" 10143 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10208 || test ! -s conftest.err'
10209 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 10144 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10210 (eval $ac_try) 2>&5 10145 (eval $ac_try) 2>&5
10211 ac_status=$? 10146 ac_status=$?
@@ -10279,8 +10214,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10279 cat conftest.err >&5 10214 cat conftest.err >&5
10280 echo "$as_me:$LINENO: \$? = $ac_status" >&5 10215 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10281 (exit $ac_status); } && 10216 (exit $ac_status); } &&
10282 { ac_try='test -z "$ac_c_werror_flag" 10217 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10283 || test ! -s conftest.err'
10284 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 10218 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10285 (eval $ac_try) 2>&5 10219 (eval $ac_try) 2>&5
10286 ac_status=$? 10220 ac_status=$?
@@ -10348,8 +10282,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10348 cat conftest.err >&5 10282 cat conftest.err >&5
10349 echo "$as_me:$LINENO: \$? = $ac_status" >&5 10283 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10350 (exit $ac_status); } && 10284 (exit $ac_status); } &&
10351 { ac_try='test -z "$ac_c_werror_flag" 10285 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10352 || test ! -s conftest.err'
10353 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 10286 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10354 (eval $ac_try) 2>&5 10287 (eval $ac_try) 2>&5
10355 ac_status=$? 10288 ac_status=$?
@@ -10418,8 +10351,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10418 cat conftest.err >&5 10351 cat conftest.err >&5
10419 echo "$as_me:$LINENO: \$? = $ac_status" >&5 10352 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10420 (exit $ac_status); } && 10353 (exit $ac_status); } &&
10421 { ac_try='test -z "$ac_c_werror_flag" 10354 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10422 || test ! -s conftest.err'
10423 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 10355 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10424 (eval $ac_try) 2>&5 10356 (eval $ac_try) 2>&5
10425 ac_status=$? 10357 ac_status=$?
@@ -10543,8 +10475,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10543 cat conftest.err >&5 10475 cat conftest.err >&5
10544 echo "$as_me:$LINENO: \$? = $ac_status" >&5 10476 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10545 (exit $ac_status); } && 10477 (exit $ac_status); } &&
10546 { ac_try='test -z "$ac_c_werror_flag" 10478 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10547 || test ! -s conftest.err'
10548 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 10479 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10549 (eval $ac_try) 2>&5 10480 (eval $ac_try) 2>&5
10550 ac_status=$? 10481 ac_status=$?
@@ -10640,8 +10571,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10640 cat conftest.err >&5 10571 cat conftest.err >&5
10641 echo "$as_me:$LINENO: \$? = $ac_status" >&5 10572 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10642 (exit $ac_status); } && 10573 (exit $ac_status); } &&
10643 { ac_try='test -z "$ac_c_werror_flag" 10574 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10644 || test ! -s conftest.err'
10645 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 10575 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10646 (eval $ac_try) 2>&5 10576 (eval $ac_try) 2>&5
10647 ac_status=$? 10577 ac_status=$?
@@ -10721,8 +10651,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10721 cat conftest.err >&5 10651 cat conftest.err >&5
10722 echo "$as_me:$LINENO: \$? = $ac_status" >&5 10652 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10723 (exit $ac_status); } && 10653 (exit $ac_status); } &&
10724 { ac_try='test -z "$ac_c_werror_flag" 10654 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10725 || test ! -s conftest.err'
10726 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 10655 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10727 (eval $ac_try) 2>&5 10656 (eval $ac_try) 2>&5
10728 ac_status=$? 10657 ac_status=$?
@@ -10790,8 +10719,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10790 cat conftest.err >&5 10719 cat conftest.err >&5
10791 echo "$as_me:$LINENO: \$? = $ac_status" >&5 10720 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10792 (exit $ac_status); } && 10721 (exit $ac_status); } &&
10793 { ac_try='test -z "$ac_c_werror_flag" 10722 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10794 || test ! -s conftest.err'
10795 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 10723 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10796 (eval $ac_try) 2>&5 10724 (eval $ac_try) 2>&5
10797 ac_status=$? 10725 ac_status=$?
@@ -10936,8 +10864,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10936 cat conftest.err >&5 10864 cat conftest.err >&5
10937 echo "$as_me:$LINENO: \$? = $ac_status" >&5 10865 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10938 (exit $ac_status); } && 10866 (exit $ac_status); } &&
10939 { ac_try='test -z "$ac_c_werror_flag" 10867 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10940 || test ! -s conftest.err'
10941 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 10868 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10942 (eval $ac_try) 2>&5 10869 (eval $ac_try) 2>&5
10943 ac_status=$? 10870 ac_status=$?
@@ -11046,8 +10973,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11046 cat conftest.err >&5 10973 cat conftest.err >&5
11047 echo "$as_me:$LINENO: \$? = $ac_status" >&5 10974 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11048 (exit $ac_status); } && 10975 (exit $ac_status); } &&
11049 { ac_try='test -z "$ac_c_werror_flag" 10976 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11050 || test ! -s conftest.err'
11051 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 10977 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11052 (eval $ac_try) 2>&5 10978 (eval $ac_try) 2>&5
11053 ac_status=$? 10979 ac_status=$?
@@ -11192,8 +11118,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
11192 cat conftest.err >&5 11118 cat conftest.err >&5
11193 echo "$as_me:$LINENO: \$? = $ac_status" >&5 11119 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11194 (exit $ac_status); } && 11120 (exit $ac_status); } &&
11195 { ac_try='test -z "$ac_c_werror_flag" 11121 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11196 || test ! -s conftest.err'
11197 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 11122 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11198 (eval $ac_try) 2>&5 11123 (eval $ac_try) 2>&5
11199 ac_status=$? 11124 ac_status=$?
@@ -11300,8 +11225,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11300 cat conftest.err >&5 11225 cat conftest.err >&5
11301 echo "$as_me:$LINENO: \$? = $ac_status" >&5 11226 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11302 (exit $ac_status); } && 11227 (exit $ac_status); } &&
11303 { ac_try='test -z "$ac_c_werror_flag" 11228 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11304 || test ! -s conftest.err'
11305 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 11229 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11306 (eval $ac_try) 2>&5 11230 (eval $ac_try) 2>&5
11307 ac_status=$? 11231 ac_status=$?
@@ -11455,8 +11379,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
11455 cat conftest.err >&5 11379 cat conftest.err >&5
11456 echo "$as_me:$LINENO: \$? = $ac_status" >&5 11380 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11457 (exit $ac_status); } && 11381 (exit $ac_status); } &&
11458 { ac_try='test -z "$ac_c_werror_flag" 11382 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11459 || test ! -s conftest.err'
11460 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 11383 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11461 (eval $ac_try) 2>&5 11384 (eval $ac_try) 2>&5
11462 ac_status=$? 11385 ac_status=$?
@@ -11531,8 +11454,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11531 cat conftest.err >&5 11454 cat conftest.err >&5
11532 echo "$as_me:$LINENO: \$? = $ac_status" >&5 11455 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11533 (exit $ac_status); } && 11456 (exit $ac_status); } &&
11534 { ac_try='test -z "$ac_c_werror_flag" 11457 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11535 || test ! -s conftest.err'
11536 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 11458 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11537 (eval $ac_try) 2>&5 11459 (eval $ac_try) 2>&5
11538 ac_status=$? 11460 ac_status=$?
@@ -11680,8 +11602,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
11680 cat conftest.err >&5 11602 cat conftest.err >&5
11681 echo "$as_me:$LINENO: \$? = $ac_status" >&5 11603 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11682 (exit $ac_status); } && 11604 (exit $ac_status); } &&
11683 { ac_try='test -z "$ac_c_werror_flag" 11605 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11684 || test ! -s conftest.err'
11685 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 11606 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11686 (eval $ac_try) 2>&5 11607 (eval $ac_try) 2>&5
11687 ac_status=$? 11608 ac_status=$?
@@ -11758,8 +11679,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11758 cat conftest.err >&5 11679 cat conftest.err >&5
11759 echo "$as_me:$LINENO: \$? = $ac_status" >&5 11680 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11760 (exit $ac_status); } && 11681 (exit $ac_status); } &&
11761 { ac_try='test -z "$ac_c_werror_flag" 11682 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11762 || test ! -s conftest.err'
11763 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 11683 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11764 (eval $ac_try) 2>&5 11684 (eval $ac_try) 2>&5
11765 ac_status=$? 11685 ac_status=$?
@@ -11906,8 +11826,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
11906 cat conftest.err >&5 11826 cat conftest.err >&5
11907 echo "$as_me:$LINENO: \$? = $ac_status" >&5 11827 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11908 (exit $ac_status); } && 11828 (exit $ac_status); } &&
11909 { ac_try='test -z "$ac_c_werror_flag" 11829 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11910 || test ! -s conftest.err'
11911 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 11830 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11912 (eval $ac_try) 2>&5 11831 (eval $ac_try) 2>&5
11913 ac_status=$? 11832 ac_status=$?
@@ -11983,8 +11902,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11983 cat conftest.err >&5 11902 cat conftest.err >&5
11984 echo "$as_me:$LINENO: \$? = $ac_status" >&5 11903 echo "$as_me:$LINENO: \$? = $ac_status" >&5
11985 (exit $ac_status); } && 11904 (exit $ac_status); } &&
11986 { ac_try='test -z "$ac_c_werror_flag" 11905 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11987 || test ! -s conftest.err'
11988 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 11906 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11989 (eval $ac_try) 2>&5 11907 (eval $ac_try) 2>&5
11990 ac_status=$? 11908 ac_status=$?
@@ -12149,8 +12067,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
12149 cat conftest.err >&5 12067 cat conftest.err >&5
12150 echo "$as_me:$LINENO: \$? = $ac_status" >&5 12068 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12151 (exit $ac_status); } && 12069 (exit $ac_status); } &&
12152 { ac_try='test -z "$ac_c_werror_flag" 12070 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12153 || test ! -s conftest.err'
12154 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 12071 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12155 (eval $ac_try) 2>&5 12072 (eval $ac_try) 2>&5
12156 ac_status=$? 12073 ac_status=$?
@@ -12295,8 +12212,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12295 cat conftest.err >&5 12212 cat conftest.err >&5
12296 echo "$as_me:$LINENO: \$? = $ac_status" >&5 12213 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12297 (exit $ac_status); } && 12214 (exit $ac_status); } &&
12298 { ac_try='test -z "$ac_c_werror_flag" 12215 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12299 || test ! -s conftest.err'
12300 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 12216 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12301 (eval $ac_try) 2>&5 12217 (eval $ac_try) 2>&5
12302 ac_status=$? 12218 ac_status=$?
@@ -12372,8 +12288,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12372 cat conftest.err >&5 12288 cat conftest.err >&5
12373 echo "$as_me:$LINENO: \$? = $ac_status" >&5 12289 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12374 (exit $ac_status); } && 12290 (exit $ac_status); } &&
12375 { ac_try='test -z "$ac_c_werror_flag" 12291 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12376 || test ! -s conftest.err'
12377 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 12292 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12378 (eval $ac_try) 2>&5 12293 (eval $ac_try) 2>&5
12379 ac_status=$? 12294 ac_status=$?
@@ -12436,8 +12351,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12436 cat conftest.err >&5 12351 cat conftest.err >&5
12437 echo "$as_me:$LINENO: \$? = $ac_status" >&5 12352 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12438 (exit $ac_status); } && 12353 (exit $ac_status); } &&
12439 { ac_try='test -z "$ac_c_werror_flag" 12354 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12440 || test ! -s conftest.err'
12441 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 12355 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12442 (eval $ac_try) 2>&5 12356 (eval $ac_try) 2>&5
12443 ac_status=$? 12357 ac_status=$?
@@ -12518,8 +12432,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12518 cat conftest.err >&5 12432 cat conftest.err >&5
12519 echo "$as_me:$LINENO: \$? = $ac_status" >&5 12433 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12520 (exit $ac_status); } && 12434 (exit $ac_status); } &&
12521 { ac_try='test -z "$ac_c_werror_flag" 12435 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12522 || test ! -s conftest.err'
12523 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 12436 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12524 (eval $ac_try) 2>&5 12437 (eval $ac_try) 2>&5
12525 ac_status=$? 12438 ac_status=$?
@@ -12660,8 +12573,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12660 cat conftest.err >&5 12573 cat conftest.err >&5
12661 echo "$as_me:$LINENO: \$? = $ac_status" >&5 12574 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12662 (exit $ac_status); } && 12575 (exit $ac_status); } &&
12663 { ac_try='test -z "$ac_c_werror_flag" 12576 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12664 || test ! -s conftest.err'
12665 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 12577 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12666 (eval $ac_try) 2>&5 12578 (eval $ac_try) 2>&5
12667 ac_status=$? 12579 ac_status=$?
@@ -12806,8 +12718,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12806 cat conftest.err >&5 12718 cat conftest.err >&5
12807 echo "$as_me:$LINENO: \$? = $ac_status" >&5 12719 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12808 (exit $ac_status); } && 12720 (exit $ac_status); } &&
12809 { ac_try='test -z "$ac_c_werror_flag" 12721 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12810 || test ! -s conftest.err'
12811 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 12722 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12812 (eval $ac_try) 2>&5 12723 (eval $ac_try) 2>&5
12813 ac_status=$? 12724 ac_status=$?
@@ -12883,8 +12794,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12883 cat conftest.err >&5 12794 cat conftest.err >&5
12884 echo "$as_me:$LINENO: \$? = $ac_status" >&5 12795 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12885 (exit $ac_status); } && 12796 (exit $ac_status); } &&
12886 { ac_try='test -z "$ac_c_werror_flag" 12797 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12887 || test ! -s conftest.err'
12888 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 12798 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12889 (eval $ac_try) 2>&5 12799 (eval $ac_try) 2>&5
12890 ac_status=$? 12800 ac_status=$?
@@ -12957,8 +12867,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
12957 cat conftest.err >&5 12867 cat conftest.err >&5
12958 echo "$as_me:$LINENO: \$? = $ac_status" >&5 12868 echo "$as_me:$LINENO: \$? = $ac_status" >&5
12959 (exit $ac_status); } && 12869 (exit $ac_status); } &&
12960 { ac_try='test -z "$ac_c_werror_flag" 12870 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
12961 || test ! -s conftest.err'
12962 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 12871 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12963 (eval $ac_try) 2>&5 12872 (eval $ac_try) 2>&5
12964 ac_status=$? 12873 ac_status=$?
@@ -13113,8 +13022,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13113 cat conftest.err >&5 13022 cat conftest.err >&5
13114 echo "$as_me:$LINENO: \$? = $ac_status" >&5 13023 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13115 (exit $ac_status); } && 13024 (exit $ac_status); } &&
13116 { ac_try='test -z "$ac_c_werror_flag" 13025 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13117 || test ! -s conftest.err'
13118 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13026 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13119 (eval $ac_try) 2>&5 13027 (eval $ac_try) 2>&5
13120 ac_status=$? 13028 ac_status=$?
@@ -13180,8 +13088,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13180 cat conftest.err >&5 13088 cat conftest.err >&5
13181 echo "$as_me:$LINENO: \$? = $ac_status" >&5 13089 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13182 (exit $ac_status); } && 13090 (exit $ac_status); } &&
13183 { ac_try='test -z "$ac_c_werror_flag" 13091 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13184 || test ! -s conftest.err'
13185 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13092 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13186 (eval $ac_try) 2>&5 13093 (eval $ac_try) 2>&5
13187 ac_status=$? 13094 ac_status=$?
@@ -13439,8 +13346,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13439 cat conftest.err >&5 13346 cat conftest.err >&5
13440 echo "$as_me:$LINENO: \$? = $ac_status" >&5 13347 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13441 (exit $ac_status); } && 13348 (exit $ac_status); } &&
13442 { ac_try='test -z "$ac_c_werror_flag" 13349 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13443 || test ! -s conftest.err'
13444 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13350 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13445 (eval $ac_try) 2>&5 13351 (eval $ac_try) 2>&5
13446 ac_status=$? 13352 ac_status=$?
@@ -13507,8 +13413,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13507 cat conftest.err >&5 13413 cat conftest.err >&5
13508 echo "$as_me:$LINENO: \$? = $ac_status" >&5 13414 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13509 (exit $ac_status); } && 13415 (exit $ac_status); } &&
13510 { ac_try='test -z "$ac_c_werror_flag" 13416 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13511 || test ! -s conftest.err'
13512 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13417 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13513 (eval $ac_try) 2>&5 13418 (eval $ac_try) 2>&5
13514 ac_status=$? 13419 ac_status=$?
@@ -13660,8 +13565,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13660 cat conftest.err >&5 13565 cat conftest.err >&5
13661 echo "$as_me:$LINENO: \$? = $ac_status" >&5 13566 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13662 (exit $ac_status); } && 13567 (exit $ac_status); } &&
13663 { ac_try='test -z "$ac_c_werror_flag" 13568 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13664 || test ! -s conftest.err'
13665 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13569 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13666 (eval $ac_try) 2>&5 13570 (eval $ac_try) 2>&5
13667 ac_status=$? 13571 ac_status=$?
@@ -13845,8 +13749,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13845 cat conftest.err >&5 13749 cat conftest.err >&5
13846 echo "$as_me:$LINENO: \$? = $ac_status" >&5 13750 echo "$as_me:$LINENO: \$? = $ac_status" >&5
13847 (exit $ac_status); } && 13751 (exit $ac_status); } &&
13848 { ac_try='test -z "$ac_c_werror_flag" 13752 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
13849 || test ! -s conftest.err'
13850 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13753 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13851 (eval $ac_try) 2>&5 13754 (eval $ac_try) 2>&5
13852 ac_status=$? 13755 ac_status=$?
@@ -14173,8 +14076,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14173 cat conftest.err >&5 14076 cat conftest.err >&5
14174 echo "$as_me:$LINENO: \$? = $ac_status" >&5 14077 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14175 (exit $ac_status); } && 14078 (exit $ac_status); } &&
14176 { ac_try='test -z "$ac_c_werror_flag" 14079 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14177 || test ! -s conftest.err'
14178 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14080 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14179 (eval $ac_try) 2>&5 14081 (eval $ac_try) 2>&5
14180 ac_status=$? 14082 ac_status=$?
@@ -14275,8 +14177,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14275 cat conftest.err >&5 14177 cat conftest.err >&5
14276 echo "$as_me:$LINENO: \$? = $ac_status" >&5 14178 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14277 (exit $ac_status); } && 14179 (exit $ac_status); } &&
14278 { ac_try='test -z "$ac_c_werror_flag" 14180 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14279 || test ! -s conftest.err'
14280 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14181 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14281 (eval $ac_try) 2>&5 14182 (eval $ac_try) 2>&5
14282 ac_status=$? 14183 ac_status=$?
@@ -14349,8 +14250,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14349 cat conftest.err >&5 14250 cat conftest.err >&5
14350 echo "$as_me:$LINENO: \$? = $ac_status" >&5 14251 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14351 (exit $ac_status); } && 14252 (exit $ac_status); } &&
14352 { ac_try='test -z "$ac_c_werror_flag" 14253 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14353 || test ! -s conftest.err'
14354 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14254 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14355 (eval $ac_try) 2>&5 14255 (eval $ac_try) 2>&5
14356 ac_status=$? 14256 ac_status=$?
@@ -14429,8 +14329,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14429 cat conftest.err >&5 14329 cat conftest.err >&5
14430 echo "$as_me:$LINENO: \$? = $ac_status" >&5 14330 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14431 (exit $ac_status); } && 14331 (exit $ac_status); } &&
14432 { ac_try='test -z "$ac_c_werror_flag" 14332 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14433 || test ! -s conftest.err'
14434 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14333 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14435 (eval $ac_try) 2>&5 14334 (eval $ac_try) 2>&5
14436 ac_status=$? 14335 ac_status=$?
@@ -14499,8 +14398,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14499 cat conftest.err >&5 14398 cat conftest.err >&5
14500 echo "$as_me:$LINENO: \$? = $ac_status" >&5 14399 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14501 (exit $ac_status); } && 14400 (exit $ac_status); } &&
14502 { ac_try='test -z "$ac_c_werror_flag" 14401 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14503 || test ! -s conftest.err'
14504 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14402 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14505 (eval $ac_try) 2>&5 14403 (eval $ac_try) 2>&5
14506 ac_status=$? 14404 ac_status=$?
@@ -14568,8 +14466,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14568 cat conftest.err >&5 14466 cat conftest.err >&5
14569 echo "$as_me:$LINENO: \$? = $ac_status" >&5 14467 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14570 (exit $ac_status); } && 14468 (exit $ac_status); } &&
14571 { ac_try='test -z "$ac_c_werror_flag" 14469 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14572 || test ! -s conftest.err'
14573 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14470 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14574 (eval $ac_try) 2>&5 14471 (eval $ac_try) 2>&5
14575 ac_status=$? 14472 ac_status=$?
@@ -14643,8 +14540,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14643 cat conftest.err >&5 14540 cat conftest.err >&5
14644 echo "$as_me:$LINENO: \$? = $ac_status" >&5 14541 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14645 (exit $ac_status); } && 14542 (exit $ac_status); } &&
14646 { ac_try='test -z "$ac_c_werror_flag" 14543 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14647 || test ! -s conftest.err'
14648 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14544 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14649 (eval $ac_try) 2>&5 14545 (eval $ac_try) 2>&5
14650 ac_status=$? 14546 ac_status=$?
@@ -14748,8 +14644,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14748 cat conftest.err >&5 14644 cat conftest.err >&5
14749 echo "$as_me:$LINENO: \$? = $ac_status" >&5 14645 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14750 (exit $ac_status); } && 14646 (exit $ac_status); } &&
14751 { ac_try='test -z "$ac_c_werror_flag" 14647 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14752 || test ! -s conftest.err'
14753 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14648 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14754 (eval $ac_try) 2>&5 14649 (eval $ac_try) 2>&5
14755 ac_status=$? 14650 ac_status=$?
@@ -14824,8 +14719,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
14824 cat conftest.err >&5 14719 cat conftest.err >&5
14825 echo "$as_me:$LINENO: \$? = $ac_status" >&5 14720 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14826 (exit $ac_status); } && 14721 (exit $ac_status); } &&
14827 { ac_try='test -z "$ac_c_werror_flag" 14722 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14828 || test ! -s conftest.err'
14829 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14723 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14830 (eval $ac_try) 2>&5 14724 (eval $ac_try) 2>&5
14831 ac_status=$? 14725 ac_status=$?
@@ -14977,8 +14871,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14977 cat conftest.err >&5 14871 cat conftest.err >&5
14978 echo "$as_me:$LINENO: \$? = $ac_status" >&5 14872 echo "$as_me:$LINENO: \$? = $ac_status" >&5
14979 (exit $ac_status); } && 14873 (exit $ac_status); } &&
14980 { ac_try='test -z "$ac_c_werror_flag" 14874 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
14981 || test ! -s conftest.err'
14982 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14875 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14983 (eval $ac_try) 2>&5 14876 (eval $ac_try) 2>&5
14984 ac_status=$? 14877 ac_status=$?
@@ -15046,8 +14939,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15046 cat conftest.err >&5 14939 cat conftest.err >&5
15047 echo "$as_me:$LINENO: \$? = $ac_status" >&5 14940 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15048 (exit $ac_status); } && 14941 (exit $ac_status); } &&
15049 { ac_try='test -z "$ac_c_werror_flag" 14942 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15050 || test ! -s conftest.err'
15051 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14943 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15052 (eval $ac_try) 2>&5 14944 (eval $ac_try) 2>&5
15053 ac_status=$? 14945 ac_status=$?
@@ -15224,8 +15116,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
15224 cat conftest.err >&5 15116 cat conftest.err >&5
15225 echo "$as_me:$LINENO: \$? = $ac_status" >&5 15117 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15226 (exit $ac_status); } && 15118 (exit $ac_status); } &&
15227 { ac_try='test -z "$ac_c_werror_flag" 15119 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15228 || test ! -s conftest.err'
15229 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15120 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15230 (eval $ac_try) 2>&5 15121 (eval $ac_try) 2>&5
15231 ac_status=$? 15122 ac_status=$?
@@ -15301,8 +15192,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15301 cat conftest.err >&5 15192 cat conftest.err >&5
15302 echo "$as_me:$LINENO: \$? = $ac_status" >&5 15193 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15303 (exit $ac_status); } && 15194 (exit $ac_status); } &&
15304 { ac_try='test -z "$ac_c_werror_flag" 15195 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15305 || test ! -s conftest.err'
15306 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15196 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15307 (eval $ac_try) 2>&5 15197 (eval $ac_try) 2>&5
15308 ac_status=$? 15198 ac_status=$?
@@ -15456,8 +15346,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15456 cat conftest.err >&5 15346 cat conftest.err >&5
15457 echo "$as_me:$LINENO: \$? = $ac_status" >&5 15347 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15458 (exit $ac_status); } && 15348 (exit $ac_status); } &&
15459 { ac_try='test -z "$ac_c_werror_flag" 15349 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15460 || test ! -s conftest.err'
15461 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15350 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15462 (eval $ac_try) 2>&5 15351 (eval $ac_try) 2>&5
15463 ac_status=$? 15352 ac_status=$?
@@ -15608,8 +15497,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15608 cat conftest.err >&5 15497 cat conftest.err >&5
15609 echo "$as_me:$LINENO: \$? = $ac_status" >&5 15498 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15610 (exit $ac_status); } && 15499 (exit $ac_status); } &&
15611 { ac_try='test -z "$ac_c_werror_flag" 15500 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15612 || test ! -s conftest.err'
15613 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15501 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15614 (eval $ac_try) 2>&5 15502 (eval $ac_try) 2>&5
15615 ac_status=$? 15503 ac_status=$?
@@ -15760,8 +15648,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15760 cat conftest.err >&5 15648 cat conftest.err >&5
15761 echo "$as_me:$LINENO: \$? = $ac_status" >&5 15649 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15762 (exit $ac_status); } && 15650 (exit $ac_status); } &&
15763 { ac_try='test -z "$ac_c_werror_flag" 15651 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15764 || test ! -s conftest.err'
15765 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15652 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15766 (eval $ac_try) 2>&5 15653 (eval $ac_try) 2>&5
15767 ac_status=$? 15654 ac_status=$?
@@ -15903,8 +15790,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15903 cat conftest.err >&5 15790 cat conftest.err >&5
15904 echo "$as_me:$LINENO: \$? = $ac_status" >&5 15791 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15905 (exit $ac_status); } && 15792 (exit $ac_status); } &&
15906 { ac_try='test -z "$ac_c_werror_flag" 15793 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15907 || test ! -s conftest.err'
15908 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15794 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15909 (eval $ac_try) 2>&5 15795 (eval $ac_try) 2>&5
15910 ac_status=$? 15796 ac_status=$?
@@ -15948,8 +15834,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
15948 cat conftest.err >&5 15834 cat conftest.err >&5
15949 echo "$as_me:$LINENO: \$? = $ac_status" >&5 15835 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15950 (exit $ac_status); } && 15836 (exit $ac_status); } &&
15951 { ac_try='test -z "$ac_c_werror_flag" 15837 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15952 || test ! -s conftest.err'
15953 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15838 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
15954 (eval $ac_try) 2>&5 15839 (eval $ac_try) 2>&5
15955 ac_status=$? 15840 ac_status=$?
@@ -16095,8 +15980,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16095 cat conftest.err >&5 15980 cat conftest.err >&5
16096 echo "$as_me:$LINENO: \$? = $ac_status" >&5 15981 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16097 (exit $ac_status); } && 15982 (exit $ac_status); } &&
16098 { ac_try='test -z "$ac_c_werror_flag" 15983 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16099 || test ! -s conftest.err'
16100 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15984 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16101 (eval $ac_try) 2>&5 15985 (eval $ac_try) 2>&5
16102 ac_status=$? 15986 ac_status=$?
@@ -16140,8 +16024,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16140 cat conftest.err >&5 16024 cat conftest.err >&5
16141 echo "$as_me:$LINENO: \$? = $ac_status" >&5 16025 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16142 (exit $ac_status); } && 16026 (exit $ac_status); } &&
16143 { ac_try='test -z "$ac_c_werror_flag" 16027 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16144 || test ! -s conftest.err'
16145 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 16028 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16146 (eval $ac_try) 2>&5 16029 (eval $ac_try) 2>&5
16147 ac_status=$? 16030 ac_status=$?
@@ -16206,8 +16089,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16206 cat conftest.err >&5 16089 cat conftest.err >&5
16207 echo "$as_me:$LINENO: \$? = $ac_status" >&5 16090 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16208 (exit $ac_status); } && 16091 (exit $ac_status); } &&
16209 { ac_try='test -z "$ac_c_werror_flag" 16092 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16210 || test ! -s conftest.err'
16211 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 16093 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16212 (eval $ac_try) 2>&5 16094 (eval $ac_try) 2>&5
16213 ac_status=$? 16095 ac_status=$?
@@ -16270,8 +16152,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
16270 cat conftest.err >&5 16152 cat conftest.err >&5
16271 echo "$as_me:$LINENO: \$? = $ac_status" >&5 16153 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16272 (exit $ac_status); } && 16154 (exit $ac_status); } &&
16273 { ac_try='test -z "$ac_c_werror_flag" 16155 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16274 || test ! -s conftest.err'
16275 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 16156 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16276 (eval $ac_try) 2>&5 16157 (eval $ac_try) 2>&5
16277 ac_status=$? 16158 ac_status=$?
@@ -16373,8 +16254,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16373 cat conftest.err >&5 16254 cat conftest.err >&5
16374 echo "$as_me:$LINENO: \$? = $ac_status" >&5 16255 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16375 (exit $ac_status); } && 16256 (exit $ac_status); } &&
16376 { ac_try='test -z "$ac_c_werror_flag" 16257 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16377 || test ! -s conftest.err'
16378 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 16258 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16379 (eval $ac_try) 2>&5 16259 (eval $ac_try) 2>&5
16380 ac_status=$? 16260 ac_status=$?
@@ -16443,8 +16323,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16443 cat conftest.err >&5 16323 cat conftest.err >&5
16444 echo "$as_me:$LINENO: \$? = $ac_status" >&5 16324 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16445 (exit $ac_status); } && 16325 (exit $ac_status); } &&
16446 { ac_try='test -z "$ac_c_werror_flag" 16326 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16447 || test ! -s conftest.err'
16448 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 16327 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16449 (eval $ac_try) 2>&5 16328 (eval $ac_try) 2>&5
16450 ac_status=$? 16329 ac_status=$?
@@ -16551,8 +16430,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16551 cat conftest.err >&5 16430 cat conftest.err >&5
16552 echo "$as_me:$LINENO: \$? = $ac_status" >&5 16431 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16553 (exit $ac_status); } && 16432 (exit $ac_status); } &&
16554 { ac_try='test -z "$ac_c_werror_flag" 16433 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16555 || test ! -s conftest.err'
16556 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 16434 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16557 (eval $ac_try) 2>&5 16435 (eval $ac_try) 2>&5
16558 ac_status=$? 16436 ac_status=$?
@@ -16655,8 +16533,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16655 cat conftest.err >&5 16533 cat conftest.err >&5
16656 echo "$as_me:$LINENO: \$? = $ac_status" >&5 16534 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16657 (exit $ac_status); } && 16535 (exit $ac_status); } &&
16658 { ac_try='test -z "$ac_c_werror_flag" 16536 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16659 || test ! -s conftest.err'
16660 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 16537 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16661 (eval $ac_try) 2>&5 16538 (eval $ac_try) 2>&5
16662 ac_status=$? 16539 ac_status=$?
@@ -16732,8 +16609,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16732 cat conftest.err >&5 16609 cat conftest.err >&5
16733 echo "$as_me:$LINENO: \$? = $ac_status" >&5 16610 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16734 (exit $ac_status); } && 16611 (exit $ac_status); } &&
16735 { ac_try='test -z "$ac_c_werror_flag" 16612 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16736 || test ! -s conftest.err'
16737 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 16613 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16738 (eval $ac_try) 2>&5 16614 (eval $ac_try) 2>&5
16739 ac_status=$? 16615 ac_status=$?
@@ -16837,8 +16713,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16837 cat conftest.err >&5 16713 cat conftest.err >&5
16838 echo "$as_me:$LINENO: \$? = $ac_status" >&5 16714 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16839 (exit $ac_status); } && 16715 (exit $ac_status); } &&
16840 { ac_try='test -z "$ac_c_werror_flag" 16716 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16841 || test ! -s conftest.err'
16842 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 16717 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16843 (eval $ac_try) 2>&5 16718 (eval $ac_try) 2>&5
16844 ac_status=$? 16719 ac_status=$?
@@ -16930,8 +16805,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16930 cat conftest.err >&5 16805 cat conftest.err >&5
16931 echo "$as_me:$LINENO: \$? = $ac_status" >&5 16806 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16932 (exit $ac_status); } && 16807 (exit $ac_status); } &&
16933 { ac_try='test -z "$ac_c_werror_flag" 16808 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
16934 || test ! -s conftest.err'
16935 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 16809 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
16936 (eval $ac_try) 2>&5 16810 (eval $ac_try) 2>&5
16937 ac_status=$? 16811 ac_status=$?
@@ -16996,8 +16870,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
16996 cat conftest.err >&5 16870 cat conftest.err >&5
16997 echo "$as_me:$LINENO: \$? = $ac_status" >&5 16871 echo "$as_me:$LINENO: \$? = $ac_status" >&5
16998 (exit $ac_status); } && 16872 (exit $ac_status); } &&
16999 { ac_try='test -z "$ac_c_werror_flag" 16873 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17000 || test ! -s conftest.err'
17001 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 16874 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17002 (eval $ac_try) 2>&5 16875 (eval $ac_try) 2>&5
17003 ac_status=$? 16876 ac_status=$?
@@ -17063,8 +16936,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17063 cat conftest.err >&5 16936 cat conftest.err >&5
17064 echo "$as_me:$LINENO: \$? = $ac_status" >&5 16937 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17065 (exit $ac_status); } && 16938 (exit $ac_status); } &&
17066 { ac_try='test -z "$ac_c_werror_flag" 16939 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17067 || test ! -s conftest.err'
17068 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 16940 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17069 (eval $ac_try) 2>&5 16941 (eval $ac_try) 2>&5
17070 ac_status=$? 16942 ac_status=$?
@@ -17174,8 +17046,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17174 cat conftest.err >&5 17046 cat conftest.err >&5
17175 echo "$as_me:$LINENO: \$? = $ac_status" >&5 17047 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17176 (exit $ac_status); } && 17048 (exit $ac_status); } &&
17177 { ac_try='test -z "$ac_c_werror_flag" 17049 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17178 || test ! -s conftest.err'
17179 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 17050 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17180 (eval $ac_try) 2>&5 17051 (eval $ac_try) 2>&5
17181 ac_status=$? 17052 ac_status=$?
@@ -17240,8 +17111,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17240 cat conftest.err >&5 17111 cat conftest.err >&5
17241 echo "$as_me:$LINENO: \$? = $ac_status" >&5 17112 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17242 (exit $ac_status); } && 17113 (exit $ac_status); } &&
17243 { ac_try='test -z "$ac_c_werror_flag" 17114 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17244 || test ! -s conftest.err'
17245 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 17115 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17246 (eval $ac_try) 2>&5 17116 (eval $ac_try) 2>&5
17247 ac_status=$? 17117 ac_status=$?
@@ -17321,8 +17191,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17321 cat conftest.err >&5 17191 cat conftest.err >&5
17322 echo "$as_me:$LINENO: \$? = $ac_status" >&5 17192 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17323 (exit $ac_status); } && 17193 (exit $ac_status); } &&
17324 { ac_try='test -z "$ac_c_werror_flag" 17194 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17325 || test ! -s conftest.err'
17326 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 17195 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17327 (eval $ac_try) 2>&5 17196 (eval $ac_try) 2>&5
17328 ac_status=$? 17197 ac_status=$?
@@ -17395,8 +17264,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17395 cat conftest.err >&5 17264 cat conftest.err >&5
17396 echo "$as_me:$LINENO: \$? = $ac_status" >&5 17265 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17397 (exit $ac_status); } && 17266 (exit $ac_status); } &&
17398 { ac_try='test -z "$ac_c_werror_flag" 17267 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17399 || test ! -s conftest.err'
17400 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 17268 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17401 (eval $ac_try) 2>&5 17269 (eval $ac_try) 2>&5
17402 ac_status=$? 17270 ac_status=$?
@@ -17469,8 +17337,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17469 cat conftest.err >&5 17337 cat conftest.err >&5
17470 echo "$as_me:$LINENO: \$? = $ac_status" >&5 17338 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17471 (exit $ac_status); } && 17339 (exit $ac_status); } &&
17472 { ac_try='test -z "$ac_c_werror_flag" 17340 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17473 || test ! -s conftest.err'
17474 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 17341 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17475 (eval $ac_try) 2>&5 17342 (eval $ac_try) 2>&5
17476 ac_status=$? 17343 ac_status=$?
@@ -17543,8 +17410,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17543 cat conftest.err >&5 17410 cat conftest.err >&5
17544 echo "$as_me:$LINENO: \$? = $ac_status" >&5 17411 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17545 (exit $ac_status); } && 17412 (exit $ac_status); } &&
17546 { ac_try='test -z "$ac_c_werror_flag" 17413 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17547 || test ! -s conftest.err'
17548 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 17414 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17549 (eval $ac_try) 2>&5 17415 (eval $ac_try) 2>&5
17550 ac_status=$? 17416 ac_status=$?
@@ -17618,8 +17484,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17618 cat conftest.err >&5 17484 cat conftest.err >&5
17619 echo "$as_me:$LINENO: \$? = $ac_status" >&5 17485 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17620 (exit $ac_status); } && 17486 (exit $ac_status); } &&
17621 { ac_try='test -z "$ac_c_werror_flag" 17487 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17622 || test ! -s conftest.err'
17623 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 17488 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17624 (eval $ac_try) 2>&5 17489 (eval $ac_try) 2>&5
17625 ac_status=$? 17490 ac_status=$?
@@ -17691,8 +17556,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17691 cat conftest.err >&5 17556 cat conftest.err >&5
17692 echo "$as_me:$LINENO: \$? = $ac_status" >&5 17557 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17693 (exit $ac_status); } && 17558 (exit $ac_status); } &&
17694 { ac_try='test -z "$ac_c_werror_flag" 17559 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17695 || test ! -s conftest.err'
17696 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 17560 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17697 (eval $ac_try) 2>&5 17561 (eval $ac_try) 2>&5
17698 ac_status=$? 17562 ac_status=$?
@@ -17767,8 +17631,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17767 cat conftest.err >&5 17631 cat conftest.err >&5
17768 echo "$as_me:$LINENO: \$? = $ac_status" >&5 17632 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17769 (exit $ac_status); } && 17633 (exit $ac_status); } &&
17770 { ac_try='test -z "$ac_c_werror_flag" 17634 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17771 || test ! -s conftest.err'
17772 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 17635 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17773 (eval $ac_try) 2>&5 17636 (eval $ac_try) 2>&5
17774 ac_status=$? 17637 ac_status=$?
@@ -17840,8 +17703,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
17840 cat conftest.err >&5 17703 cat conftest.err >&5
17841 echo "$as_me:$LINENO: \$? = $ac_status" >&5 17704 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17842 (exit $ac_status); } && 17705 (exit $ac_status); } &&
17843 { ac_try='test -z "$ac_c_werror_flag" 17706 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17844 || test ! -s conftest.err'
17845 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 17707 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17846 (eval $ac_try) 2>&5 17708 (eval $ac_try) 2>&5
17847 ac_status=$? 17709 ac_status=$?
@@ -17914,8 +17776,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
17914 cat conftest.err >&5 17776 cat conftest.err >&5
17915 echo "$as_me:$LINENO: \$? = $ac_status" >&5 17777 echo "$as_me:$LINENO: \$? = $ac_status" >&5
17916 (exit $ac_status); } && 17778 (exit $ac_status); } &&
17917 { ac_try='test -z "$ac_c_werror_flag" 17779 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
17918 || test ! -s conftest.err'
17919 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 17780 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
17920 (eval $ac_try) 2>&5 17781 (eval $ac_try) 2>&5
17921 ac_status=$? 17782 ac_status=$?
@@ -18065,8 +17926,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18065 cat conftest.err >&5 17926 cat conftest.err >&5
18066 echo "$as_me:$LINENO: \$? = $ac_status" >&5 17927 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18067 (exit $ac_status); } && 17928 (exit $ac_status); } &&
18068 { ac_try='test -z "$ac_c_werror_flag" 17929 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18069 || test ! -s conftest.err'
18070 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 17930 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18071 (eval $ac_try) 2>&5 17931 (eval $ac_try) 2>&5
18072 ac_status=$? 17932 ac_status=$?
@@ -18212,8 +18072,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18212 cat conftest.err >&5 18072 cat conftest.err >&5
18213 echo "$as_me:$LINENO: \$? = $ac_status" >&5 18073 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18214 (exit $ac_status); } && 18074 (exit $ac_status); } &&
18215 { ac_try='test -z "$ac_c_werror_flag" 18075 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18216 || test ! -s conftest.err'
18217 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 18076 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18218 (eval $ac_try) 2>&5 18077 (eval $ac_try) 2>&5
18219 ac_status=$? 18078 ac_status=$?
@@ -18359,8 +18218,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18359 cat conftest.err >&5 18218 cat conftest.err >&5
18360 echo "$as_me:$LINENO: \$? = $ac_status" >&5 18219 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18361 (exit $ac_status); } && 18220 (exit $ac_status); } &&
18362 { ac_try='test -z "$ac_c_werror_flag" 18221 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18363 || test ! -s conftest.err'
18364 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 18222 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18365 (eval $ac_try) 2>&5 18223 (eval $ac_try) 2>&5
18366 ac_status=$? 18224 ac_status=$?
@@ -18517,8 +18375,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18517 cat conftest.err >&5 18375 cat conftest.err >&5
18518 echo "$as_me:$LINENO: \$? = $ac_status" >&5 18376 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18519 (exit $ac_status); } && 18377 (exit $ac_status); } &&
18520 { ac_try='test -z "$ac_c_werror_flag" 18378 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18521 || test ! -s conftest.err'
18522 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 18379 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18523 (eval $ac_try) 2>&5 18380 (eval $ac_try) 2>&5
18524 ac_status=$? 18381 ac_status=$?
@@ -18664,8 +18521,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18664 cat conftest.err >&5 18521 cat conftest.err >&5
18665 echo "$as_me:$LINENO: \$? = $ac_status" >&5 18522 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18666 (exit $ac_status); } && 18523 (exit $ac_status); } &&
18667 { ac_try='test -z "$ac_c_werror_flag" 18524 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18668 || test ! -s conftest.err'
18669 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 18525 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18670 (eval $ac_try) 2>&5 18526 (eval $ac_try) 2>&5
18671 ac_status=$? 18527 ac_status=$?
@@ -18811,8 +18667,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18811 cat conftest.err >&5 18667 cat conftest.err >&5
18812 echo "$as_me:$LINENO: \$? = $ac_status" >&5 18668 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18813 (exit $ac_status); } && 18669 (exit $ac_status); } &&
18814 { ac_try='test -z "$ac_c_werror_flag" 18670 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18815 || test ! -s conftest.err'
18816 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 18671 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18817 (eval $ac_try) 2>&5 18672 (eval $ac_try) 2>&5
18818 ac_status=$? 18673 ac_status=$?
@@ -18970,8 +18825,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
18970 cat conftest.err >&5 18825 cat conftest.err >&5
18971 echo "$as_me:$LINENO: \$? = $ac_status" >&5 18826 echo "$as_me:$LINENO: \$? = $ac_status" >&5
18972 (exit $ac_status); } && 18827 (exit $ac_status); } &&
18973 { ac_try='test -z "$ac_c_werror_flag" 18828 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
18974 || test ! -s conftest.err'
18975 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 18829 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
18976 (eval $ac_try) 2>&5 18830 (eval $ac_try) 2>&5
18977 ac_status=$? 18831 ac_status=$?
@@ -19129,8 +18983,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
19129 cat conftest.err >&5 18983 cat conftest.err >&5
19130 echo "$as_me:$LINENO: \$? = $ac_status" >&5 18984 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19131 (exit $ac_status); } && 18985 (exit $ac_status); } &&
19132 { ac_try='test -z "$ac_c_werror_flag" 18986 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19133 || test ! -s conftest.err'
19134 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 18987 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
19135 (eval $ac_try) 2>&5 18988 (eval $ac_try) 2>&5
19136 ac_status=$? 18989 ac_status=$?
@@ -19319,8 +19172,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
19319 cat conftest.err >&5 19172 cat conftest.err >&5
19320 echo "$as_me:$LINENO: \$? = $ac_status" >&5 19173 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19321 (exit $ac_status); } && 19174 (exit $ac_status); } &&
19322 { ac_try='test -z "$ac_c_werror_flag" 19175 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19323 || test ! -s conftest.err'
19324 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 19176 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
19325 (eval $ac_try) 2>&5 19177 (eval $ac_try) 2>&5
19326 ac_status=$? 19178 ac_status=$?
@@ -19393,8 +19245,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
19393 cat conftest.err >&5 19245 cat conftest.err >&5
19394 echo "$as_me:$LINENO: \$? = $ac_status" >&5 19246 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19395 (exit $ac_status); } && 19247 (exit $ac_status); } &&
19396 { ac_try='test -z "$ac_c_werror_flag" 19248 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19397 || test ! -s conftest.err'
19398 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 19249 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
19399 (eval $ac_try) 2>&5 19250 (eval $ac_try) 2>&5
19400 ac_status=$? 19251 ac_status=$?
@@ -19462,8 +19313,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
19462 cat conftest.err >&5 19313 cat conftest.err >&5
19463 echo "$as_me:$LINENO: \$? = $ac_status" >&5 19314 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19464 (exit $ac_status); } && 19315 (exit $ac_status); } &&
19465 { ac_try='test -z "$ac_c_werror_flag" 19316 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19466 || test ! -s conftest.err'
19467 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 19317 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
19468 (eval $ac_try) 2>&5 19318 (eval $ac_try) 2>&5
19469 ac_status=$? 19319 ac_status=$?
@@ -19509,8 +19359,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
19509 cat conftest.err >&5 19359 cat conftest.err >&5
19510 echo "$as_me:$LINENO: \$? = $ac_status" >&5 19360 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19511 (exit $ac_status); } && 19361 (exit $ac_status); } &&
19512 { ac_try='test -z "$ac_c_werror_flag" 19362 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19513 || test ! -s conftest.err'
19514 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 19363 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
19515 (eval $ac_try) 2>&5 19364 (eval $ac_try) 2>&5
19516 ac_status=$? 19365 ac_status=$?
@@ -19584,8 +19433,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
19584 cat conftest.err >&5 19433 cat conftest.err >&5
19585 echo "$as_me:$LINENO: \$? = $ac_status" >&5 19434 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19586 (exit $ac_status); } && 19435 (exit $ac_status); } &&
19587 { ac_try='test -z "$ac_c_werror_flag" 19436 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19588 || test ! -s conftest.err'
19589 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 19437 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
19590 (eval $ac_try) 2>&5 19438 (eval $ac_try) 2>&5
19591 ac_status=$? 19439 ac_status=$?
@@ -19649,8 +19497,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
19649 cat conftest.err >&5 19497 cat conftest.err >&5
19650 echo "$as_me:$LINENO: \$? = $ac_status" >&5 19498 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19651 (exit $ac_status); } && 19499 (exit $ac_status); } &&
19652 { ac_try='test -z "$ac_c_werror_flag" 19500 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19653 || test ! -s conftest.err'
19654 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 19501 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
19655 (eval $ac_try) 2>&5 19502 (eval $ac_try) 2>&5
19656 ac_status=$? 19503 ac_status=$?
@@ -19788,8 +19635,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
19788 cat conftest.err >&5 19635 cat conftest.err >&5
19789 echo "$as_me:$LINENO: \$? = $ac_status" >&5 19636 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19790 (exit $ac_status); } && 19637 (exit $ac_status); } &&
19791 { ac_try='test -z "$ac_c_werror_flag" 19638 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19792 || test ! -s conftest.err'
19793 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 19639 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
19794 (eval $ac_try) 2>&5 19640 (eval $ac_try) 2>&5
19795 ac_status=$? 19641 ac_status=$?
@@ -19850,8 +19696,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
19850 cat conftest.err >&5 19696 cat conftest.err >&5
19851 echo "$as_me:$LINENO: \$? = $ac_status" >&5 19697 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19852 (exit $ac_status); } && 19698 (exit $ac_status); } &&
19853 { ac_try='test -z "$ac_c_werror_flag" 19699 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
19854 || test ! -s conftest.err'
19855 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 19700 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
19856 (eval $ac_try) 2>&5 19701 (eval $ac_try) 2>&5
19857 ac_status=$? 19702 ac_status=$?
@@ -19996,8 +19841,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
19996 cat conftest.err >&5 19841 cat conftest.err >&5
19997 echo "$as_me:$LINENO: \$? = $ac_status" >&5 19842 echo "$as_me:$LINENO: \$? = $ac_status" >&5
19998 (exit $ac_status); } && 19843 (exit $ac_status); } &&
19999 { ac_try='test -z "$ac_c_werror_flag" 19844 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20000 || test ! -s conftest.err'
20001 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 19845 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
20002 (eval $ac_try) 2>&5 19846 (eval $ac_try) 2>&5
20003 ac_status=$? 19847 ac_status=$?
@@ -20153,8 +19997,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
20153 cat conftest.err >&5 19997 cat conftest.err >&5
20154 echo "$as_me:$LINENO: \$? = $ac_status" >&5 19998 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20155 (exit $ac_status); } && 19999 (exit $ac_status); } &&
20156 { ac_try='test -z "$ac_c_werror_flag" 20000 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20157 || test ! -s conftest.err'
20158 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 20001 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
20159 (eval $ac_try) 2>&5 20002 (eval $ac_try) 2>&5
20160 ac_status=$? 20003 ac_status=$?
@@ -20325,8 +20168,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
20325 cat conftest.err >&5 20168 cat conftest.err >&5
20326 echo "$as_me:$LINENO: \$? = $ac_status" >&5 20169 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20327 (exit $ac_status); } && 20170 (exit $ac_status); } &&
20328 { ac_try='test -z "$ac_c_werror_flag" 20171 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20329 || test ! -s conftest.err'
20330 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 20172 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
20331 (eval $ac_try) 2>&5 20173 (eval $ac_try) 2>&5
20332 ac_status=$? 20174 ac_status=$?
@@ -20394,8 +20236,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
20394 cat conftest.err >&5 20236 cat conftest.err >&5
20395 echo "$as_me:$LINENO: \$? = $ac_status" >&5 20237 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20396 (exit $ac_status); } && 20238 (exit $ac_status); } &&
20397 { ac_try='test -z "$ac_c_werror_flag" 20239 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20398 || test ! -s conftest.err'
20399 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 20240 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
20400 (eval $ac_try) 2>&5 20241 (eval $ac_try) 2>&5
20401 ac_status=$? 20242 ac_status=$?
@@ -20580,8 +20421,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
20580 cat conftest.err >&5 20421 cat conftest.err >&5
20581 echo "$as_me:$LINENO: \$? = $ac_status" >&5 20422 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20582 (exit $ac_status); } && 20423 (exit $ac_status); } &&
20583 { ac_try='test -z "$ac_c_werror_flag" 20424 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20584 || test ! -s conftest.err'
20585 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 20425 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
20586 (eval $ac_try) 2>&5 20426 (eval $ac_try) 2>&5
20587 ac_status=$? 20427 ac_status=$?
@@ -20874,8 +20714,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
20874 cat conftest.err >&5 20714 cat conftest.err >&5
20875 echo "$as_me:$LINENO: \$? = $ac_status" >&5 20715 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20876 (exit $ac_status); } && 20716 (exit $ac_status); } &&
20877 { ac_try='test -z "$ac_c_werror_flag" 20717 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20878 || test ! -s conftest.err'
20879 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 20718 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
20880 (eval $ac_try) 2>&5 20719 (eval $ac_try) 2>&5
20881 ac_status=$? 20720 ac_status=$?
@@ -20940,8 +20779,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
20940 cat conftest.err >&5 20779 cat conftest.err >&5
20941 echo "$as_me:$LINENO: \$? = $ac_status" >&5 20780 echo "$as_me:$LINENO: \$? = $ac_status" >&5
20942 (exit $ac_status); } && 20781 (exit $ac_status); } &&
20943 { ac_try='test -z "$ac_c_werror_flag" 20782 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
20944 || test ! -s conftest.err'
20945 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 20783 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
20946 (eval $ac_try) 2>&5 20784 (eval $ac_try) 2>&5
20947 ac_status=$? 20785 ac_status=$?
@@ -21004,8 +20842,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
21004 cat conftest.err >&5 20842 cat conftest.err >&5
21005 echo "$as_me:$LINENO: \$? = $ac_status" >&5 20843 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21006 (exit $ac_status); } && 20844 (exit $ac_status); } &&
21007 { ac_try='test -z "$ac_c_werror_flag" 20845 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21008 || test ! -s conftest.err'
21009 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 20846 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21010 (eval $ac_try) 2>&5 20847 (eval $ac_try) 2>&5
21011 ac_status=$? 20848 ac_status=$?
@@ -21071,8 +20908,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
21071 cat conftest.err >&5 20908 cat conftest.err >&5
21072 echo "$as_me:$LINENO: \$? = $ac_status" >&5 20909 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21073 (exit $ac_status); } && 20910 (exit $ac_status); } &&
21074 { ac_try='test -z "$ac_c_werror_flag" 20911 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21075 || test ! -s conftest.err'
21076 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 20912 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21077 (eval $ac_try) 2>&5 20913 (eval $ac_try) 2>&5
21078 ac_status=$? 20914 ac_status=$?
@@ -21113,8 +20949,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
21113 cat conftest.err >&5 20949 cat conftest.err >&5
21114 echo "$as_me:$LINENO: \$? = $ac_status" >&5 20950 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21115 (exit $ac_status); } && 20951 (exit $ac_status); } &&
21116 { ac_try='test -z "$ac_c_werror_flag" 20952 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21117 || test ! -s conftest.err'
21118 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 20953 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21119 (eval $ac_try) 2>&5 20954 (eval $ac_try) 2>&5
21120 ac_status=$? 20955 ac_status=$?
@@ -21181,8 +21016,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
21181 cat conftest.err >&5 21016 cat conftest.err >&5
21182 echo "$as_me:$LINENO: \$? = $ac_status" >&5 21017 echo "$as_me:$LINENO: \$? = $ac_status" >&5
21183 (exit $ac_status); } && 21018 (exit $ac_status); } &&
21184 { ac_try='test -z "$ac_c_werror_flag" 21019 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
21185 || test ! -s conftest.err'
21186 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 21020 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
21187 (eval $ac_try) 2>&5 21021 (eval $ac_try) 2>&5
21188 ac_status=$? 21022 ac_status=$?
@@ -22289,11 +22123,6 @@ esac
22289 *) ac_INSTALL=$ac_top_builddir$INSTALL ;; 22123 *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
22290 esac 22124 esac
22291 22125
22292 if test x"$ac_file" != x-; then
22293 { echo "$as_me:$LINENO: creating $ac_file" >&5
22294echo "$as_me: creating $ac_file" >&6;}
22295 rm -f "$ac_file"
22296 fi
22297 # Let's still pretend it is `configure' which instantiates (i.e., don't 22126 # Let's still pretend it is `configure' which instantiates (i.e., don't
22298 # use $as_me), people would be surprised to read: 22127 # use $as_me), people would be surprised to read:
22299 # /* config.h. Generated by config.status. */ 22128 # /* config.h. Generated by config.status. */
@@ -22332,6 +22161,12 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
22332 fi;; 22161 fi;;
22333 esac 22162 esac
22334 done` || { (exit 1); exit 1; } 22163 done` || { (exit 1); exit 1; }
22164
22165 if test x"$ac_file" != x-; then
22166 { echo "$as_me:$LINENO: creating $ac_file" >&5
22167echo "$as_me: creating $ac_file" >&6;}
22168 rm -f "$ac_file"
22169 fi
22335_ACEOF 22170_ACEOF
22336cat >>$CONFIG_STATUS <<_ACEOF 22171cat >>$CONFIG_STATUS <<_ACEOF
22337 sed "$ac_vpsub 22172 sed "$ac_vpsub
diff --git a/configure.in b/configure.in
index 95ff1f855f7..1f899a0808c 100644
--- a/configure.in
+++ b/configure.in
@@ -1292,7 +1292,7 @@ AC_CHECK_FILE(/proc/sys/kernel/exec-shield, emacs_cv_execshield=1,
1292if test "$emacs_cv_execshield" = 1; then 1292if test "$emacs_cv_execshield" = 1; then
1293 AC_PATH_PROG(SETARCH, setarch, no) 1293 AC_PATH_PROG(SETARCH, setarch, no)
1294 AC_SUBST(SETARCH) 1294 AC_SUBST(SETARCH)
1295 if test "$setarch" != no && test "$machine" = "intel386"; then 1295 if test "$SETARCH" != no && test "$machine" = "intel386"; then
1296 AC_DEFINE(HAVE_EXECSHIELD, 1, 1296 AC_DEFINE(HAVE_EXECSHIELD, 1,
1297 [Define to 1 if this OS has exec shield and we can handle it.]) 1297 [Define to 1 if this OS has exec shield and we can handle it.])
1298 else 1298 else
diff --git a/etc/NEWS b/etc/NEWS
index 9e619898479..b50c15f57a6 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -457,18 +457,15 @@ This behavior is activated by setting the buffer-local variable
457this variable is found in `default-indicate-buffer-boundaries'. 457this variable is found in `default-indicate-buffer-boundaries'.
458 458
459If value is `left' or `right', both angle and arrow bitmaps are 459If value is `left' or `right', both angle and arrow bitmaps are
460displayed in the left or right fringe, resp. Any other non-nil value 460displayed in the left or right fringe, resp.
461causes the bitmap on the top line to be displayed in the left fringe,
462and the bitmap on the bottom line in the right fringe.
463 461
464If value is a cons (ANGLES . ARROWS), the car specifies the position 462Value may also be an alist which specifies the presense and position
465of the angle bitmaps, and the cdr specifies the position of the arrow 463of each bitmap individually.
466bitmaps.
467 464
468For example, (t . right) places the top angle bitmap in left fringe, 465For example, ((top . left) (t . right)) places the top angle bitmap
469the bottom angle bitmap in right fringe, and both arrow bitmaps in 466in left fringe, the bottom angle bitmap in right fringe, and both
470right fringe. To show just the angle bitmaps in the left fringe, but 467arrow bitmaps in right fringe. To show just the angle bitmaps in the
471no arrow bitmaps, use (left . nil). 468left fringe, but no arrow bitmaps, use ((top . left) (bottom . left)).
472 469
473** New command `display-local-help' displays any local help at point 470** New command `display-local-help' displays any local help at point
474in the echo area. It is bound to `C-h .'. It normally displays the 471in the echo area. It is bound to `C-h .'. It normally displays the
@@ -2538,13 +2535,11 @@ use of the capabilities of the display.
2538+++ 2535+++
2539** Customizable fringe bitmaps 2536** Customizable fringe bitmaps
2540 2537
2541*** New function 'define-fringe-bitmap' can now be used to change the 2538*** New function 'define-fringe-bitmap' can now be used to create new
2542built-in fringe bitmaps, as well as create new fringe bitmaps. 2539fringe bitmaps, as well as change the built-in fringe bitmaps.
2543The return value is a number identifying the new fringe bitmap.
2544 2540
2545To change a built-in bitmap, do (require 'fringe) and identify the 2541To change a built-in bitmap, do (require 'fringe) and use the symbol
2546bitmap to change with the value of the corresponding symbol, like 2542identifing the bitmap such as `left-truncation or `continued-line'.
2547`left-truncation-fringe-bitmap' or `continued-line-fringe-bitmap'.
2548 2543
2549*** New function 'destroy-fringe-bitmap' may be used to destroy a 2544*** New function 'destroy-fringe-bitmap' may be used to destroy a
2550previously created bitmap, or restore a built-in bitmap. 2545previously created bitmap, or restore a built-in bitmap.
@@ -2559,7 +2554,7 @@ that can be used to show a specific bitmap in the left or right fringe
2559bitmap of the display line. 2554bitmap of the display line.
2560 2555
2561Format is 'display '(left-fringe BITMAP [FACE]), where BITMAP is a 2556Format is 'display '(left-fringe BITMAP [FACE]), where BITMAP is a
2562number identifying a fringe bitmap, either built-in or as returned by 2557symbol identifying a fringe bitmap, either built-in or defined with
2563`define-fringe-bitmap', and FACE is an optional face name to be used 2558`define-fringe-bitmap', and FACE is an optional face name to be used
2564for displaying the bitmap. 2559for displaying the bitmap.
2565 2560
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 187fc607c27..0ed8630d850 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
12004-09-29 Luc Teirlinck <teirllm@auburn.edu>
2
3 * textmodes/paragraphs.el (forward-paragraph): Avoid
4 args-out-of-range error when point winds up at the beginning of
5 the buffer and hard newlines are enabled.
6
7 * newcomment.el (comment-multi-line): Doc fix.
8
92004-09-29 Stefan Monnier <monnier@iro.umontreal.ca>
10
11 * diff-mode.el (diff-file-header-re): Tighten up regexp a tiny bit.
12 (diff-fixup-modifs): Catch unified-diff file-headers.
13
12004-09-28 Stefan <monnier@iro.umontreal.ca> 142004-09-28 Stefan <monnier@iro.umontreal.ca>
2 15
3 * dired.el (dired-view-command-alist): Use more efficient regexps. 16 * dired.el (dired-view-command-alist): Use more efficient regexps.
@@ -35,8 +48,8 @@
35 (pr-version): New version number (6.8.1). 48 (pr-version): New version number (6.8.1).
36 (pr-ps-file-using-ghostscript): Use make-temp-file instead of 49 (pr-ps-file-using-ghostscript): Use make-temp-file instead of
37 make-temp-name. 50 make-temp-name.
38 (pr-delete-file): Check if file exists before deleting it. Reported by 51 (pr-delete-file): Check if file exists before deleting it.
39 Lennart Borgman <lennart.borgman.073@student.lu.se>. 52 Reported by Lennart Borgman <lennart.borgman.073@student.lu.se>.
40 53
412004-09-26 Stefan <monnier@iro.umontreal.ca> 542004-09-26 Stefan <monnier@iro.umontreal.ca>
42 55
@@ -48,21 +61,19 @@
482004-09-26 Dan Nicolaescu <dann@ics.uci.edu> 612004-09-26 Dan Nicolaescu <dann@ics.uci.edu>
49 62
50 * term.el (term-ansi-at-eval-string, term-ansi-default-fg) 63 * term.el (term-ansi-at-eval-string, term-ansi-default-fg)
51 (term-ansi-default-bg, term-ansi-current-temp): Delete unused 64 (term-ansi-default-bg, term-ansi-current-temp): Delete unused vars.
52 vars.
53 (map): Bind S-prior, S-next and S-insert. 65 (map): Bind S-prior, S-next and S-insert.
54 (term-mode): Set `indent-tabs-mode' to nil. 66 (term-mode): Set `indent-tabs-mode' to nil.
55 (term-paste): New function to be bound to S-insert. 67 (term-paste): New function to be bound to S-insert.
56 (term-send-del, term-send-backspace): Change the strings sent. 68 (term-send-del, term-send-backspace): Change the strings sent.
57 (term-termcap-format): Synchronyze with etc/e/eterm.ti. 69 (term-termcap-format): Synchronyze with etc/e/eterm.ti.
58 (term-handle-colors-array): Fix handling of underline and reverse. 70 (term-handle-colors-array): Fix handling of underline and reverse.
59 (term-handle-ansi-escape): Do not handle smcup/rmcup. Add 71 (term-handle-ansi-escape): Do not handle smcup/rmcup. Add comments.
60 comments.
61 (term-erase-in-line): Fix comparison. 72 (term-erase-in-line): Fix comparison.
62 (term-emulate-terminal): Fix line wrap handling. 73 (term-emulate-terminal): Fix line wrap handling.
63 (term-start-output-log): Renamed from `term-set-output-log'. 74 (term-start-output-log): Rename from `term-set-output-log'.
64 (term-stop-output-log): Renamed from `term-stop-photo'. 75 (term-stop-output-log): Rename from `term-stop-photo'.
65 (term-switch-to-alternate-sub-buffer): Comment out, unused. 76 (term-switch-to-alternate-sub-buffer): Comment out, unused.
66 77
672004-09-25 Stefan <monnier@iro.umontreal.ca> 782004-09-25 Stefan <monnier@iro.umontreal.ca>
68 79
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 21b1c6446e5..0a7f1a1950a 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -301,7 +301,7 @@ when editing big diffs)."
301;;;; 301;;;;
302 302
303(defconst diff-hunk-header-re "^\\(@@ -[0-9,]+ \\+[0-9,]+ @@.*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$") 303(defconst diff-hunk-header-re "^\\(@@ -[0-9,]+ \\+[0-9,]+ @@.*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$")
304(defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+\\|\\*\\*\\* .+\n---\\|[^-+!<>0-9@* ]\\).+\n" (substring diff-hunk-header-re 1))) 304(defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+ \\|\\*\\*\\* .+\n--- \\|[^-+!<>0-9@* ]\\).+\n" (substring diff-hunk-header-re 1)))
305(defvar diff-narrowed-to nil) 305(defvar diff-narrowed-to nil)
306 306
307(defun diff-end-of-hunk (&optional style) 307(defun diff-end-of-hunk (&optional style)
@@ -798,9 +798,12 @@ else cover the whole bufer."
798 (goto-char end) (diff-end-of-hunk) 798 (goto-char end) (diff-end-of-hunk)
799 (let ((plus 0) (minus 0) (space 0) (bang 0)) 799 (let ((plus 0) (minus 0) (space 0) (bang 0))
800 (while (and (= (forward-line -1) 0) (<= start (point))) 800 (while (and (= (forward-line -1) 0) (<= start (point)))
801 (if (not (looking-at "\\(@@ -[0-9,]+ \\+[0-9,]+ @@.*\\|[-*][-*][-*] .+ [-*][-*][-*][-*]\\)$")) 801 (if (not (looking-at
802 (concat "@@ -[0-9,]+ \\+[0-9,]+ @@"
803 "\\|[-*][-*][-*] [0-9,]+ [-*][-*][-*][-*]$"
804 "\\|--- .+\n\\+\\+\\+ ")))
802 (case (char-after) 805 (case (char-after)
803 (?\ (incf space)) 806 (?\s (incf space))
804 (?+ (incf plus)) 807 (?+ (incf plus))
805 (?- (incf minus)) 808 (?- (incf minus))
806 (?! (incf bang)) 809 (?! (incf bang))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3cdda661e86..6ac6d46e28f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
12004-09-29 Jesper Harder <harder@ifa.au.dk>
2
3 * gnus.el (gnus-method-to-server): Oops, move it don't delete it.
4
12004-09-28 Jesper Harder <harder@ifa.au.dk> 52004-09-28 Jesper Harder <harder@ifa.au.dk>
2 6
3 * gnus-picon.el: Require cl. 7 * gnus-picon.el: Require cl.
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 28ef2c22a15..979ee2a7c24 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -3261,6 +3261,38 @@ that that variable is buffer-local to the summary buffers."
3261 (nth 1 method)))) 3261 (nth 1 method))))
3262 method))) 3262 method)))
3263 3263
3264(defsubst gnus-method-to-server (method)
3265 (catch 'server-name
3266 (setq method (or method gnus-select-method))
3267
3268 ;; Perhaps it is already in the cache.
3269 (mapc (lambda (name-method)
3270 (if (equal (cdr name-method) method)
3271 (throw 'server-name (car name-method))))
3272 gnus-server-method-cache)
3273
3274 (mapc
3275 (lambda (server-alist)
3276 (mapc (lambda (name-method)
3277 (when (gnus-methods-equal-p (cdr name-method) method)
3278 (unless (member name-method gnus-server-method-cache)
3279 (push name-method gnus-server-method-cache))
3280 (throw 'server-name (car name-method))))
3281 server-alist))
3282 (let ((alists (list gnus-server-alist
3283 gnus-predefined-server-alist)))
3284 (if gnus-select-method
3285 (push (list (cons "native" gnus-select-method)) alists))
3286 alists))
3287
3288 (let* ((name (if (member (cadr method) '(nil ""))
3289 (format "%s" (car method))
3290 (format "%s:%s" (car method) (cadr method))))
3291 (name-method (cons name method)))
3292 (unless (member name-method gnus-server-method-cache)
3293 (push name-method gnus-server-method-cache))
3294 name)))
3295
3264(defsubst gnus-server-to-method (server) 3296(defsubst gnus-server-to-method (server)
3265 "Map virtual server names to select methods." 3297 "Map virtual server names to select methods."
3266 (or (and server (listp server) server) 3298 (or (and server (listp server) server)
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 3a63636b757..120777ab704 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -215,8 +215,13 @@ makes the comment easier to read. Default is 1. nil means 0."
215 215
216;;;###autoload 216;;;###autoload
217(defcustom comment-multi-line nil 217(defcustom comment-multi-line nil
218 "*Non-nil means \\[comment-indent-new-line] continues comments, with no new terminator or starter. 218 "*Non-nil means `comment-indent-new-line' continues comments.
219This is obsolete because you might as well use \\[newline-and-indent]." 219That is, it inserts no new terminator or starter.
220This affects `auto-fill-mode', which is the main reason to
221customize this variable.
222
223It also affects \\[indent-new-comment-line]. However, if you want this
224behavior for explicit filling, you might as well use \\[newline-and-indent]."
220 :type 'boolean) 225 :type 'boolean)
221 226
222(defcustom comment-empty-lines nil 227(defcustom comment-empty-lines nil
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index e5f38971e40..868dcb2d107 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -274,8 +274,9 @@ Returns the count of paragraphs left to move."
274 (not (looking-at parsep))) 274 (not (looking-at parsep)))
275 (not (and (looking-at parstart) 275 (not (and (looking-at parstart)
276 (or (not use-hard-newlines) 276 (or (not use-hard-newlines)
277 (get-text-property (1- start) 'hard) 277 (bobp)
278 (bobp))))) 278 (get-text-property
279 (1- start) 'hard)))))
279 (setq found-start nil) 280 (setq found-start nil)
280 (goto-char start)) 281 (goto-char start))
281 found-start) 282 found-start)
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 8c25fe6c531..b568e99fb58 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,12 @@
12004-09-29 Kim F. Storm <storm@cua.dk>
2
3 * display.texi (Fringe Bitmaps): Use symbols rather than numbers
4 to identify bitmaps. Remove -fringe-bitmap suffix for standard
5 fringe bitmap symbols, as they now have their own namespace.
6 (Customizing Bitmaps) <define-fringe-bitmap>: Clarify bit ordering
7 vs. pixels. Signal error if no free bitmap slots.
8 (Pixel Specification): Change IMAGE to @var{image}.
9
12004-09-28 Richard M. Stallman <rms@gnu.org> 102004-09-28 Richard M. Stallman <rms@gnu.org>
2 11
3 * text.texi (Special Properties): Clarify line-spacing and line-height. 12 * text.texi (Special Properties): Clarify line-spacing and line-height.
diff --git a/lispref/display.texi b/lispref/display.texi
index 2163ae725af..00b91fe1fd8 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -2615,73 +2615,49 @@ fringe.
2615fringe (on a graphic display) to indicate truncated or continued 2615fringe (on a graphic display) to indicate truncated or continued
2616lines, buffer boundaries, overlay arrow, etc. The fringe bitmaps are 2616lines, buffer boundaries, overlay arrow, etc. The fringe bitmaps are
2617shared by all frames and windows. You can redefine the built-in 2617shared by all frames and windows. You can redefine the built-in
2618fringe bitmaps, and you can define new fringe bitmaps. However, Emacs 2618fringe bitmaps, and you can define new fringe bitmaps.
2619can handle only 255 different fringe bitmaps.
2620 2619
2621 The way to display a bitmap in the left or right fringes for a given 2620 The way to display a bitmap in the left or right fringes for a given
2622line in a window is by specifying the @code{display} property for one 2621line in a window is by specifying the @code{display} property for one
2623of the characters that appears in it. Use a display specification of 2622of the characters that appears in it. Use a display specification of
2624the form @code{(left-fringe @var{bitmap} [@var{face}])} or 2623the form @code{(left-fringe @var{bitmap} [@var{face}])} or
2625@code{(right-fringe @var{bitmap} [@var{face}])} (@pxref{Display 2624@code{(right-fringe @var{bitmap} [@var{face}])} (@pxref{Display
2626Property}). Here, @var{bitmap} is an integer identifying the bitmap 2625Property}). Here, @var{bitmap} is a symbol identifying the bitmap
2627you want, and @var{face} (which is optional) is the name of the face 2626you want, and @var{face} (which is optional) is the name of the face
2628whose colors should be used for displaying the bitmap. 2627whose colors should be used for displaying the bitmap.
2629@c ??? Shouldn't the symbol name be used?
2630 2628
2631 These are the symbols identify the standard fringe bitmaps. 2629 These are the symbols identify the standard fringe bitmaps.
2632Evaluate @code{(require 'fringe)} to define them. Each symbol's 2630Evaluate @code{(require 'fringe)} to define them. Fringe bitmap
2633value is an integer that identifies the corresponding bitmap. 2631symbols have their own name space.
2634 2632
2635@table @asis 2633@table @asis
2636@item Truncation and continuation line bitmaps: 2634@item Truncation and continuation line bitmaps:
2637@code{left-truncation-fringe-bitmap}, 2635@code{left-truncation}, @code{right-truncation},
2638@code{right-truncation-fringe-bitmap}, 2636@code{continued-line}, @code{continuation-line}.
2639@code{continued-line-fringe-bitmap},
2640@code{continuation-line-fringe-bitmap}.
2641 2637
2642@item Buffer indication bitmaps: 2638@item Buffer indication bitmaps:
2643@code{up-arrow-fringe-bitmap}, 2639@code{up-arrow}, @code{down-arrow},
2644@code{down-arrow-fringe-bitmap}, 2640@code{top-left-angle}, @code{top-right-angle},
2645@code{top-left-angle-fringe-bitmap}, 2641@code{bottom-left-angle}, @code{bottom-right-angle},
2646@code{top-right-angle-fringe-bitmap}, 2642@code{left-bracket}, @code{right-bracket}.
2647@code{bottom-left-angle-fringe-bitmap},
2648@code{bottom-right-angle-fringe-bitmap},
2649@code{left-bracket-fringe-bitmap},
2650@code{right-bracket-fringe-bitmap}.
2651 2643
2652@item Empty line indication bitmap: 2644@item Empty line indication bitmap:
2653@code{empty-line-fringe-bitmap}. 2645@code{empty-line}.
2654 2646
2655@item Overlay arrow bitmap: 2647@item Overlay arrow bitmap:
2656@code{overlay-arrow-fringe-bitmap}. 2648@code{overlay-arrow}.
2657 2649
2658@item Bitmaps for displaying the cursor in right fringe: 2650@item Bitmaps for displaying the cursor in right fringe:
2659@code{filled-box-cursor-fringe-bitmap}, 2651@code{filled-box-cursor}, @code{hollow-box-cursor}, @code{hollow-square},
2660@code{hollow-box-cursor-fringe-bitmap}, 2652@code{bar-cursor}, @code{hbar-cursor}.
2661@code{hollow-square-fringe-bitmap}, @code{bar-cursor-fringe-bitmap},
2662@code{hbar-cursor-fringe-bitmap}.
2663
2664@item Value indicating that no fringe bitmap is present:
2665@code{no-fringe-bitmap}.
2666@c ??? I don't understand what that means.
2667@c ??? Where would you find that value?
2668
2669@item Value indicating a reference to an undefined bitmap:
2670@code{undef-fringe-bitmap}.
2671@c ??? I don't understand what that means.
2672@c ??? Where would you find that value?
2673@end table 2653@end table
2674 2654
2675@defun fringe-bitmaps-at-pos &optional pos window 2655@defun fringe-bitmaps-at-pos &optional pos window
2676This function returns the fringe bitmaps of the display line 2656This function returns the fringe bitmaps of the display line
2677containing position @var{pos} in window @var{window}. The return 2657containing position @var{pos} in window @var{window}. The return
2678value has the form @code{(@var{left} . @var{right})}, where @var{left} 2658value has the form @code{(@var{left} . @var{right})}, where @var{left}
2679is a list of fringe bitmap numbers for left fringe, and @var{right} is 2659is the symbol for the fringe bitmap in the left fringe (or @code{nil}
2680similar for the right fringe. These bitmap numbers are usually values 2660if no bitmap), and @var{right} is similar for the right fringe.
2681of symbols such as the ones listed above.
2682
2683@c ??? Why not return a list of symbols that identify the bitmaps?
2684@c ??? This is Lisp, not C.
2685 2661
2686The value is @code{nil} if @var{pos} is not visible in @var{window}. 2662The value is @code{nil} if @var{pos} is not visible in @var{window}.
2687If @var{window} is @code{nil}, that stands for the selected window. 2663If @var{window} is @code{nil}, that stands for the selected window.
@@ -2692,18 +2668,15 @@ If @var{pos} is @code{nil}, that stands for the value of point in
2692@node Customizing Bitmaps 2668@node Customizing Bitmaps
2693@section Customizing Fringe Bitmaps 2669@section Customizing Fringe Bitmaps
2694 2670
2695@c ??? Why not pass a symbol as the first argument 2671@defun define-fringe-bitmap bitmap bits &optional height width align
2696@c ??? and define that symbol. It would be cleaner. 2672This function defines the symbol @var{bitmap} as a new fringe bitmap,
2697 2673or replaces an existing bitmap with that name.
2698@defun define-fringe-bitmap bits &optional height width align bitmap
2699This function defines a new fringe bitmap, or replaces an existing
2700bitmap.
2701 2674
2702The argument @var{bits} specifies the image to use. It should be 2675The argument @var{bits} specifies the image to use. It should be
2703either a string or a vector of integers, where each element (an 2676either a string or a vector of integers, where each element (an
2704integer) corresponds to one row of the bitmap. Each bit of an integer 2677integer) corresponds to one row of the bitmap. Each bit of an integer
2705corresponds to one pixel of the bitmap. 2678corresponds to one pixel of the bitmap, where the low bit corresponds
2706@c ??? Is the low bit the leftmost or the rightmost bit? 2679to the rightmost pixel of the bitmap.
2707 2680
2708The height is normally the length of @var{bits}. However, you 2681The height is normally the length of @var{bits}. However, you
2709can specify a different height with non-@code{nil} @var{height}. The width 2682can specify a different height with non-@code{nil} @var{height}. The width
@@ -2721,14 +2694,11 @@ If @var{periodic} is non-@code{nil}, it specifies that the rows in
2721@code{bits} should be repeated enough times to reach the specified 2694@code{bits} should be repeated enough times to reach the specified
2722height. 2695height.
2723 2696
2724The argument @var{bitmap} specifies an existing bitmap to redefine.
2725You should pass the value of the symbol that identifies the bitmap.
2726
2727The return value on success is an integer identifying the new bitmap. 2697The return value on success is an integer identifying the new bitmap.
2728You should save that integer in a variable so it can be used to select 2698You should save that integer in a variable so it can be used to select
2729this bitmap. The value can also be @code{nil} of there are no more 2699this bitmap.
2730free bitmap slots. 2700
2731@c ??? Why not signal an error? That would be cleaner. 2701This function signals an error if there are no more free bitmap slots.
2732@end defun 2702@end defun
2733 2703
2734@defun destroy-fringe-bitmap bitmap 2704@defun destroy-fringe-bitmap bitmap
@@ -2954,7 +2924,7 @@ as an absolute number of pixels.
2954 2924
2955@example 2925@example
2956@group 2926@group
2957 @var{expr} ::= @var{num} | (@var{num}) | @var{unit} | @var{elem} | @var{pos} | IMAGE | @var{form} 2927 @var{expr} ::= @var{num} | (@var{num}) | @var{unit} | @var{elem} | @var{pos} | @var{image} | @var{form}
2958 @var{num} ::= @var{integer} | @var{float} | @var{symbol} 2928 @var{num} ::= @var{integer} | @var{float} | @var{symbol}
2959 @var{unit} ::= in | mm | cm | width | height 2929 @var{unit} ::= in | mm | cm | width | height
2960 @var{elem} ::= left-fringe | right-fringe | left-margin | right-margin 2930 @var{elem} ::= left-fringe | right-fringe | left-margin | right-margin
@@ -2973,7 +2943,7 @@ buffer-local variable binding is used.
2973 The @code{in}, @code{mm}, and @code{cm} units specify the number of 2943 The @code{in}, @code{mm}, and @code{cm} units specify the number of
2974pixels per inch, millimeter, and centimeter, respectively. The 2944pixels per inch, millimeter, and centimeter, respectively. The
2975@code{width} and @code{height} units correspond to the default width 2945@code{width} and @code{height} units correspond to the default width
2976and height of the current face. An image specification @code{IMAGE} 2946and height of the current face. An image specification @code{image}
2977corresponds to the width or height of the image. 2947corresponds to the width or height of the image.
2978 2948
2979 The @code{left-fringe}, @code{right-fringe}, @code{left-margin}, 2949 The @code{left-fringe}, @code{right-fringe}, @code{left-margin},
@@ -3003,7 +2973,7 @@ header-line aligns with the first text column in the text area.
3003 A value of the form @code{(@var{num} . @var{expr})} stands 2973 A value of the form @code{(@var{num} . @var{expr})} stands
3004multiplying the values of @var{num} and @var{expr}. For example, 2974multiplying the values of @var{num} and @var{expr}. For example,
3005@code{(2 . in)} specifies a width of 2 inches, while @code{(0.5 . 2975@code{(2 . in)} specifies a width of 2 inches, while @code{(0.5 .
3006IMAGE)} specifies half the width (or height) of the specified image. 2976@var{image})} specifies half the width (or height) of the specified image.
3007 2977
3008 The form @code{(+ @var{expr} ...)} adds up the value of the 2978 The form @code{(+ @var{expr} ...)} adds up the value of the
3009expressions. The form @code{(- @var{expr} ...)} negates or subtracts 2979expressions. The form @code{(- @var{expr} ...)} negates or subtracts
diff --git a/src/ChangeLog b/src/ChangeLog
index b71bffc5bce..266b62588ea 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,41 @@
12004-09-29 Kim F. Storm <storm@cua.dk> 12004-09-29 Kim F. Storm <storm@cua.dk>
2 2
3 * fringe.c: Remove limit on number of bitmaps.
4 (fringe_bitmaps, fringe_faces): Change to pointers.
5 (max_fringe_bitmaps): New var.
6 (Fdefine_fringe_bitmap): Expand fringe_bitmaps and fringe_faces.
7 (init_fringe): Allocate fringe_bitmaps and fringe_faces.
8
9 * dispextern.h (FRINGE_ID_BITS): Increase to 16 bits (64K bitmaps).
10 (struct glyph_row): Reorder fringe_bitmap related fields.
11 (struct it): Likewise.
12
13 * w32term.c (fringe_bmp): Change to pointer.
14 (max_fringe_bmp): New var.
15 (w32_define_fringe_bitmap): Expand fringe_bmp.
16 (w32_draw_fringe_bitmap): Check max_fringe_bmp.
17 (w32_destroy_fringe_bitmap): Likewise.
18
192004-09-29 Kim F. Storm <storm@cua.dk>
20
21 * fringe.c: Simplify last change.
22 (lookup_fringe_bitmap): New function.
23 (valid_fringe_bitmap_p, resolve_fringe_bitmap): Remove.
24 (Fdestroy_fringe_bitmap): Use lookup_fringe_bitmap.
25 Keep standard bitmaps in Vfringe_bitmaps.
26 (Fdefine_fringe_bitmap): Use lookup_fringe_bitmap.
27 (Fset_fringe_bitmap_face): Likewise.
28
29 * dispextern.h (lookup_fringe_bitmap): Add prototype.
30 (valid_fringe_bitmap_p): Remove prototype.
31
32 * xdisp.c (handle_single_display_prop): Use lookup_fringe_bitmap.
33
342004-09-29 Kim F. Storm <storm@cua.dk>
35
36 * fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
37 (w32_init_fringe, w32_reset_fringes): Fix bootstrap (NULL rif).
38
3 * dispextern.h (valid_fringe_bitmap_p): Fix prototype. 39 * dispextern.h (valid_fringe_bitmap_p): Fix prototype.
4 40
5 * fringe.c (Vfringe_bitmaps): New variable. 41 * fringe.c (Vfringe_bitmaps): New variable.
diff --git a/src/dispextern.h b/src/dispextern.h
index 47454d5ba5a..f28b39f0c64 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -104,7 +104,7 @@ enum window_part
104}; 104};
105 105
106/* Number of bits allocated to store fringe bitmap numbers. */ 106/* Number of bits allocated to store fringe bitmap numbers. */
107#define FRINGE_ID_BITS 8 107#define FRINGE_ID_BITS 16
108 108
109 109
110 110
@@ -714,24 +714,24 @@ struct glyph_row
714 /* Left fringe bitmap number (enum fringe_bitmap_type). */ 714 /* Left fringe bitmap number (enum fringe_bitmap_type). */
715 unsigned left_user_fringe_bitmap : FRINGE_ID_BITS; 715 unsigned left_user_fringe_bitmap : FRINGE_ID_BITS;
716 716
717 /* Face of the left fringe glyph. */
718 unsigned left_user_fringe_face_id : FACE_ID_BITS;
719
720 /* Right fringe bitmap number (enum fringe_bitmap_type). */ 717 /* Right fringe bitmap number (enum fringe_bitmap_type). */
721 unsigned right_user_fringe_bitmap : FRINGE_ID_BITS; 718 unsigned right_user_fringe_bitmap : FRINGE_ID_BITS;
722 719
723 /* Face of the right fringe glyph. */
724 unsigned right_user_fringe_face_id : FACE_ID_BITS;
725
726 /* Left fringe bitmap number (enum fringe_bitmap_type). */ 720 /* Left fringe bitmap number (enum fringe_bitmap_type). */
727 unsigned left_fringe_bitmap : FRINGE_ID_BITS; 721 unsigned left_fringe_bitmap : FRINGE_ID_BITS;
728 722
729 /* Face of the left fringe glyph. */
730 unsigned left_fringe_face_id : FACE_ID_BITS;
731
732 /* Right fringe bitmap number (enum fringe_bitmap_type). */ 723 /* Right fringe bitmap number (enum fringe_bitmap_type). */
733 unsigned right_fringe_bitmap : FRINGE_ID_BITS; 724 unsigned right_fringe_bitmap : FRINGE_ID_BITS;
734 725
726 /* Face of the left fringe glyph. */
727 unsigned left_user_fringe_face_id : FACE_ID_BITS;
728
729 /* Face of the right fringe glyph. */
730 unsigned right_user_fringe_face_id : FACE_ID_BITS;
731
732 /* Face of the left fringe glyph. */
733 unsigned left_fringe_face_id : FACE_ID_BITS;
734
735 /* Face of the right fringe glyph. */ 735 /* Face of the right fringe glyph. */
736 unsigned right_fringe_face_id : FACE_ID_BITS; 736 unsigned right_fringe_face_id : FACE_ID_BITS;
737 737
@@ -2041,12 +2041,12 @@ struct it
2041 /* Left fringe bitmap number (enum fringe_bitmap_type). */ 2041 /* Left fringe bitmap number (enum fringe_bitmap_type). */
2042 unsigned left_user_fringe_bitmap : FRINGE_ID_BITS; 2042 unsigned left_user_fringe_bitmap : FRINGE_ID_BITS;
2043 2043
2044 /* Face of the left fringe glyph. */
2045 unsigned left_user_fringe_face_id : FACE_ID_BITS;
2046
2047 /* Right fringe bitmap number (enum fringe_bitmap_type). */ 2044 /* Right fringe bitmap number (enum fringe_bitmap_type). */
2048 unsigned right_user_fringe_bitmap : FRINGE_ID_BITS; 2045 unsigned right_user_fringe_bitmap : FRINGE_ID_BITS;
2049 2046
2047 /* Face of the left fringe glyph. */
2048 unsigned left_user_fringe_face_id : FACE_ID_BITS;
2049
2050 /* Face of the right fringe glyph. */ 2050 /* Face of the right fringe glyph. */
2051 unsigned right_user_fringe_face_id : FACE_ID_BITS; 2051 unsigned right_user_fringe_face_id : FACE_ID_BITS;
2052}; 2052};
@@ -2634,7 +2634,7 @@ extern int x_intersect_rectangles P_ ((XRectangle *, XRectangle *,
2634 2634
2635/* Defined in fringe.c */ 2635/* Defined in fringe.c */
2636 2636
2637int valid_fringe_bitmap_p (Lisp_Object); 2637int lookup_fringe_bitmap (Lisp_Object);
2638void draw_fringe_bitmap P_ ((struct window *, struct glyph_row *, int)); 2638void draw_fringe_bitmap P_ ((struct window *, struct glyph_row *, int));
2639void draw_row_fringe_bitmaps P_ ((struct window *, struct glyph_row *)); 2639void draw_row_fringe_bitmaps P_ ((struct window *, struct glyph_row *));
2640void draw_window_fringes P_ ((struct window *)); 2640void draw_window_fringes P_ ((struct window *));
diff --git a/src/fringe.c b/src/fringe.c
index d731bf5eaa6..0bf830cbd8c 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -445,27 +445,34 @@ struct fringe_bitmap standard_bitmaps[MAX_STANDARD_FRINGE_BITMAPS] =
445 { FRBITS (zv_bits), 8, 3, ALIGN_BITMAP_TOP, 0 }, 445 { FRBITS (zv_bits), 8, 3, ALIGN_BITMAP_TOP, 0 },
446}; 446};
447 447
448static struct fringe_bitmap *fringe_bitmaps[MAX_FRINGE_BITMAPS]; 448static struct fringe_bitmap **fringe_bitmaps;
449static unsigned fringe_faces[MAX_FRINGE_BITMAPS]; 449static unsigned *fringe_faces;
450static int max_fringe_bitmaps;
450 451
451static int max_used_fringe_bitmap = MAX_STANDARD_FRINGE_BITMAPS; 452static int max_used_fringe_bitmap = MAX_STANDARD_FRINGE_BITMAPS;
452 453
453/* Return 1 if FRINGE_ID is a valid fringe bitmap id. */ 454
455/* Lookup bitmap number for symbol BITMAP.
456 Return 0 if not a bitmap. */
454 457
455int 458int
456valid_fringe_bitmap_p (bitmap) 459lookup_fringe_bitmap (bitmap)
457 Lisp_Object bitmap; 460 Lisp_Object bitmap;
458{ 461{
459 int bn; 462 int bn;
460 463
464 bitmap = Fget (bitmap, Qfringe);
461 if (!INTEGERP (bitmap)) 465 if (!INTEGERP (bitmap))
462 return 0; 466 return 0;
463 467
464 bn = XINT (bitmap); 468 bn = XINT (bitmap);
465 return (bn >= NO_FRINGE_BITMAP 469 if (bn > NO_FRINGE_BITMAP
466 && bn < max_used_fringe_bitmap 470 && bn < max_used_fringe_bitmap
467 && (bn < MAX_STANDARD_FRINGE_BITMAPS 471 && (bn < MAX_STANDARD_FRINGE_BITMAPS
468 || fringe_bitmaps[bn] != NULL)); 472 || fringe_bitmaps[bn] != NULL))
473 return bn;
474
475 return 0;
469} 476}
470 477
471/* Get fringe bitmap name for bitmap number BN. 478/* Get fringe bitmap name for bitmap number BN.
@@ -501,42 +508,6 @@ get_fringe_bitmap_name (bn)
501} 508}
502 509
503 510
504/* Resolve a BITMAP parameter.
505
506 An INTEGER, corresponding to a bitmap number.
507 A STRING which is interned to a symbol.
508 A SYMBOL which has a fringe property which is a bitmap number.
509*/
510
511static int
512resolve_fringe_bitmap (bitmap, namep)
513 Lisp_Object bitmap;
514 Lisp_Object *namep;
515{
516 if (namep)
517 *namep = Qnil;
518
519 if (STRINGP (bitmap))
520 bitmap = intern (SDATA (bitmap));
521
522 if (SYMBOLP (bitmap))
523 {
524 if (namep)
525 *namep = bitmap;
526 bitmap = Fget (bitmap, Qfringe);
527 }
528
529 if (valid_fringe_bitmap_p (bitmap))
530 {
531 if (namep && NILP (*namep))
532 *namep = get_fringe_bitmap_name (XINT (bitmap));
533 return XINT (bitmap);
534 }
535
536 return -1;
537}
538
539
540/* Draw the bitmap WHICH in one of the left or right fringes of 511/* Draw the bitmap WHICH in one of the left or right fringes of
541 window W. ROW is the glyph row for which to display the bitmap; it 512 window W. ROW is the glyph row for which to display the bitmap; it
542 determines the vertical position at which the bitmap has to be 513 determines the vertical position at which the bitmap has to be
@@ -1068,7 +1039,9 @@ compute_fringe_widths (f, redraw)
1068} 1039}
1069 1040
1070 1041
1071void 1042/* Free resources used by a user-defined bitmap. */
1043
1044int
1072destroy_fringe_bitmap (n) 1045destroy_fringe_bitmap (n)
1073 int n; 1046 int n;
1074{ 1047{
@@ -1079,7 +1052,7 @@ destroy_fringe_bitmap (n)
1079 fbp = &fringe_bitmaps[n]; 1052 fbp = &fringe_bitmaps[n];
1080 if (*fbp && (*fbp)->dynamic) 1053 if (*fbp && (*fbp)->dynamic)
1081 { 1054 {
1082 if (rif->destroy_fringe_bitmap) 1055 if (rif && rif->destroy_fringe_bitmap)
1083 rif->destroy_fringe_bitmap (n); 1056 rif->destroy_fringe_bitmap (n);
1084 xfree (*fbp); 1057 xfree (*fbp);
1085 *fbp = NULL; 1058 *fbp = NULL;
@@ -1099,20 +1072,21 @@ If BITMAP overrides a standard fringe bitmap, the original bitmap is restored.
1099 Lisp_Object bitmap; 1072 Lisp_Object bitmap;
1100{ 1073{
1101 int n; 1074 int n;
1102 Lisp_Object sym;
1103 1075
1104 n = resolve_fringe_bitmap (bitmap, &sym); 1076 CHECK_SYMBOL (bitmap);
1105 if (n < 0) 1077 n = lookup_fringe_bitmap (bitmap);
1078 if (!n)
1106 return Qnil; 1079 return Qnil;
1107 1080
1108 destroy_fringe_bitmap (n); 1081 destroy_fringe_bitmap (n);
1109 1082
1110 if (SYMBOLP (sym)) 1083 if (n >= MAX_STANDARD_FRINGE_BITMAPS)
1111 { 1084 {
1112 Vfringe_bitmaps = Fdelq (sym, Vfringe_bitmaps); 1085 Vfringe_bitmaps = Fdelq (bitmap, Vfringe_bitmaps);
1113 /* It would be better to remove the fringe property. */ 1086 /* It would be better to remove the fringe property. */
1114 Fput (sym, Qfringe, Qnil); 1087 Fput (bitmap, Qfringe, Qnil);
1115 } 1088 }
1089
1116 return Qnil; 1090 return Qnil;
1117} 1091}
1118 1092
@@ -1185,7 +1159,7 @@ init_fringe_bitmap (which, fb, once_p)
1185 { 1159 {
1186 destroy_fringe_bitmap (which); 1160 destroy_fringe_bitmap (which);
1187 1161
1188 if (rif->define_fringe_bitmap) 1162 if (rif && rif->define_fringe_bitmap)
1189 rif->define_fringe_bitmap (which, fb->bits, fb->height, fb->width); 1163 rif->define_fringe_bitmap (which, fb->bits, fb->height, fb->width);
1190 1164
1191 fringe_bitmaps[which] = fb; 1165 fringe_bitmaps[which] = fb;
@@ -1216,12 +1190,8 @@ If BITMAP already exists, the existing definition is replaced. */)
1216 unsigned short *b; 1190 unsigned short *b;
1217 struct fringe_bitmap fb, *xfb; 1191 struct fringe_bitmap fb, *xfb;
1218 int fill1 = 0, fill2 = 0; 1192 int fill1 = 0, fill2 = 0;
1219 Lisp_Object sym;
1220
1221 n = resolve_fringe_bitmap (bitmap, &sym);
1222 1193
1223 if (NILP (sym) || INTEGERP (sym)) 1194 CHECK_SYMBOL (bitmap);
1224 sym = wrong_type_argument (Qsymbolp, bitmap);
1225 1195
1226 if (!STRINGP (bits) && !VECTORP (bits)) 1196 if (!STRINGP (bits) && !VECTORP (bits))
1227 bits = wrong_type_argument (Qstringp, bits); 1197 bits = wrong_type_argument (Qstringp, bits);
@@ -1274,23 +1244,42 @@ If BITMAP already exists, the existing definition is replaced. */)
1274 else if (!NILP (align) && !EQ (align, Qcenter)) 1244 else if (!NILP (align) && !EQ (align, Qcenter))
1275 error ("Bad align argument"); 1245 error ("Bad align argument");
1276 1246
1277 if (n < 0) 1247 n = lookup_fringe_bitmap (bitmap);
1248 if (!n)
1278 { 1249 {
1279 if (max_used_fringe_bitmap < MAX_FRINGE_BITMAPS) 1250 if (max_used_fringe_bitmap < max_fringe_bitmaps)
1280 n = max_used_fringe_bitmap++; 1251 n = max_used_fringe_bitmap++;
1281 else 1252 else
1282 { 1253 {
1283 for (n = MAX_STANDARD_FRINGE_BITMAPS; 1254 for (n = MAX_STANDARD_FRINGE_BITMAPS;
1284 n < MAX_FRINGE_BITMAPS; 1255 n < max_fringe_bitmaps;
1285 n++) 1256 n++)
1286 if (fringe_bitmaps[n] == NULL) 1257 if (fringe_bitmaps[n] == NULL)
1287 break; 1258 break;
1288 if (n == MAX_FRINGE_BITMAPS) 1259
1289 error ("Cannot define more fringe bitmaps"); 1260 if (n == max_fringe_bitmaps)
1261 {
1262 if ((max_fringe_bitmaps + 20) > MAX_FRINGE_BITMAPS)
1263 error ("No free fringe bitmap slots");
1264
1265 i = max_fringe_bitmaps;
1266 max_fringe_bitmaps += 20;
1267 fringe_bitmaps
1268 = ((struct fringe_bitmap **)
1269 xrealloc (fringe_bitmaps, max_fringe_bitmaps * sizeof (struct fringe_bitmap *)));
1270 fringe_faces
1271 = (unsigned *) xrealloc (fringe_faces, max_fringe_bitmaps * sizeof (unsigned));
1272
1273 for (; i < max_fringe_bitmaps; i++)
1274 {
1275 fringe_bitmaps[i] = NULL;
1276 fringe_faces[i] = FRINGE_FACE_ID;
1277 }
1278 }
1290 } 1279 }
1291 1280
1292 Vfringe_bitmaps = Fcons (sym, Vfringe_bitmaps); 1281 Vfringe_bitmaps = Fcons (bitmap, Vfringe_bitmaps);
1293 Fput (sym, Qfringe, make_number (n)); 1282 Fput (bitmap, Qfringe, make_number (n));
1294 } 1283 }
1295 1284
1296 fb.dynamic = 1; 1285 fb.dynamic = 1;
@@ -1318,7 +1307,7 @@ If BITMAP already exists, the existing definition is replaced. */)
1318 1307
1319 init_fringe_bitmap (n, xfb, 0); 1308 init_fringe_bitmap (n, xfb, 0);
1320 1309
1321 return sym; 1310 return bitmap;
1322} 1311}
1323 1312
1324DEFUN ("set-fringe-bitmap-face", Fset_fringe_bitmap_face, Sset_fringe_bitmap_face, 1313DEFUN ("set-fringe-bitmap-face", Fset_fringe_bitmap_face, Sset_fringe_bitmap_face,
@@ -1328,11 +1317,12 @@ If FACE is nil, reset face to default fringe face. */)
1328 (bitmap, face) 1317 (bitmap, face)
1329 Lisp_Object bitmap, face; 1318 Lisp_Object bitmap, face;
1330{ 1319{
1331 int bn; 1320 int n;
1332 int face_id; 1321 int face_id;
1333 1322
1334 bn = resolve_fringe_bitmap (bitmap, 0); 1323 CHECK_SYMBOL (bitmap);
1335 if (bn < 0) 1324 n = lookup_fringe_bitmap (bitmap);
1325 if (!n)
1336 error ("Undefined fringe bitmap"); 1326 error ("Undefined fringe bitmap");
1337 1327
1338 if (!NILP (face)) 1328 if (!NILP (face))
@@ -1344,7 +1334,7 @@ If FACE is nil, reset face to default fringe face. */)
1344 else 1334 else
1345 face_id = FRINGE_FACE_ID; 1335 face_id = FRINGE_FACE_ID;
1346 1336
1347 fringe_faces [bn] = face_id; 1337 fringe_faces[n] = face_id;
1348 1338
1349 return Qnil; 1339 return Qnil;
1350} 1340}
@@ -1433,9 +1423,18 @@ init_fringe ()
1433{ 1423{
1434 int i; 1424 int i;
1435 1425
1436 bzero (fringe_bitmaps, sizeof fringe_bitmaps); 1426 max_fringe_bitmaps = MAX_STANDARD_FRINGE_BITMAPS + 20;
1437 for (i = 0; i < MAX_FRINGE_BITMAPS; i++) 1427
1438 fringe_faces[i] = FRINGE_FACE_ID; 1428 fringe_bitmaps
1429 = (struct fringe_bitmap **) xmalloc (max_fringe_bitmaps * sizeof (struct fringe_bitmap *));
1430 fringe_faces
1431 = (unsigned *) xmalloc (max_fringe_bitmaps * sizeof (unsigned));
1432
1433 for (i = 0; i < max_fringe_bitmaps; i++)
1434 {
1435 fringe_bitmaps[i] = NULL;
1436 fringe_faces[i] = FRINGE_FACE_ID;
1437 }
1439} 1438}
1440 1439
1441#ifdef HAVE_NTGUI 1440#ifdef HAVE_NTGUI
@@ -1445,6 +1444,9 @@ w32_init_fringe ()
1445{ 1444{
1446 enum fringe_bitmap_type bt; 1445 enum fringe_bitmap_type bt;
1447 1446
1447 if (!rif)
1448 return;
1449
1448 for (bt = NO_FRINGE_BITMAP + 1; bt < MAX_STANDARD_FRINGE_BITMAPS; bt++) 1450 for (bt = NO_FRINGE_BITMAP + 1; bt < MAX_STANDARD_FRINGE_BITMAPS; bt++)
1449 { 1451 {
1450 struct fringe_bitmap *fb = &standard_bitmaps[bt]; 1452 struct fringe_bitmap *fb = &standard_bitmaps[bt];
@@ -1458,6 +1460,9 @@ w32_reset_fringes ()
1458 /* Destroy row bitmaps. */ 1460 /* Destroy row bitmaps. */
1459 int bt; 1461 int bt;
1460 1462
1463 if (!rif)
1464 return;
1465
1461 for (bt = NO_FRINGE_BITMAP + 1; bt < max_used_fringe_bitmap; bt++) 1466 for (bt = NO_FRINGE_BITMAP + 1; bt < max_used_fringe_bitmap; bt++)
1462 rif->destroy_fringe_bitmap (bt); 1467 rif->destroy_fringe_bitmap (bt);
1463} 1468}
diff --git a/src/w32term.c b/src/w32term.c
index 50a777f2002..1d6b4ec7535 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -64,7 +64,8 @@ Boston, MA 02111-1307, USA. */
64 64
65/* Fringe bitmaps. */ 65/* Fringe bitmaps. */
66 66
67static HBITMAP fringe_bmp[MAX_FRINGE_BITMAPS]; 67static int max_fringe_bmp = 0;
68static HBITMAP *fringe_bmp = 0;
68 69
69/* Non-nil means Emacs uses toolkit scroll bars. */ 70/* Non-nil means Emacs uses toolkit scroll bars. */
70 71
@@ -731,7 +732,7 @@ w32_draw_fringe_bitmap (w, row, p)
731 p->bx, p->by, p->nx, p->ny); 732 p->bx, p->by, p->nx, p->ny);
732 } 733 }
733 734
734 if (p->which) 735 if (p->which && p->which < max_fringe_bmp)
735 { 736 {
736 HBITMAP pixmap = fringe_bmp[p->which]; 737 HBITMAP pixmap = fringe_bmp[p->which];
737 HDC compat_hdc; 738 HDC compat_hdc;
@@ -794,6 +795,15 @@ w32_define_fringe_bitmap (which, bits, h, wd)
794 unsigned short *bits; 795 unsigned short *bits;
795 int h, wd; 796 int h, wd;
796{ 797{
798 if (which >= max_fringe_bmp)
799 {
800 int i = max_fringe_bmp;
801 max_fringe_bmp = which + 20;
802 fringe_bmp = (HBITMAP *) xrealloc (fringe_bmp, max_fringe_bmp * sizeof (HBITMAP));
803 while (i < max_fringe_bmp)
804 fringe_bmp[i++] = 0;
805 }
806
797 fringe_bmp[which] = CreateBitmap (wd, h, 1, 1, bits); 807 fringe_bmp[which] = CreateBitmap (wd, h, 1, 1, bits);
798} 808}
799 809
@@ -801,6 +811,9 @@ static void
801w32_destroy_fringe_bitmap (which) 811w32_destroy_fringe_bitmap (which)
802 int which; 812 int which;
803{ 813{
814 if (which >= max_fringe_bmp)
815 return;
816
804 if (fringe_bmp[which]) 817 if (fringe_bmp[which])
805 DeleteObject (fringe_bmp[which]); 818 DeleteObject (fringe_bmp[which]);
806 fringe_bmp[which] = 0; 819 fringe_bmp[which] = 0;
diff --git a/src/xdisp.c b/src/xdisp.c
index 353a72f65b6..11eab6532bb 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -308,7 +308,6 @@ extern Lisp_Object Qheight;
308extern Lisp_Object QCwidth, QCheight, QCascent; 308extern Lisp_Object QCwidth, QCheight, QCascent;
309extern Lisp_Object Qscroll_bar; 309extern Lisp_Object Qscroll_bar;
310extern Lisp_Object Qcursor; 310extern Lisp_Object Qcursor;
311extern Lisp_Object Qfringe;
312 311
313/* Non-nil means highlight trailing whitespace. */ 312/* Non-nil means highlight trailing whitespace. */
314 313
@@ -3572,6 +3571,7 @@ handle_single_display_prop (it, prop, object, position,
3572 && CONSP (XCDR (prop))) 3571 && CONSP (XCDR (prop)))
3573 { 3572 {
3574 unsigned face_id = DEFAULT_FACE_ID; 3573 unsigned face_id = DEFAULT_FACE_ID;
3574 int fringe_bitmap;
3575 3575
3576 /* Save current settings of IT so that we can restore them 3576 /* Save current settings of IT so that we can restore them
3577 when we are finished with the glyph property value. */ 3577 when we are finished with the glyph property value. */
@@ -3583,8 +3583,7 @@ handle_single_display_prop (it, prop, object, position,
3583#ifdef HAVE_WINDOW_SYSTEM 3583#ifdef HAVE_WINDOW_SYSTEM
3584 value = XCAR (XCDR (prop)); 3584 value = XCAR (XCDR (prop));
3585 if (!SYMBOLP (value) 3585 if (!SYMBOLP (value)
3586 || (value = Fget (value, Qfringe), 3586 || !(fringe_bitmap = lookup_fringe_bitmap (value)))
3587 !valid_fringe_bitmap_p (value)))
3588 return 0; 3587 return 0;
3589 3588
3590 if (CONSP (XCDR (XCDR (prop)))) 3589 if (CONSP (XCDR (XCDR (prop))))
@@ -3613,12 +3612,12 @@ handle_single_display_prop (it, prop, object, position,
3613 3612
3614 if (EQ (XCAR (prop), Qleft_fringe)) 3613 if (EQ (XCAR (prop), Qleft_fringe))
3615 { 3614 {
3616 it->left_user_fringe_bitmap = XINT (value); 3615 it->left_user_fringe_bitmap = fringe_bitmap;
3617 it->left_user_fringe_face_id = face_id; 3616 it->left_user_fringe_face_id = face_id;
3618 } 3617 }
3619 else 3618 else
3620 { 3619 {
3621 it->right_user_fringe_bitmap = XINT (value); 3620 it->right_user_fringe_bitmap = fringe_bitmap;
3622 it->right_user_fringe_face_id = face_id; 3621 it->right_user_fringe_face_id = face_id;
3623 } 3622 }
3624#endif /* HAVE_WINDOW_SYSTEM */ 3623#endif /* HAVE_WINDOW_SYSTEM */
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-26 01:34:42 +0000