[Pkg-samba-maint] r1021 - trunk/patches

Steve Langasek vorlon at costa.debian.org
Mon Feb 6 08:09:32 UTC 2006


Author: vorlon
Date: 2006-02-06 08:09:31 +0000 (Mon, 06 Feb 2006)
New Revision: 1021

Modified:
   trunk/patches/adapt_machine_creation_script.patch
   trunk/patches/autoconf.patch
   trunk/patches/cups.patch
   trunk/patches/fhs.patch
   trunk/patches/non-linux-ports.patch
   trunk/patches/samba.patch
   trunk/patches/smbmount-nomtab.patch
   trunk/patches/smbstatus-locking.patch
Log:
freshen patches to apply cleanly to 3.0.21b with no warnings (file offsets only)

Modified: trunk/patches/adapt_machine_creation_script.patch
===================================================================
--- trunk/patches/adapt_machine_creation_script.patch	2006-02-05 05:06:38 UTC (rev 1020)
+++ trunk/patches/adapt_machine_creation_script.patch	2006-02-06 08:09:31 UTC (rev 1021)
@@ -3,11 +3,11 @@
 
 Status wrt upstream: Debian specific
 
-Index: samba-3.0.21a/docs/manpages/smb.conf.5
+Index: samba-3.0.21b/docs/manpages/smb.conf.5
 ===================================================================
---- samba-3.0.21a.orig/docs/manpages/smb.conf.5	2005-12-29 17:19:48.000000000 +0100
-+++ samba-3.0.21a/docs/manpages/smb.conf.5	2006-01-07 17:44:20.210534570 +0100
-@@ -450,7 +450,7 @@
+--- samba-3.0.21b.orig/docs/manpages/smb.conf.5	2006-02-05 23:58:28.000000000 -0800
++++ samba-3.0.21b/docs/manpages/smb.conf.5	2006-02-05 23:58:36.000000000 -0800
+@@ -454,7 +454,7 @@
  
  Default: \fB\fIadd machine script\fR = \fR 
  

Modified: trunk/patches/autoconf.patch
===================================================================
--- trunk/patches/autoconf.patch	2006-02-05 05:06:38 UTC (rev 1020)
+++ trunk/patches/autoconf.patch	2006-02-06 08:09:31 UTC (rev 1021)
@@ -1,7 +1,7 @@
-Index: samba-3.0.21a/source/configure
+Index: samba-3.0.21b/source/configure
 ===================================================================
---- samba-3.0.21a.orig/source/configure	2006-01-23 00:49:17.000000000 -0800
-+++ samba-3.0.21a/source/configure	2006-01-23 00:53:26.000000000 -0800
+--- samba-3.0.21b.orig/source/configure	2006-02-05 23:55:47.000000000 -0800
++++ samba-3.0.21b/source/configure	2006-02-05 23:57:57.000000000 -0800
 @@ -310,7 +310,7 @@
  # include <unistd.h>
  #endif"
@@ -562,7 +562,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9224,8 +9208,7 @@
+@@ -9225,8 +9209,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -572,7 +572,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9375,8 +9358,7 @@
+@@ -9376,8 +9359,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -582,7 +582,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9529,8 +9511,7 @@
+@@ -9530,8 +9512,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -592,7 +592,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9596,8 +9577,7 @@
+@@ -9597,8 +9578,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -602,7 +602,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9662,8 +9642,7 @@
+@@ -9663,8 +9643,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -612,7 +612,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9733,8 +9712,7 @@
+@@ -9734,8 +9713,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -622,7 +622,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9882,8 +9860,7 @@
+@@ -9883,8 +9861,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -632,7 +632,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9945,8 +9922,7 @@
+@@ -9946,8 +9923,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -642,7 +642,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9986,8 +9962,7 @@
+@@ -9987,8 +9963,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -652,7 +652,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10043,8 +10018,7 @@
+@@ -10044,8 +10019,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -662,7 +662,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10084,8 +10058,7 @@
+@@ -10085,8 +10059,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -672,7 +672,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10149,8 +10122,7 @@
+@@ -10150,8 +10123,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -682,7 +682,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10181,10 +10153,8 @@
+@@ -10182,10 +10154,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -695,7 +695,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -10296,8 +10266,7 @@
+@@ -10297,8 +10267,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -705,7 +705,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10359,8 +10328,7 @@
+@@ -10360,8 +10329,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -715,7 +715,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10400,8 +10368,7 @@
+@@ -10401,8 +10369,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -725,7 +725,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10457,8 +10424,7 @@
+@@ -10458,8 +10425,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -735,7 +735,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10498,8 +10464,7 @@
+@@ -10499,8 +10465,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -745,7 +745,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10563,8 +10528,7 @@
+@@ -10564,8 +10529,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -755,7 +755,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10595,10 +10559,8 @@
+@@ -10596,10 +10560,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -768,7 +768,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -10710,8 +10672,7 @@
+@@ -10711,8 +10673,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -778,7 +778,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10773,8 +10734,7 @@
+@@ -10774,8 +10735,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -788,7 +788,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10814,8 +10774,7 @@
+@@ -10815,8 +10775,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -798,7 +798,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10871,8 +10830,7 @@
+@@ -10872,8 +10831,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -808,7 +808,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10912,8 +10870,7 @@
+@@ -10913,8 +10871,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -818,7 +818,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10977,8 +10934,7 @@
+@@ -10978,8 +10935,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -828,7 +828,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11009,10 +10965,8 @@
+@@ -11010,10 +10966,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -841,7 +841,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -11168,8 +11122,7 @@
+@@ -11169,8 +11123,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -851,7 +851,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11229,8 +11182,7 @@
+@@ -11230,8 +11183,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -861,7 +861,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11306,8 +11258,7 @@
+@@ -11307,8 +11259,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -871,7 +871,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11349,8 +11300,7 @@
+@@ -11350,8 +11301,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -881,7 +881,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11407,8 +11357,7 @@
+@@ -11408,8 +11358,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -891,7 +891,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11533,8 +11482,7 @@
+@@ -11534,8 +11483,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -901,7 +901,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11604,8 +11552,7 @@
+@@ -11605,8 +11553,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -911,7 +911,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11704,8 +11651,7 @@
+@@ -11705,8 +11652,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -921,7 +921,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11770,8 +11716,7 @@
+@@ -11771,8 +11717,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -931,7 +931,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11836,8 +11781,7 @@
+@@ -11837,8 +11782,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -941,7 +941,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11902,8 +11846,7 @@
+@@ -11903,8 +11847,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -951,7 +951,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11968,8 +11911,7 @@
+@@ -11969,8 +11912,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -961,7 +961,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12012,8 +11954,7 @@
+@@ -12013,8 +11955,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -971,7 +971,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12084,8 +12025,7 @@
+@@ -12085,8 +12026,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -981,7 +981,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12148,8 +12088,7 @@
+@@ -12149,8 +12089,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -991,7 +991,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12214,8 +12153,7 @@
+@@ -12215,8 +12154,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1001,7 +1001,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12280,8 +12218,7 @@
+@@ -12281,8 +12219,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1011,7 +1011,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12346,8 +12283,7 @@
+@@ -12347,8 +12284,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1021,7 +1021,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12412,8 +12348,7 @@
+@@ -12413,8 +12349,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1031,7 +1031,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12573,8 +12508,7 @@
+@@ -12574,8 +12509,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1041,7 +1041,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12628,8 +12562,7 @@
+@@ -12629,8 +12563,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1051,7 +1051,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12706,8 +12639,7 @@
+@@ -12707,8 +12640,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1061,7 +1061,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12778,8 +12710,7 @@
+@@ -12779,8 +12711,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1071,7 +1071,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12851,8 +12782,7 @@
+@@ -12852,8 +12783,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1081,7 +1081,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12920,8 +12850,7 @@
+@@ -12921,8 +12851,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1091,7 +1091,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12988,8 +12917,7 @@
+@@ -12989,8 +12918,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1101,7 +1101,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13069,8 +12997,7 @@
+@@ -13070,8 +12998,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1111,7 +1111,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13133,8 +13060,7 @@
+@@ -13134,8 +13061,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1121,7 +1121,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13196,8 +13122,7 @@
+@@ -13197,8 +13123,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1131,7 +1131,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13259,8 +13184,7 @@
+@@ -13260,8 +13185,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1141,7 +1141,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13322,8 +13246,7 @@
+@@ -13323,8 +13247,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1151,7 +1151,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13385,8 +13308,7 @@
+@@ -13386,8 +13309,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1161,7 +1161,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13448,8 +13370,7 @@
+@@ -13449,8 +13371,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1171,7 +1171,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13511,8 +13432,7 @@
+@@ -13512,8 +13433,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1181,7 +1181,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13785,8 +13705,7 @@
+@@ -13786,8 +13706,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1191,7 +1191,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13935,8 +13854,7 @@
+@@ -13936,8 +13855,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1201,7 +1201,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14087,8 +14005,7 @@
+@@ -14088,8 +14006,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1211,7 +1211,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14239,8 +14156,7 @@
+@@ -14240,8 +14157,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1221,7 +1221,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14308,8 +14224,7 @@
+@@ -14309,8 +14225,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1231,7 +1231,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14404,8 +14319,7 @@
+@@ -14405,8 +14320,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1241,7 +1241,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14554,8 +14468,7 @@
+@@ -14555,8 +14469,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1251,7 +1251,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14706,8 +14619,7 @@
+@@ -14707,8 +14620,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1261,7 +1261,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14858,8 +14770,7 @@
+@@ -14859,8 +14771,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1271,7 +1271,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14927,8 +14838,7 @@
+@@ -14928,8 +14839,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1281,7 +1281,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15025,8 +14935,7 @@
+@@ -15026,8 +14936,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1291,7 +1291,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15135,8 +15044,7 @@
+@@ -15136,8 +15045,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1301,7 +1301,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15210,8 +15118,7 @@
+@@ -15211,8 +15119,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1311,7 +1311,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15287,8 +15194,7 @@
+@@ -15288,8 +15195,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1321,7 +1321,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15364,8 +15270,7 @@
+@@ -15365,8 +15271,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1331,7 +1331,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15441,8 +15346,7 @@
+@@ -15442,8 +15347,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1341,7 +1341,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15529,8 +15433,7 @@
+@@ -15530,8 +15434,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1351,7 +1351,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15584,8 +15487,7 @@
+@@ -15585,8 +15488,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1361,7 +1361,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15686,8 +15588,7 @@
+@@ -15687,8 +15589,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1371,7 +1371,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15790,8 +15691,7 @@
+@@ -15791,8 +15692,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1381,7 +1381,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15914,8 +15814,7 @@
+@@ -15915,8 +15815,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1391,7 +1391,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16025,8 +15924,7 @@
+@@ -16026,8 +15925,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1401,7 +1401,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16137,8 +16035,7 @@
+@@ -16138,8 +16036,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1411,7 +1411,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16247,8 +16144,7 @@
+@@ -16248,8 +16145,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1421,7 +1421,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16356,8 +16252,7 @@
+@@ -16357,8 +16253,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1431,7 +1431,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16468,8 +16363,7 @@
+@@ -16469,8 +16364,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1441,7 +1441,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16576,8 +16470,7 @@
+@@ -16577,8 +16471,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1451,7 +1451,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16684,8 +16577,7 @@
+@@ -16685,8 +16578,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1461,7 +1461,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16791,8 +16683,7 @@
+@@ -16792,8 +16684,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1471,7 +1471,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16903,8 +16794,7 @@
+@@ -16904,8 +16795,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1481,7 +1481,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -17007,8 +16897,7 @@
+@@ -17008,8 +16898,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1491,7 +1491,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -17110,8 +16999,7 @@
+@@ -17111,8 +17000,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1501,7 +1501,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -17212,8 +17100,7 @@
+@@ -17213,8 +17101,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1511,7 +1511,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -17318,8 +17205,7 @@
+@@ -17319,8 +17206,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1521,7 +1521,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -17385,8 +17271,7 @@
+@@ -17386,8 +17272,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1531,7 +1531,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -17540,8 +17425,7 @@
+@@ -17541,8 +17426,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1541,7 +1541,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -17646,8 +17530,7 @@
+@@ -17647,8 +17531,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1551,7 +1551,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -17755,8 +17638,7 @@
+@@ -17756,8 +17639,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1561,7 +1561,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -17863,8 +17745,7 @@
+@@ -17864,8 +17746,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1571,7 +1571,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -17966,8 +17847,7 @@
+@@ -17967,8 +17848,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1581,7 +1581,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18070,8 +17950,7 @@
+@@ -18071,8 +17951,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1591,7 +1591,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18177,8 +18056,7 @@
+@@ -18178,8 +18057,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1601,7 +1601,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18286,8 +18164,7 @@
+@@ -18287,8 +18165,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1611,7 +1611,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18393,8 +18270,7 @@
+@@ -18394,8 +18271,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1621,7 +1621,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18501,8 +18377,7 @@
+@@ -18502,8 +18378,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1631,7 +1631,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18607,8 +18482,7 @@
+@@ -18608,8 +18483,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1641,7 +1641,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18714,8 +18588,7 @@
+@@ -18715,8 +18589,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1651,7 +1651,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18822,8 +18695,7 @@
+@@ -18823,8 +18696,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1661,7 +1661,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18929,8 +18801,7 @@
+@@ -18930,8 +18802,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1671,7 +1671,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19036,8 +18907,7 @@
+@@ -19037,8 +18908,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1681,7 +1681,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19141,8 +19011,7 @@
+@@ -19142,8 +19012,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1691,7 +1691,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19243,8 +19112,7 @@
+@@ -19244,8 +19113,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1701,7 +1701,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19305,8 +19173,7 @@
+@@ -19306,8 +19174,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1711,7 +1711,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19334,7 +19201,7 @@
+@@ -19335,7 +19202,7 @@
  #
  #
  case "$host_os" in
