Browse code

merge backport fixes for 0.88.7

git-svn-id: file:///var/lib/svn/clamav-devel/branches/0.88-stable@2806 77e5149b-7576-45b1-b177-96237e5ba77b

Sven Strickroth authored on 2007/02/18 23:50:58
Showing 186 changed files
... ...
@@ -1,3 +1,12 @@
1
+Mon Dec 11 02:47:03 CET 2006
2
+----------------------------
3
+  * Bugfixes:
4
+    - libclamav/message.c: handle consecutive errors in base64 decoding
5
+    - libclamav/mbox.c: honour recursion limit when scanning email messages
6
+    - clamscan: new option --mail-max-recursion
7
+    - clamd/clamav-milter: new option MailMaxRecursion
8
+    - libclamav/untar.c: honour archive limits
9
+
1 10
 Sun Nov  5 17:08:22 CET 2006
2 11
 -----------------------------
3 12
   * Bugfixes:
... ...
@@ -1,11 +1,7 @@
1
-0.88.6
1
+0.88.7
2 2
 ------
3 3
 
4
-Changes in this release include better handling of network problems in
5
-freshclam and other minor bugfixes.
6
-
7
-The ClamAV developers encourage all users to give a try to the latest
8
-beta version of 0.90!
4
+This version improves scanning of mail and tar files.
9 5
 
10 6
 --
11 7
 The ClamAV team (http://www.clamav.net/team.html)
... ...
@@ -2,6 +2,14 @@ Note: This README/NEWS file refers to the source tarball. Some things described
2 2
 here may not be available in binary packages.
3 3
 --
4 4
 
5
+0.88.7
6
+------
7
+
8
+This version improves scanning of mail and tar files.
9
+
10
+--
11
+The ClamAV team (http://www.clamav.net/team.html)
12
+
5 13
 0.88.6
6 14
 ------
7 15
 
... ...
@@ -1460,6 +1460,11 @@ main(int argc, char **argv)
1460 1460
 
1461 1461
 		memset(&limits, '\0', sizeof(struct cl_limits));
1462 1462
 
1463
+		if((cpt = cfgopt(copt, "MailMaxRecursion")) != NULL)
1464
+			limits.maxmailrec = cpt->numarg;
1465
+		else
1466
+			limits.maxmailrec = 64;
1467
+
1463 1468
 		if(cfgopt(copt, "ScanArchive")) {
1464 1469
 			options |= CL_SCAN_ARCHIVE;
1465 1470
 			if((cpt = cfgopt(copt, "ArchiveMaxFileSize")) != NULL)
... ...
@@ -386,6 +386,12 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop
386 386
 	    options |= CL_SCAN_MAILURL;
387 387
 	}
388 388
 
389
+	if((cpt = cfgopt(copt, "MailMaxRecursion")))
390
+	    limits.maxmailrec = cpt->numarg;
391
+	else
392
+	    limits.maxmailrec = 64;
393
+
394
+	logg("Mail: Recursion level limit set to %u.\n", limits.maxmailrec);
389 395
     } else {
390 396
 	logg("Mail files support disabled.\n");
391 397
     }
... ...
@@ -142,6 +142,12 @@ int clamscan(struct optstruct *opt)
142 142
 	    return 40;
143 143
 	}
144 144
 
145
+    if(optl(opt, "max-mail-recursion"))
146
+	if(!isnumb(getargl(opt, "max-mail-recursion"))) {
147
+	    mprintf("!--max-mail-recursion requires natural number.\n");
148
+	    return 40;
149
+	}
150
+
145 151
     if(optl(opt, "max-dir-recursion"))
146 152
 	if(!isnumb(getargl(opt, "max-dir-recursion"))) {
147 153
 	    logg("!--max-dir-recursion requires natural number.\n");
... ...
@@ -262,6 +268,7 @@ void help(void)
262 262
     mprintf("    --max-files=#n                       Only extract first #n files from\n");
263 263
     mprintf("                                         archives\n");
264 264
     mprintf("    --max-recursion=#n                   Maximum archive recursion level\n");
265
+    mprintf("    --max-mail-recursion=#n              Maximum mail recursion level\n");
265 266
     mprintf("    --max-ratio=#n                       Maximum compression ratio limit\n");
266 267
     mprintf("    --max-dir-recursion=#n               Maximum directory recursion level\n");
267 268
     mprintf("    --unzip[=FULLPATH]                   Enable support for .zip files\n");
... ...
@@ -154,6 +154,11 @@ int scanmanager(const struct optstruct *opt)
154 154
     else
155 155
         limits->maxreclevel = 8;
156 156
 
157
+    if(optl(opt, "max-mail-recursion"))
158
+        limits->maxmailrec = atoi(getargl(opt, "max-mail-recursion"));
159
+    else
160
+        limits->maxmailrec = 64;
161
+
157 162
     if(optl(opt, "max-ratio"))
158 163
         limits->maxratio = atoi(getargl(opt, "max-ratio"));
159 164
     else
... ...
@@ -90,6 +90,7 @@ int main(int argc, char **argv)
90 90
 	    {"max-space", 1, 0, 0},
91 91
             {"max-ratio", 1, 0, 0},
92 92
 	    {"max-recursion", 1, 0, 0},
93
+	    {"max-mail-recursion", 1, 0, 0},
93 94
 	    {"max-dir-recursion", 1, 0, 0},
94 95
 	    {"disable-archive", 0, 0, 0},
95 96
 	    {"no-archive", 0, 0, 0},
... ...
@@ -1,6 +1,6 @@
1 1
 #! /bin/sh
2 2
 # Guess values for system-dependent variables and create Makefiles.
3
-# Generated by GNU Autoconf 2.60a.
3
+# Generated by GNU Autoconf 2.61.
4 4
 #
5 5
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
6 6
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
... ...
@@ -10,7 +10,8 @@
10 10
 ## M4sh Initialization.  ##
11 11
 ## --------------------- ##
12 12
 
13
-# Be Bourne compatible
13
+# Be more Bourne compatible
14
+DUALCASE=1; export DUALCASE # for MKS sh
14 15
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
15 16
   emulate sh
16 17
   NULLCMD=:
... ...
@@ -19,10 +20,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
19 19
   alias -g '${1+"$@"}'='"$@"'
20 20
   setopt NO_GLOB_SUBST
21 21
 else
22
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
22
+  case `(set -o) 2>/dev/null` in
23
+  *posix*) set -o posix ;;
24
+esac
25
+
23 26
 fi
24
-BIN_SH=xpg4; export BIN_SH # for Tru64
25
-DUALCASE=1; export DUALCASE # for MKS sh
27
+
28
+
26 29
 
27 30
 
28 31
 # PATH needs CR