@@ -1720,7 +1720,7 @@
         # glibc <= 2.3.2 has a broken getgrouplist
         if test "$cross_compiling" = yes; then
    { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-@@ -19467,8 +19334,7 @@
+@@ -19468,8 +19335,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1730,7 +1730,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19539,8 +19405,7 @@
+@@ -19540,8 +19406,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1740,7 +1740,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19603,8 +19468,7 @@
+@@ -19604,8 +19469,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1750,7 +1750,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19666,8 +19530,7 @@
+@@ -19667,8 +19531,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1760,7 +1760,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19763,8 +19626,7 @@
+@@ -19764,8 +19627,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1770,7 +1770,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19853,8 +19715,7 @@
+@@ -19854,8 +19716,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1780,7 +1780,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19965,8 +19826,7 @@
+@@ -19966,8 +19827,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1790,7 +1790,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20066,8 +19926,7 @@
+@@ -20067,8 +19927,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1800,7 +1800,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20138,8 +19997,7 @@
+@@ -20139,8 +19998,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1810,7 +1810,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20242,8 +20100,7 @@
+@@ -20243,8 +20101,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1820,7 +1820,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20352,8 +20209,7 @@
+@@ -20353,8 +20210,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1830,7 +1830,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20453,8 +20309,7 @@
+@@ -20454,8 +20310,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1840,7 +1840,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20525,8 +20380,7 @@
+@@ -20526,8 +20381,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1850,7 +1850,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20629,8 +20483,7 @@
+@@ -20630,8 +20484,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1860,7 +1860,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20740,8 +20593,7 @@
+@@ -20741,8 +20594,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1870,7 +1870,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20841,8 +20693,7 @@
+@@ -20842,8 +20694,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1880,7 +1880,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20913,8 +20764,7 @@
+@@ -20914,8 +20765,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1890,7 +1890,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21017,8 +20867,7 @@
+@@ -21018,8 +20868,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1900,7 +1900,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21127,8 +20976,7 @@
+@@ -21128,8 +20977,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1910,7 +1910,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21228,8 +21076,7 @@
+@@ -21229,8 +21077,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1920,7 +1920,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21300,8 +21147,7 @@
+@@ -21301,8 +21148,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1930,7 +1930,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21404,8 +21250,7 @@
+@@ -21405,8 +21251,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1940,7 +1940,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21516,8 +21361,7 @@
+@@ -21517,8 +21362,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1950,7 +1950,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21617,8 +21461,7 @@
+@@ -21618,8 +21462,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1960,7 +1960,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21689,8 +21532,7 @@
+@@ -21690,8 +21533,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1970,7 +1970,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21793,8 +21635,7 @@
+@@ -21794,8 +21636,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1980,7 +1980,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21904,8 +21745,7 @@
+@@ -21905,8 +21746,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1990,7 +1990,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22005,8 +21845,7 @@
+@@ -22006,8 +21846,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2000,7 +2000,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22077,8 +21916,7 @@
+@@ -22078,8 +21917,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2010,7 +2010,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22181,8 +22019,7 @@
+@@ -22182,8 +22020,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2020,7 +2020,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22291,8 +22128,7 @@
+@@ -22292,8 +22129,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2030,7 +2030,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22392,8 +22228,7 @@
+@@ -22393,8 +22229,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2040,7 +2040,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22464,8 +22299,7 @@
+@@ -22465,8 +22300,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2050,7 +2050,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22568,8 +22402,7 @@
+@@ -22569,8 +22403,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2060,7 +2060,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22679,8 +22512,7 @@
+@@ -22680,8 +22513,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2070,7 +2070,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22780,8 +22612,7 @@
+@@ -22781,8 +22613,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2080,7 +2080,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22852,8 +22683,7 @@
+@@ -22853,8 +22684,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2090,7 +2090,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22956,8 +22786,7 @@
+@@ -22957,8 +22787,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2100,7 +2100,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23066,8 +22895,7 @@
+@@ -23067,8 +22896,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2110,7 +2110,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23167,8 +22995,7 @@
+@@ -23168,8 +22996,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2120,7 +2120,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23239,8 +23066,7 @@
+@@ -23240,8 +23067,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2130,7 +2130,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23343,8 +23169,7 @@
+@@ -23344,8 +23170,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2140,7 +2140,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23454,8 +23279,7 @@
+@@ -23455,8 +23280,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2150,7 +2150,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23555,8 +23379,7 @@
+@@ -23556,8 +23380,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2160,7 +2160,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23627,8 +23450,7 @@
+@@ -23628,8 +23451,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2170,7 +2170,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23731,8 +23553,7 @@
+@@ -23732,8 +23554,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2180,7 +2180,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23841,8 +23662,7 @@
+@@ -23842,8 +23663,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2190,7 +2190,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23942,8 +23762,7 @@
+@@ -23943,8 +23763,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2200,7 +2200,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24014,8 +23833,7 @@
+@@ -24015,8 +23834,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2210,7 +2210,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24118,8 +23936,7 @@
+@@ -24119,8 +23937,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2220,7 +2220,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24199,8 +24016,7 @@
+@@ -24202,8 +24019,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2230,7 +2230,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24254,8 +24070,7 @@
+@@ -24257,8 +24073,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2240,7 +2240,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24360,8 +24175,7 @@
+@@ -24362,8 +24177,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2250,7 +2250,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24465,8 +24279,7 @@
+@@ -24467,8 +24281,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2270,7 +2270,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24674,8 +24486,7 @@
+@@ -24642,8 +24454,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2280,7 +2280,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24779,8 +24590,7 @@
+@@ -24697,8 +24508,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2290,7 +2290,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24893,8 +24703,7 @@
+@@ -24803,8 +24613,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2300,7 +2300,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24997,8 +24806,7 @@
+@@ -24908,8 +24717,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2310,7 +2310,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25101,8 +24909,7 @@
+@@ -25012,8 +24820,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2320,7 +2320,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25205,8 +25012,7 @@
+@@ -25117,8 +24924,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2330,7 +2330,57 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25263,11 +25069,14 @@
+@@ -25222,8 +25028,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -25339,8 +25144,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -25443,8 +25247,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -25547,8 +25350,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -25651,8 +25453,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -25709,11 +25510,14 @@
  
    # and these are for particular systems
    case "$host_os" in
@@ -2347,7 +2397,7 @@
  			BLDSHARED="true"
  			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
  				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -25761,8 +25570,7 @@
+@@ -26207,8 +26011,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2357,7 +2407,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26101,8 +25909,7 @@
+@@ -26607,8 +26410,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2367,7 +2417,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26168,8 +25975,7 @@
+@@ -26674,8 +26476,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2377,7 +2427,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26448,8 +26254,7 @@
+@@ -26954,8 +26755,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2387,7 +2437,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26512,8 +26317,7 @@
+@@ -27018,8 +26818,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2397,7 +2447,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26574,8 +26378,7 @@
+@@ -27080,8 +26879,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2407,7 +2457,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26690,8 +26493,7 @@
+@@ -27196,8 +26994,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2417,7 +2467,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26753,8 +26555,7 @@
+@@ -27259,8 +27056,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2427,7 +2477,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26945,8 +26746,7 @@
+@@ -27451,8 +27247,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2437,7 +2487,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27054,8 +26854,7 @@
+@@ -27560,8 +27355,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2447,7 +2497,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27119,8 +26918,7 @@
+@@ -27625,8 +27419,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2457,7 +2507,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27182,8 +26980,7 @@
+@@ -27688,8 +27481,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2467,7 +2517,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27245,8 +27042,7 @@
+@@ -27751,8 +27543,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2477,7 +2527,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27308,8 +27104,7 @@
+@@ -27814,8 +27605,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2487,7 +2537,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27371,8 +27166,7 @@
+@@ -27877,8 +27667,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2497,7 +2547,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27434,8 +27228,7 @@
+@@ -27940,8 +27729,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2507,7 +2557,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27497,8 +27290,7 @@
+@@ -28003,8 +27791,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2517,7 +2567,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27560,8 +27352,7 @@
+@@ -28066,8 +27853,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2527,7 +2577,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27623,8 +27414,7 @@
+@@ -28129,8 +27915,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2537,7 +2587,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27686,8 +27476,7 @@
+@@ -28192,8 +27977,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2547,7 +2597,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27750,8 +27539,7 @@
+@@ -28256,8 +28040,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2557,7 +2607,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27814,8 +27602,7 @@
+@@ -28320,8 +28103,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2567,7 +2617,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27919,8 +27706,7 @@
+@@ -28425,8 +28207,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2577,7 +2627,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27972,8 +27758,7 @@
+@@ -28478,8 +28259,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2587,7 +2637,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28026,8 +27811,7 @@
+@@ -28532,8 +28312,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2597,7 +2647,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28084,8 +27868,7 @@
+@@ -28590,8 +28369,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2607,7 +2657,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28657,8 +28440,7 @@
+@@ -29163,8 +28941,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2617,7 +2667,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28788,8 +28570,7 @@
+@@ -29294,8 +29071,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2627,7 +2677,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28853,8 +28634,7 @@
+@@ -29359,8 +29135,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2637,7 +2687,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28918,8 +28698,7 @@
+@@ -29424,8 +29199,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2647,7 +2697,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28983,8 +28762,7 @@
+@@ -29489,8 +29263,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2657,7 +2707,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29053,8 +28831,7 @@
+@@ -29559,8 +29332,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2667,7 +2717,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29315,8 +29092,7 @@
+@@ -29821,8 +29593,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2677,7 +2727,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30282,8 +30058,7 @@
+@@ -30788,8 +30559,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2687,7 +2737,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30346,8 +30121,7 @@
+@@ -30852,8 +30622,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2697,7 +2747,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30417,8 +30191,7 @@
+@@ -30923,8 +30692,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2707,7 +2757,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30486,8 +30259,7 @@
+@@ -30992,8 +30760,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2717,7 +2767,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30736,8 +30508,7 @@
+@@ -31242,8 +31009,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2727,7 +2777,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31007,8 +30778,7 @@
+@@ -31513,8 +31279,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2737,7 +2787,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31189,8 +30959,7 @@
+@@ -31695,8 +31460,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2747,7 +2797,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31290,8 +31059,7 @@
+@@ -31796,8 +31560,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2757,7 +2807,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31417,8 +31185,7 @@
+@@ -31923,8 +31686,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2767,7 +2817,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31484,8 +31251,7 @@
+@@ -31990,8 +31752,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2777,7 +2827,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31656,8 +31422,7 @@
+@@ -32162,8 +31923,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2787,7 +2837,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31771,8 +31536,7 @@
+@@ -32277,8 +32037,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2797,7 +2847,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31886,8 +31650,7 @@
+@@ -32392,8 +32151,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2807,7 +2857,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32124,8 +31887,7 @@
+@@ -32630,8 +32388,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2817,7 +2867,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32309,8 +32071,7 @@
+@@ -32815,8 +32572,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2827,7 +2877,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32473,8 +32234,7 @@
+@@ -32979,8 +32735,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2837,7 +2887,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32571,8 +32331,7 @@
+@@ -33077,8 +32832,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2847,7 +2897,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32671,8 +32430,7 @@
+@@ -33177,8 +32931,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2857,7 +2907,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32769,8 +32527,7 @@
+@@ -33275,8 +33028,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2867,7 +2917,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32867,8 +32624,7 @@
+@@ -33373,8 +33125,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2877,7 +2927,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32967,8 +32723,7 @@
+@@ -33473,8 +33224,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2887,7 +2937,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33073,8 +32828,7 @@
+@@ -33579,8 +33329,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2897,7 +2947,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33171,8 +32925,7 @@
+@@ -33677,8 +33426,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2907,7 +2957,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33272,8 +33025,7 @@
+@@ -33778,8 +33526,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2917,7 +2967,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33400,8 +33152,7 @@
+@@ -33906,8 +33653,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2927,7 +2977,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33503,8 +33254,7 @@
+@@ -34009,8 +33755,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2937,7 +2987,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33606,8 +33356,7 @@
+@@ -34112,8 +33857,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2947,7 +2997,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33709,8 +33458,7 @@
+@@ -34215,8 +33959,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2957,7 +3007,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33812,8 +33560,7 @@
+@@ -34318,8 +34061,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2967,7 +3017,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33915,8 +33662,7 @@
+@@ -34421,8 +34163,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2977,7 +3027,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34018,8 +33764,7 @@
+@@ -34524,8 +34265,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2987,7 +3037,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34121,8 +33866,7 @@
+@@ -34627,8 +34367,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2997,7 +3047,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34224,8 +33968,7 @@
+@@ -34730,8 +34469,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3007,7 +3057,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34327,8 +34070,7 @@
+@@ -34833,8 +34571,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3017,7 +3067,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34430,8 +34172,7 @@
+@@ -34936,8 +34673,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3027,7 +3077,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34533,8 +34274,7 @@
+@@ -35039,8 +34775,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3037,7 +3087,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34636,8 +34376,7 @@
+@@ -35142,8 +34877,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3047,7 +3097,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34739,8 +34478,7 @@
+@@ -35245,8 +34979,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3057,7 +3107,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34842,8 +34580,7 @@
+@@ -35348,8 +35081,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3067,7 +3117,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34945,8 +34682,7 @@
+@@ -35451,8 +35183,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3077,7 +3127,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35048,8 +34784,7 @@
+@@ -35554,8 +35285,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3087,7 +3137,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35151,8 +34886,7 @@
+@@ -35657,8 +35387,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3097,7 +3147,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35254,8 +34988,7 @@
+@@ -35760,8 +35489,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3107,7 +3157,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35357,8 +35090,7 @@
+@@ -35863,8 +35591,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3117,7 +3167,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35460,8 +35192,7 @@
+@@ -35966,8 +35693,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3127,7 +3177,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35563,8 +35294,7 @@
+@@ -36069,8 +35795,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3137,7 +3187,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35666,8 +35396,7 @@
+@@ -36172,8 +35897,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3147,7 +3197,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35769,8 +35498,7 @@
+@@ -36275,8 +35999,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3157,7 +3207,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35872,8 +35600,7 @@
+@@ -36378,8 +36101,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3167,7 +3217,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35975,8 +35702,7 @@
+@@ -36481,8 +36203,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3177,7 +3227,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36078,8 +35804,7 @@
+@@ -36584,8 +36305,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3187,7 +3237,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36181,8 +35906,7 @@
+@@ -36687,8 +36407,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3197,7 +3247,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36284,8 +36008,7 @@
+@@ -36790,8 +36509,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3207,7 +3257,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36387,8 +36110,7 @@
+@@ -36893,8 +36611,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3217,7 +3267,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36490,8 +36212,7 @@
+@@ -36996,8 +36713,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3227,7 +3277,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36593,8 +36314,7 @@
+@@ -37099,8 +36815,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3237,7 +3287,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36660,8 +36380,7 @@
+@@ -37166,8 +36881,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3247,7 +3297,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36721,8 +36440,7 @@
+@@ -37227,8 +36941,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3257,7 +3307,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36784,8 +36502,7 @@
+@@ -37290,8 +37003,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3267,7 +3317,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36847,8 +36564,7 @@
+@@ -37353,8 +37065,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3277,7 +3327,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36910,8 +36626,7 @@
+@@ -37416,8 +37127,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3287,7 +3337,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36973,8 +36688,7 @@
+@@ -37479,8 +37189,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3297,7 +3347,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37036,8 +36750,7 @@
+@@ -37542,8 +37251,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3307,7 +3357,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37099,8 +36812,7 @@
+@@ -37605,8 +37313,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3317,7 +3367,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37161,8 +36873,7 @@
+@@ -37667,8 +37374,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3327,7 +3377,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37224,8 +36935,7 @@
+@@ -37730,8 +37436,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3337,7 +3387,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37287,8 +36997,7 @@
+@@ -37793,8 +37498,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3347,7 +3397,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37350,8 +37059,7 @@
+@@ -37856,8 +37560,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3357,7 +3407,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37413,8 +37121,7 @@
+@@ -37919,8 +37622,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3367,7 +3417,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37467,8 +37174,7 @@
+@@ -37973,8 +37675,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3377,7 +3427,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37532,8 +37238,7 @@
+@@ -38038,8 +37739,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3387,7 +3437,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37595,8 +37300,7 @@
+@@ -38101,8 +37801,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3397,7 +3447,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37658,8 +37362,7 @@
+@@ -38164,8 +37863,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3407,7 +3457,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37721,8 +37424,7 @@
+@@ -38227,8 +37925,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3417,7 +3467,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37784,8 +37486,7 @@
+@@ -38290,8 +37987,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3427,7 +3477,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37848,8 +37549,7 @@
+@@ -38354,8 +38050,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3437,7 +3487,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37911,8 +37611,7 @@
+@@ -38417,8 +38112,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3447,7 +3497,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38069,8 +37768,7 @@
+@@ -38575,8 +38269,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3457,7 +3507,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38383,8 +38081,7 @@
+@@ -38889,8 +38582,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3467,7 +3517,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38786,8 +38483,7 @@
+@@ -39292,8 +38984,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3477,7 +3527,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38905,8 +38601,7 @@
+@@ -39411,8 +39102,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3487,7 +3537,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38960,8 +38655,7 @@
+@@ -39466,8 +39156,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3497,7 +3547,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39368,8 +39062,7 @@
+@@ -39874,8 +39563,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3507,7 +3557,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39526,8 +39219,7 @@
+@@ -40032,8 +39720,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3517,7 +3567,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39678,8 +39370,7 @@
+@@ -40184,8 +39871,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3527,7 +3577,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39836,8 +39527,7 @@
+@@ -40342,8 +40028,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3537,7 +3587,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39903,8 +39593,7 @@
+@@ -40409,8 +40094,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3547,7 +3597,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40210,8 +39899,7 @@
+@@ -40716,8 +40400,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3557,7 +3607,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40399,8 +40087,7 @@
+@@ -40905,8 +40588,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3567,7 +3617,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40469,8 +40156,7 @@
+@@ -40975,8 +40657,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3577,7 +3627,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40656,8 +40342,7 @@
+@@ -41162,8 +40843,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3587,7 +3637,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40745,8 +40430,7 @@
+@@ -41251,8 +40931,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3597,7 +3647,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40835,8 +40519,7 @@
+@@ -41341,8 +41020,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3607,7 +3657,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40909,8 +40592,7 @@
+@@ -41415,8 +41093,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3617,7 +3667,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41279,8 +40961,7 @@
+@@ -41785,8 +41462,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3627,7 +3677,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41682,8 +41363,7 @@
+@@ -42188,8 +41864,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3637,7 +3687,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41883,8 +41563,7 @@
+@@ -42389,8 +42064,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3647,7 +3697,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41951,8 +41630,7 @@
+@@ -42457,8 +42131,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3657,7 +3707,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42014,8 +41692,7 @@
+@@ -42520,8 +42193,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3667,7 +3717,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42081,8 +41758,7 @@
+@@ -42587,8 +42259,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3677,7 +3727,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42155,8 +41831,7 @@
+@@ -42661,8 +42332,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3687,7 +3737,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42218,8 +41893,7 @@
+@@ -42724,8 +42394,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3697,7 +3747,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42285,8 +41959,7 @@
+@@ -42791,8 +42460,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3707,7 +3757,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42397,8 +42070,7 @@
+@@ -42903,8 +42571,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3717,7 +3767,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42460,8 +42132,7 @@
+@@ -42971,8 +42638,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3727,7 +3777,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42519,8 +42190,7 @@
+@@ -43034,8 +42700,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3737,7 +3787,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42582,8 +42252,7 @@
+@@ -43093,8 +42758,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3747,7 +3797,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42626,8 +42295,7 @@
+@@ -43156,8 +42820,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3757,7 +3807,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42670,8 +42338,7 @@
+@@ -43200,8 +42863,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3767,7 +3817,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42714,8 +42381,7 @@
+@@ -43244,8 +42906,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3777,7 +3827,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42758,8 +42424,7 @@
+@@ -43288,8 +42949,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3787,7 +3837,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42802,8 +42467,7 @@
+@@ -43332,8 +42992,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3797,7 +3847,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42846,8 +42510,7 @@
+@@ -43376,8 +43035,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3807,7 +3857,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42892,8 +42555,7 @@
+@@ -43420,8 +43078,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3817,7 +3867,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42936,8 +42598,7 @@
+@@ -43466,8 +43123,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3827,7 +3877,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42980,8 +42641,7 @@
+@@ -43510,8 +43166,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3837,7 +3887,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43024,8 +42684,7 @@
+@@ -43554,8 +43209,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3847,7 +3897,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43068,8 +42727,7 @@
+@@ -43598,8 +43252,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3857,7 +3907,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43112,8 +42770,7 @@
+@@ -43642,8 +43295,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3867,7 +3917,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43156,8 +42813,7 @@
+@@ -43686,8 +43338,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3877,7 +3927,17 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43226,7 +42882,7 @@
+@@ -43730,8 +43381,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -43800,7 +43450,7 @@
  echo "${ECHO_T}yes" >&6;
  
  	case "$host_os" in
@@ -3886,7 +3946,7 @@
  		echo "$as_me:$LINENO: checking for linux sendfile64 support" >&5
  echo $ECHO_N "checking for linux sendfile64 support... $ECHO_C" >&6
  if test "${samba_cv_HAVE_SENDFILE64+set}" = set; then
-@@ -43262,8 +42918,7 @@
+@@ -43836,8 +43486,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3896,7 +3956,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43323,8 +42978,7 @@
+@@ -43897,8 +43546,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3906,7 +3966,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43389,8 +43043,7 @@
+@@ -43963,8 +43611,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3916,7 +3976,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43511,8 +43164,7 @@
+@@ -44085,8 +43732,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3926,7 +3986,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43603,8 +43255,7 @@
+@@ -44177,8 +43823,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3936,7 +3996,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43692,8 +43343,7 @@
+@@ -44266,8 +43911,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3946,7 +4006,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43779,8 +43429,7 @@
+@@ -44353,8 +43997,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3956,7 +4016,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43864,8 +43513,7 @@
+@@ -44438,8 +44081,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3966,7 +4026,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43961,8 +43609,7 @@
+@@ -44535,8 +44177,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3976,7 +4036,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44056,8 +43703,7 @@
+@@ -44630,8 +44271,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3986,7 +4046,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44137,10 +43783,10 @@
+@@ -44711,10 +44351,10 @@
  WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS
  
  case "$host_os" in
@@ -3999,7 +4059,7 @@
  		# FreeBSD winbind client is implemented as a wrapper around
  		# the Linux version.
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
-@@ -44269,8 +43915,7 @@
+@@ -44843,8 +44483,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4009,7 +4069,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44314,8 +43959,7 @@
+@@ -44888,8 +44527,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4019,7 +4079,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44384,8 +44028,7 @@
+@@ -44958,8 +44596,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4029,7 +4089,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44429,8 +44072,7 @@
+@@ -45003,8 +44640,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4039,7 +4099,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44496,8 +44138,7 @@
+@@ -45070,8 +44706,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4049,7 +4109,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44541,8 +44182,7 @@
+@@ -45115,8 +44750,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4059,7 +4119,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44610,8 +44250,7 @@
+@@ -45184,8 +44818,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4069,7 +4129,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44655,8 +44294,7 @@
+@@ -45229,8 +44862,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4079,7 +4139,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44722,8 +44360,7 @@
+@@ -45296,8 +44928,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4089,7 +4149,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44767,8 +44404,7 @@
+@@ -45341,8 +44972,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4099,7 +4159,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44860,8 +44496,7 @@
+@@ -45434,8 +45064,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4109,7 +4169,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47565,6 +47200,9 @@
+@@ -48139,6 +47768,9 @@
  s, at logfilebase@,$logfilebase,;t t
  s, at privatedir@,$privatedir,;t t
  s, at swatdir@,$swatdir,;t t
@@ -4119,7 +4179,7 @@
  s, at LDSHFLAGS@,$LDSHFLAGS,;t t
  s, at SONAMEFLAG@,$SONAMEFLAG,;t t
  s, at SHLD@,$SHLD,;t t
-@@ -47838,11 +47476,6 @@
+@@ -48412,11 +48044,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -4131,7 +4191,7 @@
    # Let's still pretend it is `configure' which instantiates (i.e., don't
    # use $as_me), people would be surprised to read:
    #    /* config.h.  Generated by config.status.  */
-@@ -47881,6 +47514,12 @@
+@@ -48455,6 +48082,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -4144,10 +4204,10 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
-Index: samba-3.0.21a/source/include/config.h.in
+Index: samba-3.0.21b/source/include/config.h.in
 ===================================================================
---- samba-3.0.21a.orig/source/include/config.h.in	2006-01-23 00:53:02.000000000 -0800
-+++ samba-3.0.21a/source/include/config.h.in	2006-01-23 00:54:38.000000000 -0800
+--- samba-3.0.21b.orig/source/include/config.h.in	2006-02-05 23:55:47.000000000 -0800
++++ samba-3.0.21b/source/include/config.h.in	2006-02-05 23:56:47.000000000 -0800
 @@ -48,6 +48,9 @@
  /* Define to turn on dmalloc debugging */
  #undef ENABLE_DMALLOC

Modified: trunk/patches/cups.patch
===================================================================
--- trunk/patches/cups.patch	2006-02-05 05:06:38 UTC (rev 1020)
+++ trunk/patches/cups.patch	2006-02-06 08:09:31 UTC (rev 1021)
@@ -1,8 +1,8 @@
-Index: samba-3.0.21a.new/source/include/includes.h
+Index: samba-3.0.21b/source/include/includes.h
 ===================================================================
---- samba-3.0.21a.new.orig/source/include/includes.h	2006-01-02 09:35:13.800068024 +0100
-+++ samba-3.0.21a.new/source/include/includes.h	2006-01-02 09:35:22.030398495 +0100
-@@ -1049,10 +1049,7 @@
+--- samba-3.0.21b.orig/source/include/includes.h	2006-02-06 00:01:10.000000000 -0800
++++ samba-3.0.21b/source/include/includes.h	2006-02-06 00:01:15.000000000 -0800
+@@ -1066,10 +1066,7 @@
  #endif
  
  #ifndef DEFAULT_PRINTING

Modified: trunk/patches/fhs.patch
===================================================================
--- trunk/patches/fhs.patch	2006-02-05 05:06:38 UTC (rev 1020)
+++ trunk/patches/fhs.patch	2006-02-06 08:09:31 UTC (rev 1021)
@@ -1,7 +1,7 @@
-Index: samba-3.0.21a/source/Makefile.in
+Index: samba-3.0.21b/source/Makefile.in
 ===================================================================
---- samba-3.0.21a.orig/source/Makefile.in	2005-12-14 04:45:49.000000000 -0800
-+++ samba-3.0.21a/source/Makefile.in	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/Makefile.in	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/Makefile.in	2006-02-06 00:01:23.000000000 -0800
 @@ -91,6 +91,13 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
@@ -34,10 +34,10 @@
  
  installmsg: installdirs
  	@$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR)$(LIBDIR) $(srcdir)
-Index: samba-3.0.21a/source/configure.in
+Index: samba-3.0.21b/source/configure.in
 ===================================================================
---- samba-3.0.21a.orig/source/configure.in	2005-12-14 04:45:51.000000000 -0800
-+++ samba-3.0.21a/source/configure.in	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/configure.in	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/configure.in	2006-02-06 00:01:23.000000000 -0800
 @@ -35,7 +35,7 @@
  [  --with-fhs              Use FHS-compliant paths (default=no)],
  [ case "$withval" in
@@ -68,10 +68,10 @@
  
  dnl Unique-to-Samba variables we'll be playing with.
  AC_SUBST(SHELL)
-Index: samba-3.0.21a/source/dynconfig.c
+Index: samba-3.0.21b/source/dynconfig.c
 ===================================================================
---- samba-3.0.21a.orig/source/dynconfig.c	2005-02-25 09:59:43.000000000 -0800
-+++ samba-3.0.21a/source/dynconfig.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/dynconfig.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/dynconfig.c	2006-02-06 00:01:23.000000000 -0800
 @@ -53,6 +53,13 @@
  pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
  
@@ -114,10 +114,10 @@
 +	return lp_lockdir();
 +#endif
 +}
-Index: samba-3.0.21a/source/groupdb/mapping.c
+Index: samba-3.0.21b/source/groupdb/mapping.c
 ===================================================================