... ...
@@ -215,7 +219,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; }
215 215
 else
216 216
   as_candidate_shells=
217 217
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
218
-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
218
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
219 219
 do
220 220
   IFS=$as_save_IFS
221 221
   test -z "$as_dir" && as_dir=.
... ...
@@ -233,7 +237,6 @@ IFS=$as_save_IFS
233 233
 	 # Try only shells that exist, to save several forks.
234 234
 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
235 235
 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
236
-# Be Bourne compatible
237 236
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
238 237
   emulate sh
239 238
   NULLCMD=:
... ...
@@ -242,10 +245,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
242 242
   alias -g '${1+"$@"}'='"$@"'
243 243
   setopt NO_GLOB_SUBST
244 244
 else
245
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
245
+  case `(set -o) 2>/dev/null` in
246
+  *posix*) set -o posix ;;
247
+esac
248
+
246 249
 fi
247
-BIN_SH=xpg4; export BIN_SH # for Tru64
248
-DUALCASE=1; export DUALCASE # for MKS sh
250
+
249 251
 
250 252
 :
251 253
 _ASEOF
... ...
@@ -253,7 +258,6 @@ _ASEOF
253 253
   CONFIG_SHELL=$as_shell
254 254
 	       as_have_required=yes
255 255
 	       if { "$as_shell" 2> /dev/null <<\_ASEOF
256
-# Be Bourne compatible
257 256
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
258 257
   emulate sh
259 258
   NULLCMD=:
... ...
@@ -262,10 +266,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
262 262
   alias -g '${1+"$@"}'='"$@"'
263 263
   setopt NO_GLOB_SUBST
264 264
 else
265
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
265
+  case `(set -o) 2>/dev/null` in
266
+  *posix*) set -o posix ;;
267
+esac
268
+
266 269
 fi
267
-BIN_SH=xpg4; export BIN_SH # for Tru64
268
-DUALCASE=1; export DUALCASE # for MKS sh
270
+
269 271
 
270 272
 :
271 273
 (as_func_return () {
... ...
@@ -512,19 +518,28 @@ else
512 512
   as_mkdir_p=false
513 513
 fi
514 514
 
515
-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
516
-# systems may use methods other than mode bits to determine executability.
517
-cat >conf$$.file <<_ASEOF
518
-#! /bin/sh
519
-exit 0
520
-_ASEOF
521
-chmod +x conf$$.file
522
-if test -x conf$$.file >/dev/null 2>&1; then
523
-  as_executable_p="test -x"
515
+if test -x / >/dev/null 2>&1; then
516
+  as_test_x='test -x'
524 517
 else
525
-  as_executable_p=:
518
+  if ls -dL / >/dev/null 2>&1; then
519
+    as_ls_L_option=L
520
+  else
521
+    as_ls_L_option=
522
+  fi
523
+  as_test_x='
524
+    eval sh -c '\''
525
+      if test -d "$1"; then
526
+        test -d "$1/.";
527
+      else
528
+	case $1 in
529
+        -*)set "./$1";;
530
+	esac;
531
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
532
+	???[sx]*):;;*)false;;esac;fi
533
+    '\'' sh
534
+  '
526 535
 fi
527
-rm -f conf$$.file
536
+as_executable_p=$as_test_x
528 537
 
529 538
 # Sed expression to map a string onto a valid CPP name.
530 539
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
... ...
@@ -879,6 +894,7 @@ target_alias
879 879
 CC
880 880
 CFLAGS
881 881
 LDFLAGS
882
+LIBS
882 883
 CPPFLAGS
883 884
 CPP'
884 885
 
... ...
@@ -986,10 +1002,10 @@ do
986 986
   -disable-* | --disable-*)
987 987
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
988 988
     # Reject names that are not valid shell variable names.
989
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
989
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
990 990
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
991 991
    { (exit 1); exit 1; }; }
992
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
992
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
993 993
     eval enable_$ac_feature=no ;;
994 994
 
995 995
   -docdir | --docdir | --docdi | --doc | --do)
... ...
@@ -1005,10 +1021,10 @@ do
1005 1005
   -enable-* | --enable-*)
1006 1006
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
1007 1007
     # Reject names that are not valid shell variable names.
1008
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
1008
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1009 1009
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
1010 1010
    { (exit 1); exit 1; }; }
1011
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
1011
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
1012 1012
     eval enable_$ac_feature=\$ac_optarg ;;
1013 1013
 
1014 1014
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
... ...
@@ -1202,19 +1218,19 @@ do
1202 1202
   -with-* | --with-*)
1203 1203
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
1204 1204
     # Reject names that are not valid shell variable names.
1205
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
1205
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1206 1206
       { echo "$as_me: error: invalid package name: $ac_package" >&2
1207 1207
    { (exit 1); exit 1; }; }
1208
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
1208
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
1209 1209
     eval with_$ac_package=\$ac_optarg ;;
1210 1210
 
1211 1211
   -without-* | --without-*)
1212 1212
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
1213 1213
     # Reject names that are not valid shell variable names.
1214
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
1214
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1215 1215
       { echo "$as_me: error: invalid package name: $ac_package" >&2
1216 1216
    { (exit 1); exit 1; }; }
1217
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
1217
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
1218 1218
     eval with_$ac_package=no ;;
1219 1219
 
1220 1220
   --x)
... ...
@@ -1506,6 +1522,7 @@ Some influential environment variables:
1506 1506
   CFLAGS      C compiler flags
1507 1507
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
1508 1508
               nonstandard directory <lib dir>
1509
+  LIBS        libraries to pass to the linker, e.g. -l<library>
1509 1510
   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
1510 1511
               you have headers in a nonstandard directory <include dir>
1511 1512
   CPP         C preprocessor
... ...
@@ -1574,7 +1591,7 @@ test -n "$ac_init_help" && exit $ac_status
1574 1574
 if $ac_init_version; then
1575 1575
   cat <<\_ACEOF
1576 1576
 configure
1577
-generated by GNU Autoconf 2.60a
1577
+generated by GNU Autoconf 2.61
1578 1578
 
1579 1579
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1580 1580
 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
... ...
@@ -1588,7 +1605,7 @@ This file contains any messages produced by compilers while
1588 1588
 running configure, to aid debugging if configure makes a mistake.
1589 1589
 
1590 1590
 It was created by $as_me, which was
1591
-generated by GNU Autoconf 2.60a.  Invocation command line was
1591
+generated by GNU Autoconf 2.61.  Invocation command line was
1592 1592
 
1593 1593
   $ $0 $@
1594 1594
 
... ...
@@ -2313,7 +2330,7 @@ case $as_dir/ in
2313 2313
     # by default.
2314 2314
     for ac_prog in ginstall scoinst install; do