---- samba-3.0.21a.orig/source/groupdb/mapping.c	2005-11-09 10:28:57.000000000 -0800
-+++ samba-3.0.21a/source/groupdb/mapping.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/groupdb/mapping.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/groupdb/mapping.c	2006-02-06 00:01:23.000000000 -0800
 @@ -129,7 +129,7 @@
  	
  	if (tdb)
@@ -127,10 +127,10 @@
  	if (!tdb) {
  		DEBUG(0,("Failed to open group mapping database\n"));
  		return False;
-Index: samba-3.0.21a/source/include/dynconfig.h
+Index: samba-3.0.21b/source/include/dynconfig.h
 ===================================================================
---- samba-3.0.21a.orig/source/include/dynconfig.h	2005-02-25 09:59:39.000000000 -0800
-+++ samba-3.0.21a/source/include/dynconfig.h	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/include/dynconfig.h	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/include/dynconfig.h	2006-02-06 00:01:23.000000000 -0800
 @@ -31,8 +31,12 @@
  extern pstring dyn_CONFIGFILE;
  extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -144,10 +144,10 @@
 +
 +char *dyn_STATEDIR(void);
 +char *dyn_CACHEDIR(void);
-Index: samba-3.0.21a/source/intl/lang_tdb.c
+Index: samba-3.0.21b/source/intl/lang_tdb.c
 ===================================================================
---- samba-3.0.21a.orig/source/intl/lang_tdb.c	2005-07-28 06:19:45.000000000 -0700
-+++ samba-3.0.21a/source/intl/lang_tdb.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/intl/lang_tdb.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/intl/lang_tdb.c	2006-02-06 00:01:23.000000000 -0800
 @@ -128,7 +128,7 @@
  	if (!lang) 
  		return True;
@@ -157,10 +157,10 @@
  	if (stat(msg_path, &st) != 0) {
  		/* the msg file isn't available */
  		DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path, 
-Index: samba-3.0.21a/source/lib/util.c
+Index: samba-3.0.21b/source/lib/util.c
 ===================================================================
---- samba-3.0.21a.orig/source/lib/util.c	2005-12-20 07:28:38.000000000 -0800
-+++ samba-3.0.21a/source/lib/util.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/lib/util.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/lib/util.c	2006-02-06 00:01:23.000000000 -0800
 @@ -2410,6 +2410,61 @@
  }
  
@@ -223,10 +223,10 @@
   * @brief Returns the platform specific shared library extension.
   *
   * @retval Pointer to a static #fstring containing the extension.
-Index: samba-3.0.21a/source/lib/util_unistr.c
+Index: samba-3.0.21b/source/lib/util_unistr.c
 ===================================================================
---- samba-3.0.21a.orig/source/lib/util_unistr.c	2005-12-02 11:21:45.000000000 -0800
-+++ samba-3.0.21a/source/lib/util_unistr.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/lib/util_unistr.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/lib/util_unistr.c	2006-02-06 00:01:23.000000000 -0800
 @@ -58,8 +58,8 @@
  	}
  	initialised = 1;