2315 2315
       for ac_exec_ext in '' $ac_executable_extensions; do
2316
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
2316
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
2317 2317
 	  if test $ac_prog = install &&
2318 2318
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2319 2319
 	    # AIX install.  It has an incompatible calling convention.
... ...
@@ -2479,7 +2496,7 @@ do
2479 2479
   IFS=$as_save_IFS
2480 2480
   test -z "$as_dir" && as_dir=.
2481 2481
   for ac_exec_ext in '' $ac_executable_extensions; do
2482
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
2482
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2483 2483
     ac_cv_prog_AWK="$ac_prog"
2484 2484
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2485 2485
     break 2
... ...
@@ -2562,7 +2579,7 @@ fi
2562 2562
 
2563 2563
 # Define the identity of the package.
2564 2564
  PACKAGE=clamav
2565
- VERSION="0.88.6"
2565
+ VERSION="0.88.7"
2566 2566
 
2567 2567
 
2568 2568
 cat >>confdefs.h <<_ACEOF
... ...
@@ -2614,7 +2631,7 @@ do
2614 2614
   IFS=$as_save_IFS
2615 2615
   test -z "$as_dir" && as_dir=.
2616 2616
   for ac_exec_ext in '' $ac_executable_extensions; do
2617
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
2617
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2618 2618
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
2619 2619
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2620 2620
     break 2
... ...
@@ -2654,7 +2671,7 @@ do
2654 2654
   IFS=$as_save_IFS
2655 2655
   test -z "$as_dir" && as_dir=.
2656 2656
   for ac_exec_ext in '' $ac_executable_extensions; do
2657
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
2657
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2658 2658
     ac_cv_prog_ac_ct_STRIP="strip"
2659 2659
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2660 2660
     break 2
... ...
@@ -2712,7 +2729,7 @@ ac_config_headers="$ac_config_headers clamav-config.h"
2712 2712
 
2713 2713
 
2714 2714
 LC_CURRENT=1
2715
-LC_REVISION=18
2715
+LC_REVISION=19
2716 2716
 LC_AGE=0
2717 2717
 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
2718 2718
 
... ...
@@ -2735,7 +2752,7 @@ do
2735 2735
   IFS=$as_save_IFS
2736 2736
   test -z "$as_dir" && as_dir=.
2737 2737
   for ac_exec_ext in '' $ac_executable_extensions; do
2738
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
2738
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2739 2739
     ac_cv_prog_AWK="$ac_prog"
2740 2740
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2741 2741
     break 2
... ...
@@ -2781,7 +2798,7 @@ do
2781 2781
   IFS=$as_save_IFS
2782 2782
   test -z "$as_dir" && as_dir=.
2783 2783
   for ac_exec_ext in '' $ac_executable_extensions; do
2784
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
2784
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2785 2785
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
2786 2786
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2787 2787
     break 2
... ...
@@ -2821,7 +2838,7 @@ do
2821 2821
   IFS=$as_save_IFS
2822 2822
   test -z "$as_dir" && as_dir=.
2823 2823
   for ac_exec_ext in '' $ac_executable_extensions; do
2824
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
2824
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2825 2825
     ac_cv_prog_ac_ct_CC="gcc"
2826 2826
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2827 2827
     break 2
... ...
@@ -2878,7 +2895,7 @@ do
2878 2878
   IFS=$as_save_IFS
2879 2879
   test -z "$as_dir" && as_dir=.
2880 2880
   for ac_exec_ext in '' $ac_executable_extensions; do
2881
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
2881
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2882 2882
     ac_cv_prog_CC="${ac_tool_prefix}cc"
2883 2883
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2884 2884
     break 2
... ...
@@ -2919,7 +2936,7 @@ do
2919 2919
   IFS=$as_save_IFS
2920 2920
   test -z "$as_dir" && as_dir=.
2921 2921
   for ac_exec_ext in '' $ac_executable_extensions; do
2922
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
2922
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2923 2923
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
2924 2924
        ac_prog_rejected=yes
2925 2925
        continue
... ...
@@ -2977,7 +2994,7 @@ do
2977 2977
   IFS=$as_save_IFS
2978 2978
   test -z "$as_dir" && as_dir=.
2979 2979
   for ac_exec_ext in '' $ac_executable_extensions; do
2980
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
2980
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2981 2981
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
2982 2982
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2983 2983
     break 2
... ...
@@ -3021,7 +3038,7 @@ do
3021 3021
   IFS=$as_save_IFS
3022 3022
   test -z "$as_dir" && as_dir=.
3023 3023
   for ac_exec_ext in '' $ac_executable_extensions; do
3024
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
3024
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3025 3025
     ac_cv_prog_ac_ct_CC="$ac_prog"
3026 3026
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
3027 3027
     break 2
... ...
@@ -3384,27 +3401,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3384 3384
   rm -f conftest.er1
3385 3385
   cat conftest.err >&5
3386 3386
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
3387
-  (exit $ac_status); } &&
3388
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3389
-  { (case "(($ac_try" in
3390
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3391
-  *) ac_try_echo=$ac_try;;
3392
-esac
3393
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3394
-  (eval "$ac_try") 2>&5
3395
-  ac_status=$?
3396
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3397
-  (exit $ac_status); }; } &&
3398
-	 { ac_try='test -s conftest.$ac_objext'
3399
-  { (case "(($ac_try" in
3400
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3401
-  *) ac_try_echo=$ac_try;;
3402
-esac
3403
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3404
-  (eval "$ac_try") 2>&5
3405
-  ac_status=$?
3406
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3407
-  (exit $ac_status); }; }; then
3387
+  (exit $ac_status); } && {
3388
+	 test -z "$ac_c_werror_flag" ||
3389
+	 test ! -s conftest.err
3390
+       } && test -s conftest.$ac_objext; then
3408 3391
   ac_compiler_gnu=yes
3409 3392
 else
3410 3393
   echo "$as_me: failed program was:" >&5
... ...
@@ -3459,27 +3459,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3459 3459
   rm -f conftest.er1
3460 3460
   cat conftest.err >&5
3461 3461
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
3462
-  (exit $ac_status); } &&
3463
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3464
-  { (case "(($ac_try" in
3465
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3466
-  *) ac_try_echo=$ac_try;;
3467
-esac
3468
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3469
-  (eval "$ac_try") 2>&5
3470
-  ac_status=$?
3471
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3472
-  (exit $ac_status); }; } &&
3473
-	 { ac_try='test -s conftest.$ac_objext'
3474
-  { (case "(($ac_try" in
3475
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3476
-  *) ac_try_echo=$ac_try;;
3477
-esac
3478
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3479
-  (eval "$ac_try") 2>&5
3480
-  ac_status=$?
3481
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3482
-  (exit $ac_status); }; }; then
3462
+  (exit $ac_status); } && {
3463
+	 test -z "$ac_c_werror_flag" ||
3464
+	 test ! -s conftest.err
3465
+       } && test -s conftest.$ac_objext; then
3483 3466
   ac_cv_prog_cc_g=yes