@@ -247,10 +247,10 @@
  	if (valid_file) {
  		valid_table = valid_file;
  		mapped_file = 1;
-Index: samba-3.0.21a/source/libsmb/samlogon_cache.c
+Index: samba-3.0.21b/source/libsmb/samlogon_cache.c
 ===================================================================
---- samba-3.0.21a.orig/source/libsmb/samlogon_cache.c	2005-11-11 14:10:32.000000000 -0800
-+++ samba-3.0.21a/source/libsmb/samlogon_cache.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/libsmb/samlogon_cache.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/libsmb/samlogon_cache.c	2006-02-06 00:01:23.000000000 -0800
 @@ -34,7 +34,7 @@
  BOOL netsamlogon_cache_init(void)
  {
@@ -269,10 +269,10 @@
  				   TDB_DEFAULT, O_RDWR, 0600);
  		if (!tdb) {
  			DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
-Index: samba-3.0.21a/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.0.21b/source/nmbd/nmbd_serverlistdb.c
 ===================================================================
---- samba-3.0.21a.orig/source/nmbd/nmbd_serverlistdb.c	2005-02-25 09:59:37.000000000 -0800
-+++ samba-3.0.21a/source/nmbd/nmbd_serverlistdb.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/nmbd/nmbd_serverlistdb.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/nmbd/nmbd_serverlistdb.c	2006-02-06 00:01:23.000000000 -0800
 @@ -327,7 +327,7 @@
  
  	updatecount++;
@@ -282,11 +282,11 @@
  	trim_char(fname,'\0' ,'/');
  	pstrcat(fname,"/");
  	pstrcat(fname,SERVER_LIST);
-Index: samba-3.0.21a/source/nmbd/nmbd_winsserver.c
+Index: samba-3.0.21b/source/nmbd/nmbd_winsserver.c
 ===================================================================
---- samba-3.0.21a.orig/source/nmbd/nmbd_winsserver.c	2005-11-09 10:29:00.000000000 -0800
-+++ samba-3.0.21a/source/nmbd/nmbd_winsserver.c	2006-01-20 02:58:22.000000000 -0800
-@@ -234,7 +234,7 @@
+--- samba-3.0.21b.orig/source/nmbd/nmbd_winsserver.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/nmbd/nmbd_winsserver.c	2006-02-06 00:01:23.000000000 -0800
+@@ -244,7 +244,7 @@
  
  	add_samba_names_to_subnet(wins_server_subnet);
  
@@ -295,7 +295,7 @@
  		DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
  			WINS_LIST, strerror(errno) ));
  		return True;