3484 3467
 else
3485 3468
   echo "$as_me: failed program was:" >&5
... ...
@@ -3514,27 +3497,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3514 3514
   rm -f conftest.er1
3515 3515
   cat conftest.err >&5
3516 3516
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
3517
-  (exit $ac_status); } &&
3518
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3519
-  { (case "(($ac_try" in
3520
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3521
-  *) ac_try_echo=$ac_try;;
3522
-esac
3523
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3524
-  (eval "$ac_try") 2>&5
3525
-  ac_status=$?
3526
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3527
-  (exit $ac_status); }; } &&
3528
-	 { ac_try='test -s conftest.$ac_objext'
3529
-  { (case "(($ac_try" in
3530
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3531
-  *) ac_try_echo=$ac_try;;
3532
-esac
3533
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3534
-  (eval "$ac_try") 2>&5
3535
-  ac_status=$?
3536
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3537
-  (exit $ac_status); }; }; then
3517
+  (exit $ac_status); } && {
3518
+	 test -z "$ac_c_werror_flag" ||
3519
+	 test ! -s conftest.err
3520
+       } && test -s conftest.$ac_objext; then
3538 3521
   :
3539 3522
 else
3540 3523
   echo "$as_me: failed program was:" >&5
... ...
@@ -3570,27 +3536,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3570 3570
   rm -f conftest.er1
3571 3571
   cat conftest.err >&5
3572 3572
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
3573
-  (exit $ac_status); } &&
3574
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3575
-  { (case "(($ac_try" in
3576
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3577
-  *) ac_try_echo=$ac_try;;
3578
-esac
3579
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3580
-  (eval "$ac_try") 2>&5
3581
-  ac_status=$?
3582
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3583
-  (exit $ac_status); }; } &&
3584
-	 { ac_try='test -s conftest.$ac_objext'
3585
-  { (case "(($ac_try" in
3586
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3587
-  *) ac_try_echo=$ac_try;;
3588
-esac
3589
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3590
-  (eval "$ac_try") 2>&5
3591
-  ac_status=$?
3592
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3593
-  (exit $ac_status); }; }; then
3573
+  (exit $ac_status); } && {
3574
+	 test -z "$ac_c_werror_flag" ||
3575
+	 test ! -s conftest.err
3576
+       } && test -s conftest.$ac_objext; then
3594 3577
   ac_cv_prog_cc_g=yes
3595 3578
 else
3596 3579
   echo "$as_me: failed program was:" >&5
... ...
@@ -3706,27 +3655,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3706 3706
   rm -f conftest.er1
3707 3707
   cat conftest.err >&5
3708 3708
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
3709
-  (exit $ac_status); } &&
3710
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
3711
-  { (case "(($ac_try" in
3712
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3713
-  *) ac_try_echo=$ac_try;;
3714
-esac
3715
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3716
-  (eval "$ac_try") 2>&5
3717
-  ac_status=$?
3718
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3719
-  (exit $ac_status); }; } &&
3720
-	 { ac_try='test -s conftest.$ac_objext'
3721
-  { (case "(($ac_try" in
3722
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3723
-  *) ac_try_echo=$ac_try;;
3724
-esac
3725
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3726
-  (eval "$ac_try") 2>&5
3727
-  ac_status=$?
3728
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
3729
-  (exit $ac_status); }; }; then
3709
+  (exit $ac_status); } && {
3710
+	 test -z "$ac_c_werror_flag" ||
3711
+	 test ! -s conftest.err
3712
+       } && test -s conftest.$ac_objext; then
3730 3713
   ac_cv_prog_cc_c89=$ac_arg
3731 3714
 else
3732 3715
   echo "$as_me: failed program was:" >&5
... ...
@@ -3973,7 +3905,7 @@ case $as_dir/ in
3973 3973
     # by default.
3974 3974
     for ac_prog in ginstall scoinst install; do
3975 3975
       for ac_exec_ext in '' $ac_executable_extensions; do
3976
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
3976
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
3977 3977
 	  if test $ac_prog = install &&
3978 3978
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
3979 3979
 	    # AIX install.  It has an incompatible calling convention.
... ...
@@ -4493,7 +4425,7 @@ do
4493 4493
   for ac_prog in grep ggrep; do
4494 4494
   for ac_exec_ext in '' $ac_executable_extensions; do
4495 4495
     ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
4496
-    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
4496
+    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
4497 4497
     # Check for GNU ac_path_GREP and select it if it is found.
4498 4498
   # Check for GNU $ac_path_GREP
4499 4499
 case `"$ac_path_GREP" --version 2>&1` in
... ...
@@ -4575,7 +4507,7 @@ do
4575 4575
   for ac_prog in egrep; do
4576 4576
   for ac_exec_ext in '' $ac_executable_extensions; do
4577 4577
     ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
4578
-    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
4578
+    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
4579 4579
     # Check for GNU ac_path_EGREP and select it if it is found.
4580 4580
   # Check for GNU $ac_path_EGREP
4581 4581
 case `"$ac_path_EGREP" --version 2>&1` in
... ...
@@ -4885,17 +4817,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4885 4885
   rm -f conftest.er1
4886 4886
   cat conftest.err >&5
4887 4887
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
4888
-  (exit $ac_status); } >/dev/null; then
4889
-  if test -s conftest.err; then
4890
-    ac_cpp_err=$ac_c_preproc_warn_flag
4891
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
4892
-  else
4893
-    ac_cpp_err=
4894
-  fi
4895
-else
4896
-  ac_cpp_err=yes
4897
-fi
4898
-if test -z "$ac_cpp_err"; then
4888
+  (exit $ac_status); } >/dev/null && {
4889
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
4890
+	 test ! -s conftest.err
4891
+       }; then
4899 4892
   :
4900 4893
 else
4901 4894
   echo "$as_me: failed program was:" >&5
... ...
@@ -4929,17 +4854,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4929 4929
   rm -f conftest.er1
4930 4930
   cat conftest.err >&5
4931 4931
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
4932
-  (exit $ac_status); } >/dev/null; then
4933
-  if test -s conftest.err; then
4934
-    ac_cpp_err=$ac_c_preproc_warn_flag
4935
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
4936
-  else
4937
-    ac_cpp_err=
4938
-  fi
4939
-else
4940
-  ac_cpp_err=yes
4941
-fi
4942
-if test -z "$ac_cpp_err"; then
4932
+  (exit $ac_status); } >/dev/null && {
4933
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
4934
+	 test ! -s conftest.err
4935
+       }; then
4943 4936
   # Broken: success on invalid input.