-@@ -1810,7 +1810,7 @@
+@@ -1838,7 +1838,7 @@
  		}
  	}
  
@@ -304,10 +304,10 @@
  	all_string_sub(fname,"//", "/", 0);
  	slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
  
-Index: samba-3.0.21a/source/passdb/login_cache.c
+Index: samba-3.0.21b/source/passdb/login_cache.c
 ===================================================================
---- samba-3.0.21a.orig/source/passdb/login_cache.c	2005-02-25 09:59:36.000000000 -0800
-+++ samba-3.0.21a/source/passdb/login_cache.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/passdb/login_cache.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/passdb/login_cache.c	2006-02-06 00:01:23.000000000 -0800
 @@ -36,7 +36,7 @@
  	/* skip file open if it's already opened */
  	if (cache) return True;
@@ -317,10 +317,10 @@
  	if (cache_fname)
  		DEBUG(5, ("Opening cache file at %s\n", cache_fname));
  	else {
-Index: samba-3.0.21a/source/nsswitch/winbindd_cache.c
+Index: samba-3.0.21b/source/nsswitch/winbindd_cache.c
 ===================================================================
---- samba-3.0.21a.orig/source/nsswitch/winbindd_cache.c	2005-12-14 04:45:50.000000000 -0800
-+++ samba-3.0.21a/source/nsswitch/winbindd_cache.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/nsswitch/winbindd_cache.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/nsswitch/winbindd_cache.c	2006-02-06 00:01:23.000000000 -0800
 @@ -58,7 +58,7 @@
  	if (opt_nocache)
  		return;
@@ -330,7 +330,7 @@
  				   TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0600);
  
  	if (!wcache->tdb) {
-@@ -1467,7 +1467,7 @@
+@@ -1472,7 +1472,7 @@
  	if (wcache->tdb != NULL)
  		return True;
  
@@ -339,11 +339,11 @@
  				   TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0600);
  
  	if (wcache->tdb == NULL) {
-Index: samba-3.0.21a/source/nsswitch/winbindd_util.c
+Index: samba-3.0.21b/source/nsswitch/winbindd_util.c
 ===================================================================
---- samba-3.0.21a.orig/source/nsswitch/winbindd_util.c	2005-12-14 04:45:50.000000000 -0800
-+++ samba-3.0.21a/source/nsswitch/winbindd_util.c	2006-01-20 02:58:22.000000000 -0800
-@@ -1173,7 +1173,7 @@
+--- samba-3.0.21b.orig/source/nsswitch/winbindd_util.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/nsswitch/winbindd_util.c	2006-02-06 00:01:23.000000000 -0800
+@@ -1172,7 +1172,7 @@
  	SMB_STRUCT_STAT stbuf;
  	TDB_CONTEXT *idmap_tdb;
  
@@ -352,10 +352,10 @@
  
  	if (!file_exist(idmap_name, &stbuf)) {
  		/* nothing to convert return */
-Index: samba-3.0.21a/source/param/loadparm.c
+Index: samba-3.0.21b/source/param/loadparm.c
 ===================================================================
---- samba-3.0.21a.orig/source/param/loadparm.c	2005-12-02 11:21:45.000000000 -0800
-+++ samba-3.0.21a/source/param/loadparm.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/param/loadparm.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/param/loadparm.c	2006-02-06 00:01:23.000000000 -0800
 @@ -105,6 +105,9 @@
  	char *szAddPrinterCommand;
  	char *szDeletePrinterCommand;
@@ -380,11 +380,11 @@
  	{"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED}, 
  #ifdef WITH_UTMP
  	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED}, 
-Index: samba-3.0.21a/source/passdb/pdb_tdb.c
+Index: samba-3.0.21b/source/passdb/pdb_tdb.c
 ===================================================================
---- samba-3.0.21a.orig/source/passdb/pdb_tdb.c	2005-11-09 10:28:59.000000000 -0800
-+++ samba-3.0.21a/source/passdb/pdb_tdb.c	2006-01-20 02:58:22.000000000 -0800
-@@ -917,10 +917,7 @@
+--- samba-3.0.21b.orig/source/passdb/pdb_tdb.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/passdb/pdb_tdb.c	2006-02-06 00:01:23.000000000 -0800
+@@ -918,10 +918,7 @@
  	if (location) {
  		tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location);
  	} else {
@@ -396,10 +396,10 @@
  		tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, tdbfile);
  	}
  
-Index: samba-3.0.21a/source/passdb/secrets.c
+Index: samba-3.0.21b/source/passdb/secrets.c
 ===================================================================
---- samba-3.0.21a.orig/source/passdb/secrets.c	2005-10-17 19:45:02.000000000 -0700
-+++ samba-3.0.21a/source/passdb/secrets.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/passdb/secrets.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/passdb/secrets.c	2006-02-06 00:01:23.000000000 -0800
 @@ -58,8 +58,7 @@
  	if (tdb)
  		return True;