4944 4937
 continue
4945 4938
 else
... ...
@@ -5004,17 +4922,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5004 5004
   rm -f conftest.er1
5005 5005
   cat conftest.err >&5
5006 5006
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
5007
-  (exit $ac_status); } >/dev/null; then
5008
-  if test -s conftest.err; then
5009
-    ac_cpp_err=$ac_c_preproc_warn_flag
5010
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
5011
-  else
5012
-    ac_cpp_err=
5013
-  fi
5014
-else
5015
-  ac_cpp_err=yes
5016
-fi
5017
-if test -z "$ac_cpp_err"; then
5007
+  (exit $ac_status); } >/dev/null && {
5008
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
5009
+	 test ! -s conftest.err
5010
+       }; then
5018 5011
   :
5019 5012
 else
5020 5013
   echo "$as_me: failed program was:" >&5
... ...
@@ -5048,17 +4959,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5048 5048
   rm -f conftest.er1
5049 5049
   cat conftest.err >&5
5050 5050
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
5051
-  (exit $ac_status); } >/dev/null; then
5052
-  if test -s conftest.err; then
5053
-    ac_cpp_err=$ac_c_preproc_warn_flag
5054
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
5055
-  else
5056
-    ac_cpp_err=
5057
-  fi
5058
-else
5059
-  ac_cpp_err=yes
5060
-fi
5061
-if test -z "$ac_cpp_err"; then
5051
+  (exit $ac_status); } >/dev/null && {
5052
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
5053
+	 test ! -s conftest.err
5054
+       }; then
5062 5055
   # Broken: success on invalid input.
5063 5056
 continue
5064 5057
 else
... ...
@@ -5129,27 +5033,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5129 5129
   rm -f conftest.er1
5130 5130
   cat conftest.err >&5
5131 5131
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
5132
-  (exit $ac_status); } &&
5133
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5134
-  { (case "(($ac_try" in
5135
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5136
-  *) ac_try_echo=$ac_try;;
5137
-esac
5138
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5139
-  (eval "$ac_try") 2>&5
5140
-  ac_status=$?
5141
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5142
-  (exit $ac_status); }; } &&
5143
-	 { ac_try='test -s conftest.$ac_objext'
5144
-  { (case "(($ac_try" in
5145
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5146
-  *) ac_try_echo=$ac_try;;
5147
-esac
5148
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5149
-  (eval "$ac_try") 2>&5
5150
-  ac_status=$?
5151
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5152
-  (exit $ac_status); }; }; then
5132
+  (exit $ac_status); } && {
5133
+	 test -z "$ac_c_werror_flag" ||
5134
+	 test ! -s conftest.err
5135
+       } && test -s conftest.$ac_objext; then
5153 5136
   ac_cv_header_stdc=yes
5154 5137
 else
5155 5138
   echo "$as_me: failed program was:" >&5
... ...
@@ -5325,27 +5212,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5325 5325
   rm -f conftest.er1
5326 5326
   cat conftest.err >&5
5327 5327
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
5328
-  (exit $ac_status); } &&
5329
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5330
-  { (case "(($ac_try" in
5331
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5332
-  *) ac_try_echo=$ac_try;;
5333
-esac
5334
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5335
-  (eval "$ac_try") 2>&5
5336
-  ac_status=$?
5337
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5338
-  (exit $ac_status); }; } &&
5339
-	 { ac_try='test -s conftest.$ac_objext'
5340
-  { (case "(($ac_try" in
5341
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5342
-  *) ac_try_echo=$ac_try;;
5343
-esac
5344
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5345
-  (eval "$ac_try") 2>&5
5346
-  ac_status=$?
5347
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5348
-  (exit $ac_status); }; }; then
5328
+  (exit $ac_status); } && {
5329
+	 test -z "$ac_c_werror_flag" ||
5330
+	 test ! -s conftest.err
5331
+       } && test -s conftest.$ac_objext; then
5349 5332
   eval "$as_ac_Header=yes"
5350 5333
 else
5351 5334
   echo "$as_me: failed program was:" >&5
... ...
@@ -5408,27 +5278,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5408 5408
   rm -f conftest.er1
5409 5409
   cat conftest.err >&5
5410 5410
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
5411
-  (exit $ac_status); } &&
5412
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5413
-  { (case "(($ac_try" in
5414
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5415
-  *) ac_try_echo=$ac_try;;
5416
-esac
5417
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5418
-  (eval "$ac_try") 2>&5
5419
-  ac_status=$?
5420
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5421
-  (exit $ac_status); }; } &&
5422
-	 { ac_try='test -s conftest.$ac_objext'
5423
-  { (case "(($ac_try" in
5424
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5425
-  *) ac_try_echo=$ac_try;;
5426
-esac
5427
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5428
-  (eval "$ac_try") 2>&5
5429
-  ac_status=$?
5430
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5431
-  (exit $ac_status); }; }; then
5411
+  (exit $ac_status); } && {
5412
+	 test -z "$ac_c_werror_flag" ||
5413
+	 test ! -s conftest.err
5414
+       } && test -s conftest.$ac_objext; then
5432 5415
   ac_header_compiler=yes
5433 5416
 else
5434 5417
   echo "$as_me: failed program was:" >&5
... ...
@@ -5464,17 +5317,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5464 5464
   rm -f conftest.er1
5465 5465
   cat conftest.err >&5
5466 5466
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
5467
-  (exit $ac_status); } >/dev/null; then
5468
-  if test -s conftest.err; then
5469
-    ac_cpp_err=$ac_c_preproc_warn_flag
5470
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
5471
-  else
5472
-    ac_cpp_err=
5473
-  fi
5474
-else
5475
-  ac_cpp_err=yes
5476
-fi
5477
-if test -z "$ac_cpp_err"; then
5467
+  (exit $ac_status); } >/dev/null && {
5468
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
5469
+	 test ! -s conftest.err
5470
+       }; then
5478 5471
   ac_header_preproc=yes
5479 5472
 else
5480 5473
   echo "$as_me: failed program was:" >&5
... ...
@@ -5693,7 +5539,7 @@ do
5693 5693
   IFS=$as_save_IFS
5694 5694
   test -z "$as_dir" && as_dir=.
5695 5695
   for ac_exec_ext in '' $ac_executable_extensions; do
5696
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
5696
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5697 5697
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
5698 5698
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5699 5699
     break 2
... ...
@@ -5733,7 +5579,7 @@ do
5733 5733
   IFS=$as_save_IFS
5734 5734
   test -z "$as_dir" && as_dir=.
5735 5735
   for ac_exec_ext in '' $ac_executable_extensions; do
5736
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
5736
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5737 5737
     ac_cv_prog_ac_ct_RANLIB="ranlib"
5738 5738
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5739 5739
     break 2
... ...
@@ -5789,7 +5635,7 @@ do
5789 5789
   IFS=$as_save_IFS
5790 5790
   test -z "$as_dir" && as_dir=.
5791 5791
   for ac_exec_ext in '' $ac_executable_extensions; do
5792
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
5792
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5793 5793
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
5794 5794
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5795 5795
     break 2
... ...
@@ -5829,7 +5675,7 @@ do
5829 5829
   IFS=$as_save_IFS
5830 5830
   test -z "$as_dir" && as_dir=.
5831 5831
   for ac_exec_ext in '' $ac_executable_extensions; do
5832
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
5832
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5833 5833
     ac_cv_prog_ac_ct_STRIP="strip"
5834 5834
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5835 5835
     break 2
... ...
@@ -5884,7 +5730,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
5884 5884
 case $host in
5885 5885
 *-*-irix6*)
5886 5886
   # Find out which ABI we are using.
5887
-  echo '#line 5887 "configure"' > conftest.$ac_ext
5887
+  echo '#line 5733 "configure"' > conftest.$ac_ext
5888 5888
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5889 5889
   (eval $ac_compile) 2>&5
5890 5890
   ac_status=$?
... ...
@@ -5967,27 +5813,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5967 5967
   rm -f conftest.er1
5968 5968
   cat conftest.err >&5
5969 5969
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
5970
-  (exit $ac_status); } &&
5971
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
5972
-  { (case "(($ac_try" in
5973
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5974
-  *) ac_try_echo=$ac_try;;
5975
-esac
5976
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5977
-  (eval "$ac_try") 2>&5
5978
-  ac_status=$?
5979
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5980
-  (exit $ac_status); }; } &&
5981
-	 { ac_try='test -s conftest$ac_exeext'
5982
-  { (case "(($ac_try" in
5983
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5984
-  *) ac_try_echo=$ac_try;;
5985
-esac
5986
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5987
-  (eval "$ac_try") 2>&5
5988
-  ac_status=$?
5989
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
5990
-  (exit $ac_status); }; }; then
5970
+  (exit $ac_status); } && {
5971
+	 test -z "$ac_c_werror_flag" ||
5972
+	 test ! -s conftest.err
5973
+       } && test -s conftest$ac_exeext &&
5974
+       $as_test_x conftest$ac_exeext; then
5991 5975
   lt_cv_cc_needs_belf=yes
5992 5976
 else
5993 5977
   echo "$as_me: failed program was:" >&5
... ...
@@ -6329,27 +6159,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6329 6329
   rm -f conftest.er1
6330 6330
   cat conftest.err >&5
6331 6331
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
6332
-  (exit $ac_status); } &&
6333
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6334
-  { (case "(($ac_try" in
6335
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6336
-  *) ac_try_echo=$ac_try;;
6337
-esac
6338
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6339
-  (eval "$ac_try") 2>&5
6340
-  ac_status=$?
6341
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6342
-  (exit $ac_status); }; } &&
6343
-	 { ac_try='test -s conftest.$ac_objext'
6344
-  { (case "(($ac_try" in
6345
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6346
-  *) ac_try_echo=$ac_try;;
6347
-esac
6348
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6349
-  (eval "$ac_try") 2>&5
6350
-  ac_status=$?
6351
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6352
-  (exit $ac_status); }; }; then
6332
+  (exit $ac_status); } && {
6333
+	 test -z "$ac_c_werror_flag" ||
6334
+	 test ! -s conftest.err
6335
+       } && test -s conftest.$ac_objext; then
6353 6336
         case $host_os in
6354 6337
       hpux9* | hpux10* | hpux11*)
6355 6338
 	# On HP-UX, both CC and GCC only warn that PIC is supported... then
... ...
@@ -6443,27 +6256,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6443 6443
   rm -f conftest.er1
6444 6444
   cat conftest.err >&5
6445 6445
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
6446
-  (exit $ac_status); } &&
6447
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6448
-  { (case "(($ac_try" in
6449
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6450
-  *) ac_try_echo=$ac_try;;
6451
-esac
6452
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6453
-  (eval "$ac_try") 2>&5
6454
-  ac_status=$?
6455
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6456
-  (exit $ac_status); }; } &&
6457
-	 { ac_try='test -s conftest$ac_exeext'
6458
-  { (case "(($ac_try" in
6459
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6460
-  *) ac_try_echo=$ac_try;;
6461
-esac
6462
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6463
-  (eval "$ac_try") 2>&5
6464
-  ac_status=$?
6465
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6466
-  (exit $ac_status); }; }; then
6446
+  (exit $ac_status); } && {
6447
+	 test -z "$ac_c_werror_flag" ||
6448
+	 test ! -s conftest.err
6449
+       } && test -s conftest$ac_exeext &&
6450
+       $as_test_x conftest$ac_exeext; then
6467 6451
   lt_cv_prog_cc_static_works=yes
6468 6452
 else
6469 6453
   echo "$as_me: failed program was:" >&5
... ...
@@ -6517,7 +6314,7 @@ chmod -w .
6517 6517
 save_CFLAGS="$CFLAGS"
6518 6518
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
6519 6519
 compiler_c_o=no
6520
-if { (eval echo configure:6520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
6520
+if { (eval echo configure:6317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
6521 6521
   # The compiler can only warn and ignore the option if not recognized
6522 6522
   # So say no if there are warnings
6523 6523
   if test -s out/conftest.err; then
... ...
@@ -6585,27 +6382,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6585 6585
   rm -f conftest.er1
6586 6586
   cat conftest.err >&5
6587 6587
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
6588
-  (exit $ac_status); } &&
6589
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6590
-  { (case "(($ac_try" in
6591
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6592
-  *) ac_try_echo=$ac_try;;
6593
-esac
6594
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6595
-  (eval "$ac_try") 2>&5
6596
-  ac_status=$?
6597
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6598
-  (exit $ac_status); }; } &&
6599
-	 { ac_try='test -s conftest.$ac_objext'
6600
-  { (case "(($ac_try" in
6601
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6602
-  *) ac_try_echo=$ac_try;;
6603
-esac
6604
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6605
-  (eval "$ac_try") 2>&5
6606
-  ac_status=$?
6607
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6608
-  (exit $ac_status); }; }; then
6588
+  (exit $ac_status); } && {
6589
+	 test -z "$ac_c_werror_flag" ||
6590
+	 test ! -s conftest.err
6591
+       } && test -s conftest.$ac_objext; then
6609 6592
       # The compiler can only warn and ignore the option if not recognized
6610 6593
     # So say no if there are warnings
6611 6594
     if test -s conftest.err; then
... ...
@@ -6701,27 +6481,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6701 6701
   rm -f conftest.er1
6702 6702
   cat conftest.err >&5
6703 6703
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
6704
-  (exit $ac_status); } &&
6705
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
6706
-  { (case "(($ac_try" in
6707
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6708
-  *) ac_try_echo=$ac_try;;
6709
-esac
6710
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6711
-  (eval "$ac_try") 2>&5
6712
-  ac_status=$?
6713
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6714
-  (exit $ac_status); }; } &&
6715
-	 { ac_try='test -s conftest.$ac_objext'
6716
-  { (case "(($ac_try" in
6717
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6718
-  *) ac_try_echo=$ac_try;;
6719
-esac
6720
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6721
-  (eval "$ac_try") 2>&5
6722
-  ac_status=$?
6723
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6724
-  (exit $ac_status); }; }; then
6704
+  (exit $ac_status); } && {
6705
+	 test -z "$ac_c_werror_flag" ||
6706
+	 test ! -s conftest.err
6707
+       } && test -s conftest.$ac_objext; then
6725 6708
       # The compiler can only warn and ignore the option if not recognized