@@ -410,10 +410,10 @@
  
  	tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
  
-Index: samba-3.0.21a/source/printing/nt_printing.c
+Index: samba-3.0.21b/source/printing/nt_printing.c
 ===================================================================
---- samba-3.0.21a.orig/source/printing/nt_printing.c	2005-11-09 10:28:56.000000000 -0800
-+++ samba-3.0.21a/source/printing/nt_printing.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/printing/nt_printing.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/printing/nt_printing.c	2006-02-06 00:01:23.000000000 -0800
 @@ -530,28 +530,28 @@
   
  	if (tdb_drivers)
@@ -458,10 +458,10 @@
  		pstrcat(printdb_path, sharename);
  		pstrcat(printdb_path, ".tdb");
  
-Index: samba-3.0.21a/source/printing/printing.c
+Index: samba-3.0.21b/source/printing/printing.c
 ===================================================================
---- samba-3.0.21a.orig/source/printing/printing.c	2005-10-17 19:44:57.000000000 -0700
-+++ samba-3.0.21a/source/printing/printing.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/printing/printing.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/printing/printing.c	2006-02-06 00:01:23.000000000 -0800
 @@ -183,8 +183,8 @@
  	int services = lp_numservices();
  	int snum;
@@ -473,10 +473,10 @@
  	mkdir(printing_path,0755);
  
  	/* handle a Samba upgrade */
-Index: samba-3.0.21a/source/printing/printing_db.c
+Index: samba-3.0.21b/source/printing/printing_db.c
 ===================================================================
---- samba-3.0.21a.orig/source/printing/printing_db.c	2005-10-17 19:44:57.000000000 -0700
-+++ samba-3.0.21a/source/printing/printing_db.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/printing/printing_db.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/printing/printing_db.c	2006-02-06 00:01:23.000000000 -0800
 @@ -89,7 +89,7 @@
  		DLIST_ADD(print_db_head, p);
  	}
@@ -486,11 +486,11 @@
  	pstrcat(printdb_path, printername);
  	pstrcat(printdb_path, ".tdb");
  
-Index: samba-3.0.21a/source/rpc_server/srv_srvsvc_nt.c
+Index: samba-3.0.21b/source/rpc_server/srv_srvsvc_nt.c
 ===================================================================
---- samba-3.0.21a.orig/source/rpc_server/srv_srvsvc_nt.c	2005-12-14 04:45:50.000000000 -0800
-+++ samba-3.0.21a/source/rpc_server/srv_srvsvc_nt.c	2006-01-20 02:58:22.000000000 -0800
-@@ -156,10 +156,10 @@
+--- samba-3.0.21b.orig/source/rpc_server/srv_srvsvc_nt.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/rpc_server/srv_srvsvc_nt.c	2006-02-06 00:01:23.000000000 -0800
+@@ -158,10 +158,10 @@
   
  	if (share_tdb && local_pid == sys_getpid())
  		return True;
@@ -503,10 +503,10 @@
  		return False;
  	}
   
-Index: samba-3.0.21a/source/sam/idmap_tdb.c
+Index: samba-3.0.21b/source/sam/idmap_tdb.c
 ===================================================================
---- samba-3.0.21a.orig/source/sam/idmap_tdb.c	2005-02-25 09:59:38.000000000 -0800
-+++ samba-3.0.21a/source/sam/idmap_tdb.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/sam/idmap_tdb.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/sam/idmap_tdb.c	2006-02-06 00:01:23.000000000 -0800
 @@ -487,7 +487,7 @@
  	BOOL tdb_is_new = False;
  
@@ -516,10 +516,10 @@
  	if (!tdbfile) {
  		DEBUG(0, ("idmap_init: out of memory!\n"));
  		return NT_STATUS_NO_MEMORY;
-Index: samba-3.0.21a/source/smbd/lanman.c
+Index: samba-3.0.21b/source/smbd/lanman.c
 ===================================================================
---- samba-3.0.21a.orig/source/smbd/lanman.c	2005-11-09 10:28:55.000000000 -0800
-+++ samba-3.0.21a/source/smbd/lanman.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/smbd/lanman.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/smbd/lanman.c	2006-02-06 00:01:23.000000000 -0800
 @@ -1040,9 +1040,9 @@
    BOOL local_list_only;
    int i;
@@ -532,10 +532,10 @@
      return(0);
    }
  
-Index: samba-3.0.21a/source/utils/net_idmap.c
+Index: samba-3.0.21b/source/utils/net_idmap.c
 ===================================================================
---- samba-3.0.21a.orig/source/utils/net_idmap.c	2005-11-09 10:29:02.000000000 -0800
-+++ samba-3.0.21a/source/utils/net_idmap.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/utils/net_idmap.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/utils/net_idmap.c	2006-02-06 00:01:23.000000000 -0800
 @@ -136,7 +136,7 @@
  		return NT_STATUS_UNSUCCESSFUL;
  	}