6726 6709
     # So say no if there are warnings
6727 6710
     if test -s conftest.err; then
... ...
@@ -8049,27 +7812,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8049 8049
   rm -f conftest.er1
8050 8050
   cat conftest.err >&5
8051 8051
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
8052
-  (exit $ac_status); } &&
8053
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8054
-  { (case "(($ac_try" in
8055
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8056
-  *) ac_try_echo=$ac_try;;
8057
-esac
8058
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8059
-  (eval "$ac_try") 2>&5
8060
-  ac_status=$?
8061
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8062
-  (exit $ac_status); }; } &&
8063
-	 { ac_try='test -s conftest$ac_exeext'
8064
-  { (case "(($ac_try" in
8065
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8066
-  *) ac_try_echo=$ac_try;;
8067
-esac
8068
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8069
-  (eval "$ac_try") 2>&5
8070
-  ac_status=$?
8071
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8072
-  (exit $ac_status); }; }; then
8052
+  (exit $ac_status); } && {
8053
+	 test -z "$ac_c_werror_flag" ||
8054
+	 test ! -s conftest.err
8055
+       } && test -s conftest$ac_exeext &&
8056
+       $as_test_x conftest$ac_exeext; then
8073 8057
   ac_cv_func_shl_load=yes
8074 8058
 else
8075 8059
   echo "$as_me: failed program was:" >&5
... ...
@@ -8128,27 +7875,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8128 8128
   rm -f conftest.er1
8129 8129
   cat conftest.err >&5
8130 8130
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
8131
-  (exit $ac_status); } &&
8132
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8133
-  { (case "(($ac_try" in
8134
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8135
-  *) ac_try_echo=$ac_try;;
8136
-esac
8137
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8138
-  (eval "$ac_try") 2>&5
8139
-  ac_status=$?
8140
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8141
-  (exit $ac_status); }; } &&
8142
-	 { ac_try='test -s conftest$ac_exeext'
8143
-  { (case "(($ac_try" in
8144
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8145
-  *) ac_try_echo=$ac_try;;
8146
-esac
8147
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8148
-  (eval "$ac_try") 2>&5
8149
-  ac_status=$?
8150
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8151
-  (exit $ac_status); }; }; then
8131
+  (exit $ac_status); } && {
8132
+	 test -z "$ac_c_werror_flag" ||
8133
+	 test ! -s conftest.err
8134
+       } && test -s conftest$ac_exeext &&
8135
+       $as_test_x conftest$ac_exeext; then
8152 8136
   ac_cv_lib_dld_shl_load=yes
8153 8137
 else
8154 8138
   echo "$as_me: failed program was:" >&5
... ...
@@ -8229,27 +7960,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8229 8229
   rm -f conftest.er1
8230 8230
   cat conftest.err >&5
8231 8231
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
8232
-  (exit $ac_status); } &&
8233
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8234
-  { (case "(($ac_try" in
8235
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8236
-  *) ac_try_echo=$ac_try;;
8237
-esac
8238
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8239
-  (eval "$ac_try") 2>&5
8240
-  ac_status=$?
8241
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8242
-  (exit $ac_status); }; } &&
8243
-	 { ac_try='test -s conftest$ac_exeext'
8244
-  { (case "(($ac_try" in
8245
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8246
-  *) ac_try_echo=$ac_try;;
8247
-esac
8248
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8249
-  (eval "$ac_try") 2>&5
8250
-  ac_status=$?
8251
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8252
-  (exit $ac_status); }; }; then
8232
+  (exit $ac_status); } && {
8233
+	 test -z "$ac_c_werror_flag" ||
8234
+	 test ! -s conftest.err
8235
+       } && test -s conftest$ac_exeext &&
8236
+       $as_test_x conftest$ac_exeext; then
8253 8237
   ac_cv_func_dlopen=yes
8254 8238
 else
8255 8239
   echo "$as_me: failed program was:" >&5
... ...
@@ -8308,27 +8023,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8308 8308
   rm -f conftest.er1
8309 8309
   cat conftest.err >&5
8310 8310
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
8311
-  (exit $ac_status); } &&
8312
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8313
-  { (case "(($ac_try" in
8314
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8315
-  *) ac_try_echo=$ac_try;;
8316
-esac
8317
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8318
-  (eval "$ac_try") 2>&5
8319
-  ac_status=$?
8320
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8321
-  (exit $ac_status); }; } &&
8322
-	 { ac_try='test -s conftest$ac_exeext'
8323
-  { (case "(($ac_try" in
8324
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8325
-  *) ac_try_echo=$ac_try;;
8326
-esac
8327
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8328
-  (eval "$ac_try") 2>&5
8329
-  ac_status=$?
8330
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8331
-  (exit $ac_status); }; }; then
8311
+  (exit $ac_status); } && {
8312
+	 test -z "$ac_c_werror_flag" ||
8313
+	 test ! -s conftest.err
8314
+       } && test -s conftest$ac_exeext &&
8315
+       $as_test_x conftest$ac_exeext; then
8332 8316
   ac_cv_lib_dl_dlopen=yes
8333 8317
 else
8334 8318
   echo "$as_me: failed program was:" >&5
... ...
@@ -8388,27 +8087,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8388 8388
   rm -f conftest.er1
8389 8389
   cat conftest.err >&5