@@ -545,10 +545,10 @@
  	if (!tdbfile) {
  		DEBUG(0, ("idmap_init: out of memory!\n"));
  		return NT_STATUS_NO_MEMORY;
-Index: samba-3.0.21a/source/wrepld/process.c
+Index: samba-3.0.21b/source/wrepld/process.c
 ===================================================================
---- samba-3.0.21a.orig/source/wrepld/process.c	2005-07-28 06:19:43.000000000 -0700
-+++ samba-3.0.21a/source/wrepld/process.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/wrepld/process.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/wrepld/process.c	2006-02-06 00:01:23.000000000 -0800
 @@ -197,7 +197,7 @@
  {
  	TDB_CONTEXT *tdb;
@@ -567,10 +567,10 @@
  	if (!tdb) {
  		DEBUG(2,("send_entry_request: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) ));
  		return;
-Index: samba-3.0.21a/source/registry/reg_db.c
+Index: samba-3.0.21b/source/registry/reg_db.c
 ===================================================================
---- samba-3.0.21a.orig/source/registry/reg_db.c	2005-10-17 19:45:06.000000000 -0700
-+++ samba-3.0.21a/source/registry/reg_db.c	2006-01-20 02:58:22.000000000 -0800
+--- samba-3.0.21b.orig/source/registry/reg_db.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/registry/reg_db.c	2006-02-06 00:01:23.000000000 -0800
 @@ -205,12 +205,12 @@
  	if ( tdb_reg )
  		return True;
@@ -601,10 +601,10 @@
  	}
  
  	unbecome_root();
-Index: samba-3.0.21a/source/lib/account_pol.c
+Index: samba-3.0.21b/source/lib/account_pol.c
 ===================================================================
---- samba-3.0.21a.orig/source/lib/account_pol.c	2005-12-20 07:28:38.000000000 -0800
-+++ samba-3.0.21a/source/lib/account_pol.c	2006-01-20 02:59:34.000000000 -0800
+--- samba-3.0.21b.orig/source/lib/account_pol.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/lib/account_pol.c	2006-02-06 00:01:23.000000000 -0800
 @@ -262,7 +262,7 @@
  		return True;
  	}
@@ -614,10 +614,10 @@
  	if (!tdb) {
  		DEBUG(0,("Failed to open account policy database\n"));
  		return False;
-Index: samba-3.0.21a/source/registry/reg_perfcount.c
+Index: samba-3.0.21b/source/registry/reg_perfcount.c
 ===================================================================
---- samba-3.0.21a.orig/source/registry/reg_perfcount.c	2005-11-09 10:29:03.000000000 -0800
-+++ samba-3.0.21a/source/registry/reg_perfcount.c	2006-01-20 02:58:46.000000000 -0800
+--- samba-3.0.21b.orig/source/registry/reg_perfcount.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/registry/reg_perfcount.c	2006-02-06 00:01:23.000000000 -0800
 @@ -44,7 +44,7 @@
  	
  	fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
@@ -636,10 +636,10 @@
  
  	/* no registry keys; just create the perfmon directory */
  	
-Index: samba-3.0.21a/source/rpc_server/srv_eventlog_lib.c
+Index: samba-3.0.21b/source/rpc_server/srv_eventlog_lib.c
 ===================================================================
---- samba-3.0.21a.orig/source/rpc_server/srv_eventlog_lib.c	2005-12-02 11:21:47.000000000 -0800
-+++ samba-3.0.21a/source/rpc_server/srv_eventlog_lib.c	2006-01-20 02:59:15.000000000 -0800
+--- samba-3.0.21b.orig/source/rpc_server/srv_eventlog_lib.c	2006-02-06 00:01:09.000000000 -0800
++++ samba-3.0.21b/source/rpc_server/srv_eventlog_lib.c	2006-02-06 00:01:23.000000000 -0800
 @@ -67,7 +67,7 @@
  {
  	fstring path;

Modified: trunk/patches/non-linux-ports.patch
===================================================================
--- trunk/patches/non-linux-ports.patch	2006-02-05 05:06:38 UTC (rev 1020)
+++ trunk/patches/non-linux-ports.patch	2006-02-06 08:09:31 UTC (rev 1021)
@@ -1,7 +1,7 @@
-Index: samba-3.0.21a.new/source/configure.in
+Index: samba-3.0.21b/source/configure.in
 ===================================================================
---- samba-3.0.21a.new.orig/source/configure.in	2006-01-02 09:43:36.355337696 +0100
-+++ samba-3.0.21a.new/source/configure.in	2006-01-02 09:53:12.969563953 +0100
+--- samba-3.0.21b.orig/source/configure.in	2006-02-06 00:00:28.000000000 -0800
++++ samba-3.0.21b/source/configure.in	2006-02-06 00:00:29.000000000 -0800
 @@ -638,6 +638,15 @@
        fi
      ;;
@@ -27,7 +27,7 @@
         # glibc <= 2.3.2 has a broken getgrouplist
         AC_TRY_RUN([
  #include <unistd.h>
-@@ -1392,7 +1401,10 @@
+@@ -1403,7 +1412,10 @@
  
    # and these are for particular systems
    case "$host_os" in
@@ -39,7 +39,7 @@
  			BLDSHARED="true"
  			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
  				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined" 
-@@ -4622,7 +4634,7 @@
+@@ -4651,7 +4663,7 @@
  	AC_MSG_RESULT(yes);
  
  	case "$host_os" in
@@ -48,7 +48,7 @@
  		AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
  		AC_TRY_LINK([#include <sys/sendfile.h>],
  [\
-@@ -4885,10 +4897,10 @@
+@@ -4914,10 +4926,10 @@
  WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS
  
  case "$host_os" in

Modified: trunk/patches/samba.patch
===================================================================
--- trunk/patches/samba.patch	2006-02-05 05:06:38 UTC (rev 1020)
+++ trunk/patches/samba.patch	2006-02-06 08:09:31 UTC (rev 1021)
@@ -1,8 +1,8 @@
-Index: samba-3.0.21a.new/source/client/smbmount.c
+Index: samba-3.0.21b/source/client/smbmount.c
 ===================================================================
---- samba-3.0.21a.new.orig/source/client/smbmount.c	2005-07-28 15:19:53.000000000 +0200
-+++ samba-3.0.21a.new/source/client/smbmount.c	2006-01-02 09:58:20.141474654 +0100
-@@ -764,7 +764,7 @@
+--- samba-3.0.21b.orig/source/client/smbmount.c	2006-02-05 23:59:59.000000000 -0800
++++ samba-3.0.21b/source/client/smbmount.c	2006-02-06 00:00:14.000000000 -0800
+@@ -767,7 +767,7 @@
  					*lp = 0;
  					pstrcpy(password,lp+1);
  					got_pass = True;
@@ -11,7 +11,7 @@
  				}
  				if ((lp=strchr_m(username,'/'))) {
  					*lp = 0;
-@@ -774,7 +774,7 @@
+@@ -777,7 +777,7 @@
  				  !strcmp(opts, "password")) {
  				pstrcpy(password,opteq+1);
  				got_pass = True;
@@ -20,7 +20,7 @@
  			} else if(!strcmp(opts, "credentials")) {
  				pstrcpy(credentials,opteq+1);
  			} else if(!strcmp(opts, "netbiosname")) {
-@@ -888,7 +888,7 @@
+@@ -891,7 +891,7 @@
  			*p = 0;
  			pstrcpy(password,p+1);
  			got_pass = True;
@@ -29,10 +29,10 @@
  		}
  		strupper_m(username);
  	}
-Index: samba-3.0.21a.new/source/web/diagnose.c
+Index: samba-3.0.21b/source/web/diagnose.c
 ===================================================================
---- samba-3.0.21a.new.orig/source/web/diagnose.c	2005-12-20 16:28:39.000000000 +0100
-+++ samba-3.0.21a.new/source/web/diagnose.c	2006-01-02 09:53:33.820339053 +0100
+--- samba-3.0.21b.orig/source/web/diagnose.c	2006-02-05 23:59:59.000000000 -0800
++++ samba-3.0.21b/source/web/diagnose.c	2006-02-06 00:00:05.000000000 -0800
 @@ -62,6 +62,7 @@
  {
  	static struct cli_state cli;
@@ -41,10 +41,10 @@
  	if (!cli_initialise(&cli))
  		return False;
  
-Index: samba-3.0.21a.new/source/script/installbin.sh
+Index: samba-3.0.21b/source/script/installbin.sh
 ===================================================================
---- samba-3.0.21a.new.orig/source/script/installbin.sh	2005-02-25 18:59:43.000000000 +0100
-+++ samba-3.0.21a.new/source/script/installbin.sh	2006-01-02 09:53:33.820339053 +0100
+--- samba-3.0.21b.orig/source/script/installbin.sh	2006-02-05 23:59:59.000000000 -0800
++++ samba-3.0.21b/source/script/installbin.sh	2006-02-06 00:00:05.000000000 -0800
 @@ -24,12 +24,14 @@
   chmod $INSTALLPERMS $BINDIR/$p2
  

Modified: trunk/patches/smbmount-nomtab.patch
===================================================================
--- trunk/patches/smbmount-nomtab.patch	2006-02-05 05:06:38 UTC (rev 1020)
+++ trunk/patches/smbmount-nomtab.patch	2006-02-06 08:09:31 UTC (rev 1021)
@@ -1,7 +1,7 @@
-Index: samba-3.0.21a.new/source/client/smbmnt.c
+Index: samba-3.0.21b/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.21a.new.orig/source/client/smbmnt.c	2006-01-02 09:57:47.068158819 +0100
-+++ samba-3.0.21a.new/source/client/smbmnt.c	2006-01-02 09:57:48.390891503 +0100
+--- samba-3.0.21b.orig/source/client/smbmnt.c	2006-02-05 23:59:39.000000000 -0800
++++ samba-3.0.21b/source/client/smbmnt.c	2006-02-05 23:59:39.000000000 -0800
 @@ -44,6 +44,7 @@
  static uid_t mount_uid;
  static gid_t mount_gid;
@@ -103,10 +103,10 @@
  
  	return 0;
  }	
-Index: samba-3.0.21a.new/source/client/smbmount.c
+Index: samba-3.0.21b/source/client/smbmount.c
 ===================================================================
---- samba-3.0.21a.new.orig/source/client/smbmount.c	2006-01-02 09:53:33.819339256 +0100
-+++ samba-3.0.21a.new/source/client/smbmount.c	2006-01-02 09:58:17.214066308 +0100
+--- samba-3.0.21b.orig/source/client/smbmount.c	2006-02-05 23:59:39.000000000 -0800
++++ samba-3.0.21b/source/client/smbmount.c	2006-02-05 23:59:53.000000000 -0800
 @@ -46,6 +46,7 @@
  static int mount_ro;
  static unsigned mount_fmask;
@@ -125,7 +125,7 @@
          if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) {
                  DEBUG(0,("%d: Can't get "MOUNTED"~ lock file", sys_getpid()));
                  return;
-@@ -465,6 +469,9 @@
+@@ -468,6 +472,9 @@
  	args[i++] = "-s";
  	args[i++] = svc2;
  
@@ -135,7 +135,7 @@
  	if (mount_ro) {
  		args[i++] = "-r";
  	}
-@@ -660,7 +667,7 @@
+@@ -663,7 +670,7 @@
  ****************************************************************************/
  static void usage(void)
  {
@@ -144,7 +144,7 @@
  
  	printf("Version %s\n\n",SAMBA_VERSION_STRING);
  
-@@ -738,8 +745,13 @@
+@@ -741,8 +748,13 @@
  	argc -= 2;
  	argv += 2;
  

Modified: trunk/patches/smbstatus-locking.patch
===================================================================
--- trunk/patches/smbstatus-locking.patch	2006-02-05 05:06:38 UTC (rev 1020)
+++ trunk/patches/smbstatus-locking.patch	2006-02-06 08:09:31 UTC (rev 1021)
@@ -1,8 +1,8 @@
-Index: samba-3.0.21a.new/source/utils/status.c
+Index: samba-3.0.21b/source/utils/status.c
 ===================================================================
---- samba-3.0.21a.new.orig/source/utils/status.c	2005-11-09 19:29:02.000000000 +0100
-+++ samba-3.0.21a.new/source/utils/status.c	2006-01-02 09:57:51.427277864 +0100
-@@ -701,6 +701,16 @@
+--- samba-3.0.21b.orig/source/utils/status.c	2006-02-05 23:59:10.000000000 -0800
++++ samba-3.0.21b/source/utils/status.c	2006-02-05 23:59:17.000000000 -0800
+@@ -703,6 +703,16 @@
  	if ( show_locks ) {
  		int ret;
  




More information about the Pkg-samba-maint mailing list