8390 8390
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
8391
-  (exit $ac_status); } &&
8392
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8393
-  { (case "(($ac_try" in
8394
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8395
-  *) ac_try_echo=$ac_try;;
8396
-esac
8397
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8398
-  (eval "$ac_try") 2>&5
8399
-  ac_status=$?
8400
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8401
-  (exit $ac_status); }; } &&
8402
-	 { ac_try='test -s conftest$ac_exeext'
8403
-  { (case "(($ac_try" in
8404
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8405
-  *) ac_try_echo=$ac_try;;
8406
-esac
8407
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8408
-  (eval "$ac_try") 2>&5
8409
-  ac_status=$?
8410
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8411
-  (exit $ac_status); }; }; then
8391
+  (exit $ac_status); } && {
8392
+	 test -z "$ac_c_werror_flag" ||
8393
+	 test ! -s conftest.err
8394
+       } && test -s conftest$ac_exeext &&
8395
+       $as_test_x conftest$ac_exeext; then
8412 8396
   ac_cv_lib_svld_dlopen=yes
8413 8397
 else
8414 8398
   echo "$as_me: failed program was:" >&5
... ...
@@ -8468,27 +8151,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8468 8468
   rm -f conftest.er1
8469 8469
   cat conftest.err >&5
8470 8470
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
8471
-  (exit $ac_status); } &&
8472
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8473
-  { (case "(($ac_try" in
8474
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8475
-  *) ac_try_echo=$ac_try;;
8476
-esac
8477
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8478
-  (eval "$ac_try") 2>&5
8479
-  ac_status=$?
8480
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8481
-  (exit $ac_status); }; } &&
8482
-	 { ac_try='test -s conftest$ac_exeext'
8483
-  { (case "(($ac_try" in
8484
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8485
-  *) ac_try_echo=$ac_try;;
8486
-esac
8487
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8488
-  (eval "$ac_try") 2>&5
8489
-  ac_status=$?
8490
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8491
-  (exit $ac_status); }; }; then
8471
+  (exit $ac_status); } && {
8472
+	 test -z "$ac_c_werror_flag" ||
8473
+	 test ! -s conftest.err
8474
+       } && test -s conftest$ac_exeext &&
8475
+       $as_test_x conftest$ac_exeext; then
8492 8476
   ac_cv_lib_dld_dld_link=yes
8493 8477
 else
8494 8478
   echo "$as_me: failed program was:" >&5
... ...
@@ -8553,7 +8220,7 @@ else
8553 8553
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
8554 8554
   lt_status=$lt_dlunknown
8555 8555
   cat > conftest.$ac_ext <<EOF
8556
-#line 8556 "configure"
8556
+#line 8223 "configure"
8557 8557
 #include "confdefs.h"
8558 8558
 
8559 8559
 #if HAVE_DLFCN_H
... ...
@@ -8651,7 +8318,7 @@ else
8651 8651
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
8652 8652
   lt_status=$lt_dlunknown
8653 8653
   cat > conftest.$ac_ext <<EOF
8654
-#line 8654 "configure"
8654
+#line 8321 "configure"
8655 8655
 #include "confdefs.h"
8656 8656
 
8657 8657
 #if HAVE_DLFCN_H
... ...
@@ -9435,27 +9102,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9435 9435
   rm -f conftest.er1
9436 9436
   cat conftest.err >&5
9437 9437
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
9438
-  (exit $ac_status); } &&
9439
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9440
-  { (case "(($ac_try" in
9441
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9442
-  *) ac_try_echo=$ac_try;;
9443
-esac
9444
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9445
-  (eval "$ac_try") 2>&5
9446
-  ac_status=$?
9447
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
9448
-  (exit $ac_status); }; } &&
9449
-	 { ac_try='test -s conftest.$ac_objext'
9450
-  { (case "(($ac_try" in
9451
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9452
-  *) ac_try_echo=$ac_try;;
9453
-esac
9454
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9455
-  (eval "$ac_try") 2>&5
9456
-  ac_status=$?
9457
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
9458
-  (exit $ac_status); }; }; then
9438
+  (exit $ac_status); } && {
9439
+	 test -z "$ac_c_werror_flag" ||
9440
+	 test ! -s conftest.err
9441
+       } && test -s conftest.$ac_objext; then
9459 9442
   ac_cv_header_stdc=yes
9460 9443
 else
9461 9444
   echo "$as_me: failed program was:" >&5
... ...
@@ -9648,27 +9298,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9648 9648
   rm -f conftest.er1
9649 9649
   cat conftest.err >&5
9650 9650
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
9651
-  (exit $ac_status); } &&
9652
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9653
-  { (case "(($ac_try" in
9654
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9655
-  *) ac_try_echo=$ac_try;;
9656
-esac
9657
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9658
-  (eval "$ac_try") 2>&5
9659
-  ac_status=$?
9660
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
9661
-  (exit $ac_status); }; } &&
9662
-	 { ac_try='test -s conftest.$ac_objext'
9663
-  { (case "(($ac_try" in
9664
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9665
-  *) ac_try_echo=$ac_try;;
9666
-esac
9667
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9668
-  (eval "$ac_try") 2>&5
9669
-  ac_status=$?
9670
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
9671
-  (exit $ac_status); }; }; then
9651
+  (exit $ac_status); } && {
9652
+	 test -z "$ac_c_werror_flag" ||
9653
+	 test ! -s conftest.err
9654
+       } && test -s conftest.$ac_objext; then
9672 9655
   ac_header_compiler=yes
9673 9656
 else
9674 9657
   echo "$as_me: failed program was:" >&5
... ...
@@ -9704,17 +9337,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9704 9704
   rm -f conftest.er1
9705 9705
   cat conftest.err >&5
9706 9706
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
9707
-  (exit $ac_status); } >/dev/null; then
9708
-  if test -s conftest.err; then
9709
-    ac_cpp_err=$ac_c_preproc_warn_flag
9710
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
9711
-  else
9712
-    ac_cpp_err=
9713
-  fi
9714
-else
9715
-  ac_cpp_err=yes
9716
-fi
9717
-if test -z "$ac_cpp_err"; then
9707
+  (exit $ac_status); } >/dev/null && {
9708
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
9709
+	 test ! -s conftest.err
9710
+       }; then
9718 9711
   ac_header_preproc=yes
9719 9712
 else
9720 9713
   echo "$as_me: failed program was:" >&5
... ...
@@ -9807,27 +9433,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9807 9807
   rm -f conftest.er1
9808 9808
   cat conftest.err >&5
9809 9809
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
9810
-  (exit $ac_status); } &&
9811
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
9812
-  { (case "(($ac_try" in
9813
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9814
-  *) ac_try_echo=$ac_try;;
9815
-esac
9816
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
9817
-  (eval "$ac_try") 2>&5
9818
-  ac_status=$?
9819
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
9820
-  (exit $ac_status); }; } &&
9821
-	 { ac_try='test -s conftest.$ac_objext'
9822
-  { (case "(($ac_try" in
9823
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9824
-  *) ac_try_echo=$ac_try;;
9825