[Pkg-samba-maint] r1097 - in trunk: . patches

Christian Perrier bubulle at costa.debian.org
Sun Jul 23 17:54:43 UTC 2006


Author: bubulle
Date: 2006-07-23 17:54:41 +0000 (Sun, 23 Jul 2006)
New Revision: 1097

Modified:
   trunk/changelog
   trunk/patches/README_nosmbldap-tools.patch
   trunk/patches/VERSION.patch
   trunk/patches/adapt_machine_creation_script.patch
   trunk/patches/autoconf.patch
   trunk/patches/cups.patch
   trunk/patches/documentation.patch
   trunk/patches/fhs.patch
   trunk/patches/installswat.sh.patch
   trunk/patches/make-distclean.patch
   trunk/patches/nmbd-signalling.patch
   trunk/patches/non-linux-ports.patch
   trunk/patches/nonpic-libsmbclient.patch
   trunk/patches/pam-examples.patch
   trunk/patches/samba.patch
   trunk/patches/smbclient-pager.patch
   trunk/patches/smbmount-mtab-flags.patch
   trunk/patches/smbmount-nomtab.patch
   trunk/patches/smbmount-unix-caps.patch
   trunk/patches/smbstatus-locking.patch
   trunk/patches/undefined-symbols.patch
Log:
Refresh patches for 3.0.23a


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/changelog	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,4 +1,4 @@
-samba (3.0.23-1) UNRELEASED; urgency=low
+samba (3.0.23a-1) UNRELEASED; urgency=low
 
   [ Adam Conrad ]
   * Fix typo in smb.conf that causes all samba apps to whine.
@@ -58,7 +58,7 @@
   * Added winbindd_priv group as owner of winbindd_privileged directory.
     Closes: #307257
 
- -- Christian Perrier <bubulle at debian.org>  Tue, 11 Jul 2006 08:57:26 +0200
+ -- Christian Perrier <bubulle at debian.org>  Sun, 23 Jul 2006 18:50:35 +0200
 
 samba (3.0.22-1) unstable; urgency=medium
 

Modified: trunk/patches/README_nosmbldap-tools.patch
===================================================================
--- trunk/patches/README_nosmbldap-tools.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/README_nosmbldap-tools.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/examples/LDAP/README
+Index: samba-3.0.23a/examples/LDAP/README
 ===================================================================
---- samba-3.0.23.orig/examples/LDAP/README	2006-07-11 08:58:30.150254728 +0200
-+++ samba-3.0.23/examples/LDAP/README	2006-07-11 08:59:37.278713340 +0200
+--- samba-3.0.23a.orig/examples/LDAP/README	2006-07-23 18:51:11.030391951 +0200
++++ samba-3.0.23a/examples/LDAP/README	2006-07-23 18:52:28.723021293 +0200
 @@ -59,6 +59,9 @@
  The smbldap-tools package can be downloaded individually from 
  http://samba.idealx.org/dist/

Modified: trunk/patches/VERSION.patch
===================================================================
--- trunk/patches/VERSION.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/VERSION.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/source/VERSION
+Index: samba-3.0.23a/source/VERSION
 ===================================================================
---- samba-3.0.23.orig/source/VERSION	2006-07-11 08:58:28.526243709 +0200
-+++ samba-3.0.23/source/VERSION	2006-07-11 08:59:44.550763371 +0200
+--- samba-3.0.23a.orig/source/VERSION	2006-07-23 18:51:04.282337310 +0200
++++ samba-3.0.23a/source/VERSION	2006-07-23 18:52:42.539133255 +0200
 @@ -96,5 +96,5 @@
  # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version()    #
  #  ->  "CVS 3.0.0rc2-VendorVersion"                    #

Modified: trunk/patches/adapt_machine_creation_script.patch
===================================================================
--- trunk/patches/adapt_machine_creation_script.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/adapt_machine_creation_script.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -3,10 +3,10 @@
 
 Status wrt upstream: Debian specific
 
-Index: samba-3.0.23/docs/manpages/smb.conf.5
+Index: samba-3.0.23a/docs/manpages/smb.conf.5
 ===================================================================
---- samba-3.0.23.orig/docs/manpages/smb.conf.5	2006-07-11 08:58:28.366242624 +0200
-+++ samba-3.0.23/docs/manpages/smb.conf.5	2006-07-11 08:59:45.438769485 +0200
+--- samba-3.0.23a.orig/docs/manpages/smb.conf.5	2006-07-23 18:51:03.950334622 +0200
++++ samba-3.0.23a/docs/manpages/smb.conf.5	2006-07-23 18:52:44.171146482 +0200
 @@ -522,7 +522,7 @@
  
  Default: \fB\fIadd machine script\fR = \fR 

Modified: trunk/patches/autoconf.patch
===================================================================
--- trunk/patches/autoconf.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/autoconf.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/source/configure
+Index: samba-3.0.23a/source/configure
 ===================================================================
---- samba-3.0.23.orig/source/configure	2006-07-11 08:58:28.138241077 +0200
-+++ samba-3.0.23/source/configure	2006-07-11 08:59:46.462776537 +0200
+--- samba-3.0.23a.orig/source/configure	2006-07-23 18:51:03.414330282 +0200
++++ samba-3.0.23a/source/configure	2006-07-23 18:52:46.079161945 +0200
 @@ -310,7 +310,7 @@
  # include <unistd.h>
  #endif"
@@ -11,7 +11,7 @@
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -1010,7 +1010,7 @@
+@@ -1011,7 +1011,7 @@
      else
        echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
      fi
@@ -20,7 +20,7 @@
    done
  fi
  
-@@ -1437,7 +1437,7 @@
+@@ -1438,7 +1438,7 @@
    withval="$with_fhs"
     case "$withval" in
    yes)
@@ -29,7 +29,7 @@
      piddir="\${VARDIR}/run"
      mandir="\${prefix}/share/man"
      logfilebase="\${VARDIR}/log/samba"
-@@ -1445,6 +1445,14 @@
+@@ -1446,6 +1446,14 @@
      libdir="\${prefix}/lib/samba"
      configdir="${sysconfdir}/samba"
      swatdir="\${DATADIR}/samba/swat"
@@ -44,7 +44,7 @@
      ;;
    esac
  fi;
-@@ -1731,6 +1739,9 @@
+@@ -1732,6 +1740,9 @@
  
  
  
@@ -54,7 +54,7 @@
  # Set defaults
  PIE_CFLAGS=""
  PIE_LDFLAGS=""
-@@ -2419,8 +2430,7 @@
+@@ -2420,8 +2431,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -64,7 +64,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2478,8 +2488,7 @@
+@@ -2479,8 +2489,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -74,7 +74,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2595,8 +2604,7 @@
+@@ -2596,8 +2605,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -84,7 +84,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2650,8 +2658,7 @@
+@@ -2651,8 +2659,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -94,7 +94,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2696,8 +2703,7 @@
+@@ -2697,8 +2704,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -104,7 +104,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2741,8 +2747,7 @@
+@@ -2742,8 +2748,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -114,7 +114,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3296,8 +3301,7 @@
+@@ -3297,8 +3302,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -124,7 +124,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3355,8 +3359,7 @@
+@@ -3356,8 +3360,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -134,7 +134,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3472,8 +3475,7 @@
+@@ -3473,8 +3476,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -144,7 +144,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3527,8 +3529,7 @@
+@@ -3528,8 +3530,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -154,7 +154,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3573,8 +3574,7 @@
+@@ -3574,8 +3575,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -164,7 +164,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3618,8 +3618,7 @@
+@@ -3619,8 +3619,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -174,7 +174,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4249,8 +4248,7 @@
+@@ -4250,8 +4249,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -184,7 +184,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4304,8 +4302,7 @@
+@@ -4305,8 +4303,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -194,7 +194,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4607,8 +4604,7 @@
+@@ -4608,8 +4605,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -204,7 +204,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5102,6 +5098,27 @@
+@@ -5103,6 +5099,27 @@
        fi
      ;;
  
@@ -232,7 +232,7 @@
  # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
  #
      *linux*)
-@@ -5259,8 +5276,7 @@
+@@ -5260,8 +5277,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -242,7 +242,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5363,8 +5379,7 @@
+@@ -5364,8 +5380,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -252,7 +252,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5496,8 +5511,7 @@
+@@ -5497,8 +5512,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -262,7 +262,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5587,8 +5601,7 @@
+@@ -5588,8 +5602,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -272,7 +272,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5760,8 +5773,7 @@
+@@ -5761,8 +5774,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -282,7 +282,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5833,8 +5845,7 @@
+@@ -5834,8 +5846,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -292,7 +292,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5888,8 +5899,7 @@
+@@ -5889,8 +5900,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -302,7 +302,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5960,8 +5970,7 @@
+@@ -5961,8 +5971,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -312,7 +312,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6015,8 +6024,7 @@
+@@ -6016,8 +6025,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -322,7 +322,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6083,8 +6091,7 @@
+@@ -6084,8 +6092,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -332,7 +332,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6154,8 +6161,7 @@
+@@ -6155,8 +6162,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -342,7 +342,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6224,8 +6230,7 @@
+@@ -6225,8 +6231,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -352,7 +352,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6299,8 +6304,7 @@
+@@ -6300,8 +6305,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -362,7 +362,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6454,8 +6458,7 @@
+@@ -6455,8 +6459,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -372,7 +372,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6605,8 +6608,7 @@
+@@ -6606,8 +6609,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -382,7 +382,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6757,8 +6759,7 @@
+@@ -6758,8 +6760,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -392,7 +392,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6913,8 +6914,7 @@
+@@ -6914,8 +6915,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -402,7 +402,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7070,8 +7070,7 @@
+@@ -7071,8 +7071,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -412,7 +412,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7220,8 +7219,7 @@
+@@ -7221,8 +7220,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -422,7 +422,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7375,8 +7373,7 @@
+@@ -7376,8 +7374,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -432,7 +432,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7530,8 +7527,7 @@
+@@ -7531,8 +7528,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -442,7 +442,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7682,8 +7678,7 @@
+@@ -7683,8 +7679,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -452,7 +452,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7833,8 +7828,7 @@
+@@ -7834,8 +7829,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -462,7 +462,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7984,8 +7978,7 @@
+@@ -7985,8 +7979,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -472,7 +472,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8133,8 +8126,7 @@
+@@ -8134,8 +8127,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -482,7 +482,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8356,8 +8348,7 @@
+@@ -8357,8 +8349,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -492,7 +492,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8503,8 +8494,7 @@
+@@ -8504,8 +8495,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -502,7 +502,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8663,8 +8653,7 @@
+@@ -8664,8 +8654,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -512,7 +512,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8826,8 +8815,7 @@
+@@ -8827,8 +8816,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -522,7 +522,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9048,8 +9036,7 @@
+@@ -9049,8 +9037,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -532,7 +532,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9199,8 +9186,7 @@
+@@ -9200,8 +9187,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -542,7 +542,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9350,8 +9336,7 @@
+@@ -9351,8 +9337,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -552,7 +552,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9506,8 +9491,7 @@
+@@ -9507,8 +9492,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -562,7 +562,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9657,8 +9641,7 @@
+@@ -9658,8 +9642,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=$?
-@@ -9809,8 +9792,7 @@
+@@ -9810,8 +9793,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=$?
-@@ -9963,8 +9945,7 @@
+@@ -9964,8 +9946,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=$?
-@@ -10096,8 +10077,7 @@
+@@ -10097,8 +10078,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=$?
-@@ -10167,8 +10147,7 @@
+@@ -10168,8 +10148,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=$?
-@@ -10316,8 +10295,7 @@
+@@ -10317,8 +10296,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=$?
-@@ -10518,8 +10496,7 @@
+@@ -10519,8 +10497,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=$?
-@@ -10583,8 +10560,7 @@
+@@ -10584,8 +10561,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=$?
-@@ -10730,8 +10706,7 @@
+@@ -10731,8 +10707,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=$?
-@@ -10793,8 +10768,7 @@
+@@ -10794,8 +10769,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=$?
-@@ -10834,8 +10808,7 @@
+@@ -10835,8 +10809,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=$?
-@@ -10891,8 +10864,7 @@
+@@ -10892,8 +10865,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=$?
-@@ -11029,10 +11001,8 @@
+@@ -11030,10 +11002,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -695,7 +695,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -11144,8 +11114,7 @@
+@@ -11145,8 +11115,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=$?
-@@ -11207,8 +11176,7 @@
+@@ -11208,8 +11177,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=$?
-@@ -11248,8 +11216,7 @@
+@@ -11249,8 +11217,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=$?
-@@ -11305,8 +11272,7 @@
+@@ -11306,8 +11273,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=$?
-@@ -11346,8 +11312,7 @@
+@@ -11347,8 +11313,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=$?
-@@ -11411,8 +11376,7 @@
+@@ -11412,8 +11377,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=$?
-@@ -11443,10 +11407,8 @@
+@@ -11444,10 +11408,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -768,7 +768,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -11558,8 +11520,7 @@
+@@ -11559,8 +11521,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=$?
-@@ -11621,8 +11582,7 @@
+@@ -11622,8 +11583,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=$?
-@@ -11662,8 +11622,7 @@
+@@ -11663,8 +11623,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=$?
-@@ -11719,8 +11678,7 @@
+@@ -11720,8 +11679,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=$?
-@@ -11760,8 +11718,7 @@
+@@ -11761,8 +11719,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=$?
-@@ -11825,8 +11782,7 @@
+@@ -11826,8 +11783,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=$?
-@@ -11857,10 +11813,8 @@
+@@ -11858,10 +11814,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -841,7 +841,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -12016,8 +11970,7 @@
+@@ -12017,8 +11971,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=$?
-@@ -12077,8 +12030,7 @@
+@@ -12078,8 +12031,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=$?
-@@ -12154,8 +12106,7 @@
+@@ -12155,8 +12107,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=$?
-@@ -12197,8 +12148,7 @@
+@@ -12198,8 +12149,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=$?
-@@ -12255,8 +12205,7 @@
+@@ -12256,8 +12206,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=$?
-@@ -12452,8 +12401,7 @@
+@@ -12453,8 +12402,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=$?
-@@ -12552,8 +12500,7 @@
+@@ -12553,8 +12501,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=$?
-@@ -12684,8 +12631,7 @@
+@@ -12685,8 +12632,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=$?
-@@ -12750,8 +12696,7 @@
+@@ -12751,8 +12697,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=$?
-@@ -12860,8 +12805,7 @@
+@@ -12861,8 +12806,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=$?
-@@ -12932,8 +12876,7 @@
+@@ -12933,8 +12877,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=$?
-@@ -13062,8 +13005,7 @@
+@@ -13063,8 +13006,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=$?
-@@ -13128,8 +13070,7 @@
+@@ -13129,8 +13071,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=$?
-@@ -13194,8 +13135,7 @@
+@@ -13195,8 +13136,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=$?
-@@ -13260,8 +13200,7 @@
+@@ -13261,8 +13201,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=$?
-@@ -13421,8 +13360,7 @@
+@@ -13422,8 +13361,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=$?
-@@ -13476,8 +13414,7 @@
+@@ -13477,8 +13415,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=$?
-@@ -13554,8 +13491,7 @@
+@@ -13555,8 +13492,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=$?
-@@ -13626,8 +13562,7 @@
+@@ -13627,8 +13563,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=$?
-@@ -13768,8 +13703,7 @@
+@@ -13769,8 +13704,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=$?
-@@ -13836,8 +13770,7 @@
+@@ -13837,8 +13771,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=$?
-@@ -13917,8 +13850,7 @@
+@@ -13918,8 +13851,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=$?
-@@ -14107,8 +14039,7 @@
+@@ -14108,8 +14040,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=$?
-@@ -14170,8 +14101,7 @@
+@@ -14171,8 +14102,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=$?
-@@ -14233,8 +14163,7 @@
+@@ -14234,8 +14164,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=$?
-@@ -14296,8 +14225,7 @@
+@@ -14297,8 +14226,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=$?
-@@ -14359,8 +14287,7 @@
+@@ -14360,8 +14288,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=$?
-@@ -14633,8 +14560,7 @@
+@@ -14634,8 +14561,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=$?
-@@ -14783,8 +14709,7 @@
+@@ -14784,8 +14710,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=$?
-@@ -14935,8 +14860,7 @@
+@@ -14936,8 +14861,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=$?
-@@ -15087,8 +15011,7 @@
+@@ -15088,8 +15012,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=$?
-@@ -15156,8 +15079,7 @@
+@@ -15157,8 +15080,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=$?
-@@ -15252,8 +15174,7 @@
+@@ -15253,8 +15175,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=$?
-@@ -15402,8 +15323,7 @@
+@@ -15403,8 +15324,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=$?
-@@ -15554,8 +15474,7 @@
+@@ -15555,8 +15475,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=$?
-@@ -15873,8 +15792,7 @@
+@@ -15874,8 +15793,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=$?
-@@ -16058,8 +15976,7 @@
+@@ -16059,8 +15977,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=$?
-@@ -16212,8 +16129,7 @@
+@@ -16213,8 +16130,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=$?
-@@ -16377,8 +16293,7 @@
+@@ -16378,8 +16294,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=$?
-@@ -16432,8 +16347,7 @@
+@@ -16433,8 +16348,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=$?
-@@ -16534,8 +16448,7 @@
+@@ -16535,8 +16449,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=$?
-@@ -16638,8 +16551,7 @@
+@@ -16639,8 +16552,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=$?
-@@ -16762,8 +16674,7 @@
+@@ -16763,8 +16675,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=$?
-@@ -16873,8 +16784,7 @@
+@@ -16874,8 +16785,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=$?
-@@ -16985,8 +16895,7 @@
+@@ -16986,8 +16896,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=$?
-@@ -17095,8 +17004,7 @@
+@@ -17096,8 +17005,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=$?
-@@ -17204,8 +17112,7 @@
+@@ -17205,8 +17113,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=$?
-@@ -17316,8 +17223,7 @@
+@@ -17317,8 +17224,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=$?
-@@ -17424,8 +17330,7 @@
+@@ -17425,8 +17331,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=$?
-@@ -17532,8 +17437,7 @@
+@@ -17533,8 +17438,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=$?
-@@ -17639,8 +17543,7 @@
+@@ -17640,8 +17544,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=$?
-@@ -17742,8 +17645,7 @@
+@@ -17743,8 +17646,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=$?
-@@ -17854,8 +17756,7 @@
+@@ -17855,8 +17757,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=$?
-@@ -17958,8 +17859,7 @@
+@@ -17959,8 +17860,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=$?
-@@ -18061,8 +17961,7 @@
+@@ -18062,8 +17962,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=$?
-@@ -18163,8 +18062,7 @@
+@@ -18164,8 +18063,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=$?
-@@ -18268,8 +18166,7 @@
+@@ -18269,8 +18167,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=$?
-@@ -18335,8 +18232,7 @@
+@@ -18336,8 +18233,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=$?
-@@ -18523,8 +18419,7 @@
+@@ -18524,8 +18420,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=$?
-@@ -18594,8 +18489,7 @@
+@@ -18595,8 +18490,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=$?
-@@ -18779,8 +18673,7 @@
+@@ -18780,8 +18674,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=$?
-@@ -18851,8 +18744,7 @@
+@@ -18852,8 +18745,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=$?
-@@ -18935,8 +18827,7 @@
+@@ -18936,8 +18828,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=$?
-@@ -18994,8 +18885,7 @@
+@@ -18995,8 +18886,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=$?
-@@ -19148,8 +19038,7 @@
+@@ -19149,8 +19039,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=$?
-@@ -19239,8 +19128,7 @@
+@@ -19240,8 +19129,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=$?
-@@ -19396,8 +19284,7 @@
+@@ -19397,8 +19285,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=$?
-@@ -19504,8 +19391,7 @@
+@@ -19505,8 +19392,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=$?
-@@ -19613,8 +19499,7 @@
+@@ -19614,8 +19500,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=$?
-@@ -19824,8 +19709,7 @@
+@@ -19825,8 +19710,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=$?
-@@ -20035,8 +19919,7 @@
+@@ -20036,8 +19920,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=$?
-@@ -20144,8 +20027,7 @@
+@@ -20145,8 +20028,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=$?
-@@ -20358,8 +20240,7 @@
+@@ -20359,8 +20241,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=$?
-@@ -20464,8 +20345,7 @@
+@@ -20465,8 +20346,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=$?
-@@ -20571,8 +20451,7 @@
+@@ -20572,8 +20452,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=$?
-@@ -20679,8 +20558,7 @@
+@@ -20680,8 +20559,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=$?
-@@ -20786,8 +20664,7 @@
+@@ -20787,8 +20665,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=$?
-@@ -20893,8 +20770,7 @@
+@@ -20894,8 +20771,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=$?
-@@ -21100,8 +20976,7 @@
+@@ -21101,8 +20977,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=$?
-@@ -21162,8 +21037,7 @@
+@@ -21163,8 +21038,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=$?
-@@ -21191,7 +21065,7 @@
+@@ -21192,7 +21066,7 @@
  #
  #
  case "$host_os" in
@@ -1650,7 +1650,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
-@@ -21324,8 +21198,7 @@
+@@ -21325,8 +21199,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1660,7 +1660,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21460,8 +21333,7 @@
+@@ -21461,8 +21334,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1670,7 +1670,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21523,8 +21395,7 @@
+@@ -21524,8 +21396,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1680,7 +1680,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21620,8 +21491,7 @@
+@@ -21621,8 +21492,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1690,7 +1690,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21722,8 +21592,7 @@
+@@ -21723,8 +21593,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1700,7 +1700,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21812,8 +21681,7 @@
+@@ -21813,8 +21682,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1710,7 +1710,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21886,8 +21754,7 @@
+@@ -21887,8 +21755,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1720,7 +1720,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22931,8 +22798,7 @@
+@@ -22932,8 +22799,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=$?
-@@ -23021,8 +22887,7 @@
+@@ -23022,8 +22888,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=$?
-@@ -23146,8 +23011,7 @@
+@@ -23147,8 +23012,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=$?
-@@ -23236,8 +23100,7 @@
+@@ -23237,8 +23101,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=$?
-@@ -23360,8 +23223,7 @@
+@@ -23361,8 +23224,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=$?
-@@ -23450,8 +23312,7 @@
+@@ -23451,8 +23313,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=$?
-@@ -23575,8 +23436,7 @@
+@@ -23576,8 +23437,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=$?
-@@ -23665,8 +23525,7 @@
+@@ -23666,8 +23526,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=$?
-@@ -23789,8 +23648,7 @@
+@@ -23790,8 +23649,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=$?
-@@ -23879,8 +23737,7 @@
+@@ -23880,8 +23738,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=$?
-@@ -24004,8 +23861,7 @@
+@@ -24005,8 +23862,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=$?
-@@ -24094,8 +23950,7 @@
+@@ -24095,8 +23951,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=$?
-@@ -24218,8 +24073,7 @@
+@@ -24219,8 +24074,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=$?
-@@ -24308,8 +24162,7 @@
+@@ -24309,8 +24163,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=$?
-@@ -24432,8 +24285,7 @@
+@@ -24433,8 +24286,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=$?
-@@ -24508,8 +24360,7 @@
+@@ -24509,8 +24361,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=$?
-@@ -24668,8 +24519,7 @@
+@@ -24669,8 +24520,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=$?
-@@ -24773,8 +24623,7 @@
+@@ -24774,8 +24624,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=$?
-@@ -24875,8 +24724,7 @@
+@@ -24876,8 +24725,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=$?
-@@ -24948,8 +24796,7 @@
+@@ -24949,8 +24797,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=$?
-@@ -25109,8 +24956,7 @@
+@@ -25110,8 +24957,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=$?
-@@ -25216,8 +25062,7 @@
+@@ -25217,8 +25063,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=$?
-@@ -25323,8 +25168,7 @@
+@@ -25324,8 +25169,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=$?
-@@ -25428,8 +25272,7 @@
+@@ -25429,8 +25273,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=$?
-@@ -25532,8 +25375,7 @@
+@@ -25533,8 +25376,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=$?
-@@ -25637,8 +25479,7 @@
+@@ -25638,8 +25480,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=$?
-@@ -25742,8 +25583,7 @@
+@@ -25743,8 +25584,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=$?
-@@ -25859,8 +25699,7 @@
+@@ -25860,8 +25700,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=$?
-@@ -25963,8 +25802,7 @@
+@@ -25964,8 +25803,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=$?
-@@ -26067,8 +25905,7 @@
+@@ -26068,8 +25906,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=$?
-@@ -26171,8 +26008,7 @@
+@@ -26172,8 +26009,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=$?
-@@ -26230,10 +26066,14 @@
+@@ -26231,10 +26067,14 @@
  
    # and these are for particular systems
    case "$host_os" in
@@ -2046,7 +2046,7 @@
  
  			BLDSHARED="true"
  			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
-@@ -26730,8 +26570,7 @@
+@@ -26731,8 +26571,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2056,7 +2056,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27267,8 +27106,7 @@
+@@ -27268,8 +27107,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2066,7 +2066,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27334,8 +27172,7 @@
+@@ -27335,8 +27173,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2076,7 +2076,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27614,8 +27451,7 @@
+@@ -27615,8 +27452,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2086,7 +2086,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27740,8 +27576,7 @@
+@@ -27741,8 +27577,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2096,7 +2096,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27902,8 +27737,7 @@
+@@ -27903,8 +27738,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2106,7 +2106,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28035,8 +27869,7 @@
+@@ -28036,8 +27870,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2116,7 +2116,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28109,8 +27942,7 @@
+@@ -28110,8 +27943,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2126,7 +2126,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28183,8 +28015,7 @@
+@@ -28184,8 +28016,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2136,7 +2136,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28277,8 +28108,7 @@
+@@ -28278,8 +28109,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2146,7 +2146,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28408,8 +28238,7 @@
+@@ -28409,8 +28239,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2156,7 +2156,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28482,8 +28311,7 @@
+@@ -28483,8 +28312,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2166,7 +2166,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28556,8 +28384,7 @@
+@@ -28557,8 +28385,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2176,7 +2176,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28650,8 +28477,7 @@
+@@ -28651,8 +28478,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2186,7 +2186,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28713,8 +28539,7 @@
+@@ -28714,8 +28540,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2196,7 +2196,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28905,8 +28730,7 @@
+@@ -28906,8 +28731,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2206,7 +2206,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29457,8 +29281,7 @@
+@@ -29458,8 +29282,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2216,7 +2216,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29879,8 +29702,7 @@
+@@ -29880,8 +29703,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2226,7 +2226,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29932,8 +29754,7 @@
+@@ -29933,8 +29755,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2236,7 +2236,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30044,8 +29865,7 @@
+@@ -30045,8 +29866,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2246,7 +2246,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30560,8 +30380,7 @@
+@@ -30561,8 +30381,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2256,7 +2256,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30719,8 +30538,7 @@
+@@ -30720,8 +30539,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2266,7 +2266,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30799,8 +30617,7 @@
+@@ -30800,8 +30618,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2276,7 +2276,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30878,8 +30695,7 @@
+@@ -30879,8 +30696,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2286,7 +2286,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30949,8 +30765,7 @@
+@@ -30950,8 +30766,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2296,7 +2296,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31162,8 +30977,7 @@
+@@ -31163,8 +30978,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2306,7 +2306,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31329,8 +31143,7 @@
+@@ -31330,8 +31144,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2316,7 +2316,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31476,8 +31289,7 @@
+@@ -31477,8 +31290,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2326,7 +2326,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31541,8 +31353,7 @@
+@@ -31542,8 +31354,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2336,7 +2336,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31732,8 +31543,7 @@
+@@ -31733,8 +31544,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2346,7 +2346,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31822,8 +31632,7 @@
+@@ -31823,8 +31633,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2356,7 +2356,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31983,8 +31792,7 @@
+@@ -31984,8 +31793,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2366,7 +2366,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32113,8 +31921,7 @@
+@@ -32114,8 +31922,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2376,7 +2376,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32248,8 +32055,7 @@
+@@ -32249,8 +32056,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2386,7 +2386,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32510,8 +32316,7 @@
+@@ -32511,8 +32317,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2396,7 +2396,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33742,8 +33547,7 @@
+@@ -33743,8 +33548,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2406,7 +2406,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34196,8 +34000,7 @@
+@@ -34197,8 +34001,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2416,7 +2416,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34467,8 +34270,7 @@
+@@ -34468,8 +34271,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2426,7 +2426,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34750,8 +34552,7 @@
+@@ -34751,8 +34553,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2436,7 +2436,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34877,8 +34678,7 @@
+@@ -34878,8 +34679,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2446,7 +2446,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34944,8 +34744,7 @@
+@@ -34945,8 +34745,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2456,7 +2456,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35047,8 +34846,7 @@
+@@ -35048,8 +34847,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2466,7 +2466,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35341,8 +35139,7 @@
+@@ -35342,8 +35140,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2476,7 +2476,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35582,8 +35379,7 @@
+@@ -35583,8 +35380,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2486,7 +2486,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35767,8 +35563,7 @@
+@@ -35768,8 +35564,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2496,7 +2496,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35931,8 +35726,7 @@
+@@ -35932,8 +35727,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2506,7 +2506,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36629,8 +36423,7 @@
+@@ -36630,8 +36424,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2516,7 +2516,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36730,8 +36523,7 @@
+@@ -36731,8 +36524,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2526,7 +2526,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36858,8 +36650,7 @@
+@@ -36859,8 +36651,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2536,7 +2536,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36961,8 +36752,7 @@
+@@ -36962,8 +36753,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2546,7 +2546,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37167,8 +36957,7 @@
+@@ -37168,8 +36958,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2556,7 +2556,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37476,8 +37265,7 @@
+@@ -37477,8 +37266,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2566,7 +2566,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37682,8 +37470,7 @@
+@@ -37683,8 +37471,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2576,7 +2576,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37785,8 +37572,7 @@
+@@ -37786,8 +37573,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2586,7 +2586,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37888,8 +37674,7 @@
+@@ -37889,8 +37675,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2596,7 +2596,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37991,8 +37776,7 @@
+@@ -37992,8 +37777,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2606,7 +2606,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38094,8 +37878,7 @@
+@@ -38095,8 +37879,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2616,7 +2616,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38300,8 +38083,7 @@
+@@ -38301,8 +38084,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2626,7 +2626,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38403,8 +38185,7 @@
+@@ -38404,8 +38186,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2636,7 +2636,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38609,8 +38390,7 @@
+@@ -38610,8 +38391,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2646,7 +2646,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38815,8 +38595,7 @@
+@@ -38816,8 +38596,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2656,7 +2656,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39330,8 +39109,7 @@
+@@ -39331,8 +39110,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2666,7 +2666,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39536,8 +39314,7 @@
+@@ -39537,8 +39315,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2676,7 +2676,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39639,8 +39416,7 @@
+@@ -39640,8 +39417,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2686,7 +2686,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39742,8 +39518,7 @@
+@@ -39743,8 +39519,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2696,7 +2696,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39845,8 +39620,7 @@
+@@ -39846,8 +39621,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2706,7 +2706,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39948,8 +39722,7 @@
+@@ -39949,8 +39723,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2716,7 +2716,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40257,8 +40030,7 @@
+@@ -40258,8 +40031,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2726,7 +2726,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41157,8 +40929,7 @@
+@@ -41158,8 +40930,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2736,7 +2736,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41465,8 +41236,7 @@
+@@ -41466,8 +41237,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2746,7 +2746,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42472,8 +42242,7 @@
+@@ -42473,8 +42243,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2756,7 +2756,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42651,8 +42420,7 @@
+@@ -42652,8 +42421,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2766,7 +2766,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42987,8 +42755,7 @@
+@@ -42988,8 +42756,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2776,7 +2776,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43145,8 +42912,7 @@
+@@ -43146,8 +42913,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2786,7 +2786,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43297,8 +43063,7 @@
+@@ -43298,8 +43064,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2796,7 +2796,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43522,8 +43287,7 @@
+@@ -43523,8 +43288,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2806,7 +2806,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43829,8 +43593,7 @@
+@@ -43830,8 +43594,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2816,7 +2816,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44018,8 +43781,7 @@
+@@ -44019,8 +43782,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2826,7 +2826,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44275,8 +44037,7 @@
+@@ -44276,8 +44038,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2836,7 +2836,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44454,8 +44215,7 @@
+@@ -44455,8 +44216,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2846,7 +2846,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44528,8 +44288,7 @@
+@@ -44529,8 +44289,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2856,7 +2856,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44908,8 +44667,7 @@
+@@ -44909,8 +44668,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2866,7 +2866,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45311,8 +45069,7 @@
+@@ -45312,8 +45070,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2876,7 +2876,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45512,8 +45269,7 @@
+@@ -45538,8 +45295,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2886,7 +2886,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45580,8 +45336,7 @@
+@@ -45606,8 +45362,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2896,7 +2896,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45643,8 +45398,7 @@
+@@ -45669,8 +45424,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2906,7 +2906,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45914,8 +45668,7 @@
+@@ -45940,8 +45694,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2916,7 +2916,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46026,8 +45779,7 @@
+@@ -46052,8 +45805,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2926,7 +2926,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46094,8 +45846,7 @@
+@@ -46120,8 +45872,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2936,7 +2936,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46455,8 +46206,7 @@
+@@ -46481,8 +46232,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2946,7 +2946,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46633,8 +46383,7 @@
+@@ -46659,8 +46409,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2956,7 +2956,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46765,8 +46514,7 @@
+@@ -46791,8 +46540,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2966,7 +2966,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46959,8 +46707,7 @@
+@@ -46985,8 +46733,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2976,7 +2976,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47020,8 +46767,7 @@
+@@ -47046,8 +46793,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2986,7 +2986,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47300,8 +47046,7 @@
+@@ -47326,8 +47072,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2996,7 +2996,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47476,8 +47221,7 @@
+@@ -47502,8 +47247,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3006,7 +3006,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47561,8 +47305,7 @@
+@@ -47587,8 +47331,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3016,7 +3016,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47753,8 +47496,7 @@
+@@ -47779,8 +47522,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3026,7 +3026,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47834,10 +47576,10 @@
+@@ -47860,10 +47602,10 @@
  WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS
  
  case "$host_os" in
@@ -3039,7 +3039,7 @@
  		# FreeBSD winbind client is implemented as a wrapper around
  		# the Linux version.
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
-@@ -47968,8 +47710,7 @@
+@@ -47994,8 +47736,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3049,7 +3049,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48083,8 +47824,7 @@
+@@ -48109,8 +47850,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3059,7 +3059,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48128,8 +47868,7 @@
+@@ -48154,8 +47894,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3069,7 +3069,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48466,8 +48205,7 @@
+@@ -48492,8 +48231,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3079,7 +3079,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48667,8 +48405,7 @@
+@@ -48693,8 +48431,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3089,7 +3089,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51267,6 +51004,9 @@
+@@ -51293,6 +51030,9 @@
  s, at logfilebase@,$logfilebase,;t t
  s, at privatedir@,$privatedir,;t t
  s, at swatdir@,$swatdir,;t t
@@ -3099,7 +3099,7 @@
  s, at rootsbindir@,$rootsbindir,;t t
  s, at pammodulesdir@,$pammodulesdir,;t t
  s, at LDSHFLAGS@,$LDSHFLAGS,;t t
-@@ -51551,11 +51291,6 @@
+@@ -51577,11 +51317,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -3111,7 +3111,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.  */
-@@ -51594,6 +51329,12 @@
+@@ -51620,6 +51355,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -3124,11 +3124,11 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
-Index: samba-3.0.23/source/include/config.h.in
+Index: samba-3.0.23a/source/include/config.h.in
 ===================================================================
---- samba-3.0.23.orig/source/include/config.h.in	2006-07-11 08:58:28.178241348 +0200
-+++ samba-3.0.23/source/include/config.h.in	2006-07-11 08:59:46.470776592 +0200
-@@ -48,6 +48,9 @@
+--- samba-3.0.23a.orig/source/include/config.h.in	2006-07-23 18:51:03.526331189 +0200
++++ samba-3.0.23a/source/include/config.h.in	2006-07-23 18:52:46.087162010 +0200
+@@ -51,6 +51,9 @@
  /* Define to turn on dmalloc debugging */
  #undef ENABLE_DMALLOC
  

Modified: trunk/patches/cups.patch
===================================================================
--- trunk/patches/cups.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/cups.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/source/include/includes.h
+Index: samba-3.0.23a/source/include/includes.h
 ===================================================================
---- samba-3.0.23.orig/source/include/includes.h	2006-07-11 08:58:33.154275120 +0200
-+++ samba-3.0.23/source/include/includes.h	2006-07-11 08:59:27.258644509 +0200
+--- samba-3.0.23a.orig/source/include/includes.h	2006-07-23 18:51:16.430435679 +0200
++++ samba-3.0.23a/source/include/includes.h	2006-07-23 18:52:08.602858269 +0200
 @@ -1076,10 +1076,7 @@
  #endif
  

Modified: trunk/patches/documentation.patch
===================================================================
--- trunk/patches/documentation.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/documentation.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/docs/manpages/swat.8
+Index: samba-3.0.23a/docs/manpages/swat.8
 ===================================================================
---- samba-3.0.23.orig/docs/manpages/swat.8	2006-07-11 08:58:32.810272784 +0200
-+++ samba-3.0.23/docs/manpages/swat.8	2006-07-11 08:59:28.154650659 +0200
+--- samba-3.0.23a.orig/docs/manpages/swat.8	2006-07-23 18:51:15.722429945 +0200
++++ samba-3.0.23a/docs/manpages/swat.8	2006-07-23 18:52:10.714875380 +0200
 @@ -81,51 +81,6 @@
  \-h|\-\-help
  Print a summary of command line options\&.
@@ -65,10 +65,10 @@
  
  .SH "WARNINGS"
  
-Index: samba-3.0.23/docs/manpages/nmbd.8
+Index: samba-3.0.23a/docs/manpages/nmbd.8
 ===================================================================
---- samba-3.0.23.orig/docs/manpages/nmbd.8	2006-07-11 08:58:32.838272975 +0200
-+++ samba-3.0.23/docs/manpages/nmbd.8	2006-07-11 08:59:28.158650686 +0200
+--- samba-3.0.23a.orig/docs/manpages/nmbd.8	2006-07-23 18:51:15.770430334 +0200
++++ samba-3.0.23a/docs/manpages/nmbd.8	2006-07-23 18:52:10.718875412 +0200
 @@ -74,7 +74,7 @@
  \-H <filename>
  NetBIOS lmhosts file\&. The lmhosts file is a list of NetBIOS names to IP addresses that is loaded by the nmbd server and used via the name resolution mechanism name resolve order described in \fBsmb\&.conf\fR(5) to resolve any NetBIOS name queries needed by the server\&. Note that the contents of this file are \fBNOT\fR used by \fBnmbd\fR to answer any name queries\&. Adding a line to this file affects name NetBIOS resolution from this host \fBONLY\fR\&.
@@ -98,10 +98,10 @@
  
  .PP
  The debug log level of nmbd may be raised or lowered using \fBsmbcontrol\fR(1) (SIGUSR[1|2] signals are no longer used since Samba 2\&.2)\&. This is to allow transient problems to be diagnosed, whilst still running at a normally low log level\&.
-Index: samba-3.0.23/docs/manpages/smbd.8
+Index: samba-3.0.23a/docs/manpages/smbd.8
 ===================================================================
---- samba-3.0.23.orig/docs/manpages/smbd.8	2006-07-11 08:58:32.866273165 +0200
-+++ samba-3.0.23/docs/manpages/smbd.8	2006-07-11 08:59:28.158650686 +0200
+--- samba-3.0.23a.orig/docs/manpages/smbd.8	2006-07-23 18:51:15.822430755 +0200
++++ samba-3.0.23a/docs/manpages/smbd.8	2006-07-23 18:52:10.718875412 +0200
 @@ -119,8 +119,8 @@
  If running the server via the meta\-daemon \fBinetd\fR, this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
  
@@ -113,10 +113,10 @@
  
  This file describes all the services the server is to make available to clients\&. See \fBsmb\&.conf\fR(5) for more information\&.
  
-Index: samba-3.0.23/docs/manpages/lmhosts.5
+Index: samba-3.0.23a/docs/manpages/lmhosts.5
 ===================================================================
---- samba-3.0.23.orig/docs/manpages/lmhosts.5	2006-07-11 08:58:32.890273328 +0200
-+++ samba-3.0.23/docs/manpages/lmhosts.5	2006-07-11 08:59:28.158650686 +0200
+--- samba-3.0.23a.orig/docs/manpages/lmhosts.5	2006-07-23 18:51:15.870431144 +0200
++++ samba-3.0.23a/docs/manpages/lmhosts.5	2006-07-23 18:52:10.722875445 +0200
 @@ -73,7 +73,7 @@
  .SH "FILES"
  
@@ -126,10 +126,10 @@
  
  .SH "VERSION"
  
-Index: samba-3.0.23/docs/manpages/ntlm_auth.1
+Index: samba-3.0.23a/docs/manpages/ntlm_auth.1
 ===================================================================
---- samba-3.0.23.orig/docs/manpages/ntlm_auth.1	2006-07-11 08:58:32.930273599 +0200
-+++ samba-3.0.23/docs/manpages/ntlm_auth.1	2006-07-11 08:59:28.158650686 +0200
+--- samba-3.0.23a.orig/docs/manpages/ntlm_auth.1	2006-07-23 18:51:15.922431565 +0200
++++ samba-3.0.23a/docs/manpages/ntlm_auth.1	2006-07-23 18:52:10.722875445 +0200
 @@ -42,7 +42,7 @@
  The \fBwinbindd\fR(8) daemon must be operational for many of these commands to function\&.
  
@@ -157,10 +157,10 @@
  
  .TP
  gss\-spnego\-client
-Index: samba-3.0.23/docs/manpages/tdbbackup.8
+Index: samba-3.0.23a/docs/manpages/tdbbackup.8
 ===================================================================
---- samba-3.0.23.orig/docs/manpages/tdbbackup.8	2006-07-11 08:58:32.958273789 +0200
-+++ samba-3.0.23/docs/manpages/tdbbackup.8	2006-07-11 08:59:28.162650714 +0200
+--- samba-3.0.23a.orig/docs/manpages/tdbbackup.8	2006-07-23 18:51:16.014432310 +0200
++++ samba-3.0.23a/docs/manpages/tdbbackup.8	2006-07-23 18:52:10.726875477 +0200
 @@ -72,13 +72,13 @@
  
  .TP 3
@@ -178,10 +178,10 @@
  .LP
  
  .SH "VERSION"
-Index: samba-3.0.23/docs/manpages/winbindd.8
+Index: samba-3.0.23a/docs/manpages/winbindd.8
 ===================================================================
---- samba-3.0.23.orig/docs/manpages/winbindd.8	2006-07-11 08:58:32.994274034 +0200
-+++ samba-3.0.23/docs/manpages/winbindd.8	2006-07-11 08:59:28.162650714 +0200
+--- samba-3.0.23a.orig/docs/manpages/winbindd.8	2006-07-23 18:51:16.082432861 +0200
++++ samba-3.0.23a/docs/manpages/winbindd.8	2006-07-23 18:52:10.730875510 +0200
 @@ -298,19 +298,19 @@
  The UNIX pipe over which clients communicate with the \fBwinbindd\fR program\&. For security reasons, the winbind client will only attempt to connect to the winbindd daemon if both the \fI/tmp/\&.winbindd\fR directory and \fI/tmp/\&.winbindd/pipe\fR file are owned by root\&.
  

Modified: trunk/patches/fhs.patch
===================================================================
--- trunk/patches/fhs.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/fhs.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/source/Makefile.in
+Index: samba-3.0.23a/source/Makefile.in
 ===================================================================
---- samba-3.0.23.orig/source/Makefile.in	2006-07-11 08:58:31.802265941 +0200
-+++ samba-3.0.23/source/Makefile.in	2006-07-11 08:59:29.326658704 +0200
+--- samba-3.0.23a.orig/source/Makefile.in	2006-07-23 18:51:13.902415207 +0200
++++ samba-3.0.23a/source/Makefile.in	2006-07-23 18:52:13.206895570 +0200
 @@ -100,6 +100,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.23/source/configure.in
+Index: samba-3.0.23a/source/configure.in
 ===================================================================
---- samba-3.0.23.orig/source/configure.in	2006-07-11 08:58:31.834266158 +0200
-+++ samba-3.0.23/source/configure.in	2006-07-11 08:59:29.334658759 +0200
+--- samba-3.0.23a.orig/source/configure.in	2006-07-23 18:51:14.046416373 +0200
++++ samba-3.0.23a/source/configure.in	2006-07-23 18:52:13.222895700 +0200
 @@ -37,7 +37,7 @@
  [  --with-fhs              Use FHS-compliant paths (default=no)],
  [ case "$withval" in
@@ -68,10 +68,10 @@
  AC_SUBST(rootsbindir)
  AC_SUBST(pammodulesdir)
  
-Index: samba-3.0.23/source/dynconfig.c
+Index: samba-3.0.23a/source/dynconfig.c
 ===================================================================
---- samba-3.0.23.orig/source/dynconfig.c	2006-07-11 08:58:31.862266348 +0200
-+++ samba-3.0.23/source/dynconfig.c	2006-07-11 08:59:29.334658759 +0200
+--- samba-3.0.23a.orig/source/dynconfig.c	2006-07-23 18:51:14.094416762 +0200
++++ samba-3.0.23a/source/dynconfig.c	2006-07-23 18:52:13.226895732 +0200
 @@ -53,6 +53,13 @@
  pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
  
@@ -114,10 +114,10 @@
 +	return lp_lockdir();
 +#endif
 +}
-Index: samba-3.0.23/source/groupdb/mapping.c
+Index: samba-3.0.23a/source/groupdb/mapping.c
 ===================================================================
---- samba-3.0.23.orig/source/groupdb/mapping.c	2006-07-11 08:58:31.894266565 +0200
-+++ samba-3.0.23/source/groupdb/mapping.c	2006-07-11 08:59:29.338658787 +0200
+--- samba-3.0.23a.orig/source/groupdb/mapping.c	2006-07-23 18:51:14.154417248 +0200
++++ samba-3.0.23a/source/groupdb/mapping.c	2006-07-23 18:52:13.230895765 +0200
 @@ -56,7 +56,7 @@
  	if (tdb)
  		return True;
@@ -127,10 +127,10 @@
  	if (!tdb) {
  		DEBUG(0,("Failed to open group mapping database\n"));
  		return False;
-Index: samba-3.0.23/source/include/dynconfig.h
+Index: samba-3.0.23a/source/include/dynconfig.h
 ===================================================================
---- samba-3.0.23.orig/source/include/dynconfig.h	2006-07-11 08:58:31.930266810 +0200
-+++ samba-3.0.23/source/include/dynconfig.h	2006-07-11 08:59:29.338658787 +0200
+--- samba-3.0.23a.orig/source/include/dynconfig.h	2006-07-23 18:51:14.214417734 +0200
++++ samba-3.0.23a/source/include/dynconfig.h	2006-07-23 18:52:13.230895765 +0200
 @@ -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.23/source/intl/lang_tdb.c
+Index: samba-3.0.23a/source/intl/lang_tdb.c
 ===================================================================
---- samba-3.0.23.orig/source/intl/lang_tdb.c	2006-07-11 08:58:31.962267027 +0200
-+++ samba-3.0.23/source/intl/lang_tdb.c	2006-07-11 08:59:29.338658787 +0200
+--- samba-3.0.23a.orig/source/intl/lang_tdb.c	2006-07-23 18:51:14.266418155 +0200
++++ samba-3.0.23a/source/intl/lang_tdb.c	2006-07-23 18:52:13.234895797 +0200
 @@ -131,7 +131,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.23/source/lib/util.c
+Index: samba-3.0.23a/source/lib/util.c
 ===================================================================
---- samba-3.0.23.orig/source/lib/util.c	2006-07-11 08:58:31.982267163 +0200
-+++ samba-3.0.23/source/lib/util.c	2006-07-11 08:59:29.346658842 +0200
+--- samba-3.0.23a.orig/source/lib/util.c	2006-07-23 18:51:14.318418576 +0200
++++ samba-3.0.23a/source/lib/util.c	2006-07-23 18:52:13.242895862 +0200
 @@ -2567,6 +2567,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.23/source/lib/util_unistr.c
+Index: samba-3.0.23a/source/lib/util_unistr.c
 ===================================================================
---- samba-3.0.23.orig/source/lib/util_unistr.c	2006-07-11 08:58:32.030267489 +0200
-+++ samba-3.0.23/source/lib/util_unistr.c	2006-07-11 08:59:29.346658842 +0200
+--- samba-3.0.23a.orig/source/lib/util_unistr.c	2006-07-23 18:51:14.370418997 +0200
++++ samba-3.0.23a/source/lib/util_unistr.c	2006-07-23 18:52:13.246895895 +0200
 @@ -88,10 +88,10 @@
  	}
  	initialised = 1;
@@ -249,10 +249,10 @@
  	if (valid_file) {
  		valid_table = valid_file;
  		mapped_file = 1;
-Index: samba-3.0.23/source/libsmb/samlogon_cache.c
+Index: samba-3.0.23a/source/libsmb/samlogon_cache.c
 ===================================================================
---- samba-3.0.23.orig/source/libsmb/samlogon_cache.c	2006-07-11 08:58:32.098267950 +0200
-+++ samba-3.0.23/source/libsmb/samlogon_cache.c	2006-07-11 08:59:29.350658869 +0200
+--- samba-3.0.23a.orig/source/libsmb/samlogon_cache.c	2006-07-23 18:51:14.502420066 +0200
++++ samba-3.0.23a/source/libsmb/samlogon_cache.c	2006-07-23 18:52:13.246895895 +0200
 @@ -34,7 +34,7 @@
  BOOL netsamlogon_cache_init(void)
  {
@@ -271,10 +271,10 @@
  				   TDB_DEFAULT, O_RDWR, 0600);
  		if (!tdb) {
  			DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
-Index: samba-3.0.23/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.0.23a/source/nmbd/nmbd_serverlistdb.c
 ===================================================================
---- samba-3.0.23.orig/source/nmbd/nmbd_serverlistdb.c	2006-07-11 08:58:32.130268168 +0200
-+++ samba-3.0.23/source/nmbd/nmbd_serverlistdb.c	2006-07-11 08:59:29.350658869 +0200
+--- samba-3.0.23a.orig/source/nmbd/nmbd_serverlistdb.c	2006-07-23 18:51:14.554420487 +0200
++++ samba-3.0.23a/source/nmbd/nmbd_serverlistdb.c	2006-07-23 18:52:13.250895927 +0200
 @@ -325,7 +325,7 @@
  
  	updatecount++;
@@ -284,10 +284,10 @@
  	trim_char(fname,'\0' ,'/');
  	pstrcat(fname,"/");
  	pstrcat(fname,SERVER_LIST);
-Index: samba-3.0.23/source/nmbd/nmbd_winsserver.c
+Index: samba-3.0.23a/source/nmbd/nmbd_winsserver.c
 ===================================================================
---- samba-3.0.23.orig/source/nmbd/nmbd_winsserver.c	2006-07-11 08:58:32.162268385 +0200
-+++ samba-3.0.23/source/nmbd/nmbd_winsserver.c	2006-07-11 08:59:29.366658979 +0200
+--- samba-3.0.23a.orig/source/nmbd/nmbd_winsserver.c	2006-07-23 18:51:14.610420940 +0200
++++ samba-3.0.23a/source/nmbd/nmbd_winsserver.c	2006-07-23 18:52:13.258895992 +0200
 @@ -585,7 +585,7 @@
  
  	add_samba_names_to_subnet(wins_server_subnet);
@@ -306,10 +306,10 @@
  	all_string_sub(fname,"//", "/", 0);
  	slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
  
-Index: samba-3.0.23/source/passdb/login_cache.c
+Index: samba-3.0.23a/source/passdb/login_cache.c
 ===================================================================
---- samba-3.0.23.orig/source/passdb/login_cache.c	2006-07-11 08:58:32.194268602 +0200
-+++ samba-3.0.23/source/passdb/login_cache.c	2006-07-11 08:59:29.366658979 +0200
+--- samba-3.0.23a.orig/source/passdb/login_cache.c	2006-07-23 18:51:14.662421361 +0200
++++ samba-3.0.23a/source/passdb/login_cache.c	2006-07-23 18:52:13.262896024 +0200
 @@ -36,7 +36,7 @@
  	/* skip file open if it's already opened */
  	if (cache) return True;
@@ -319,10 +319,10 @@
  	if (cache_fname)
  		DEBUG(5, ("Opening cache file at %s\n", cache_fname));
  	else {
-Index: samba-3.0.23/source/nsswitch/winbindd_cache.c
+Index: samba-3.0.23a/source/nsswitch/winbindd_cache.c
 ===================================================================
---- samba-3.0.23.orig/source/nsswitch/winbindd_cache.c	2006-07-11 08:58:32.294269281 +0200
-+++ samba-3.0.23/source/nsswitch/winbindd_cache.c	2006-07-11 08:59:29.370659007 +0200
+--- samba-3.0.23a.orig/source/nsswitch/winbindd_cache.c	2006-07-23 18:51:14.826422690 +0200
++++ samba-3.0.23a/source/nsswitch/winbindd_cache.c	2006-07-23 18:52:13.270896089 +0200
 @@ -1889,7 +1889,7 @@
  		return True;
  
@@ -330,22 +330,22 @@
 -	wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
 +	wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
  				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
- 				TDB_DEFAULT /*TDB_CLEAR_IF_FIRST*/, O_RDWR|O_CREAT, 0600);
- 
-@@ -2131,7 +2131,7 @@
+ 				lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), 
+ 				O_RDWR|O_CREAT, 0600);
+@@ -2132,7 +2132,7 @@
  		return;
  
  	/* when working offline we must not clear the cache on restart */
 -	wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
 +	wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
  				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
- 				TDB_DEFAULT /* TDB_CLEAR_IF_FIRST */, O_RDWR|O_CREAT, 0600);
- 
-Index: samba-3.0.23/source/nsswitch/winbindd_util.c
+ 				lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), 
+ 				O_RDWR|O_CREAT, 0600);
+Index: samba-3.0.23a/source/nsswitch/winbindd_util.c
 ===================================================================
---- samba-3.0.23.orig/source/nsswitch/winbindd_util.c	2006-07-11 08:58:32.330269526 +0200
-+++ samba-3.0.23/source/nsswitch/winbindd_util.c	2006-07-11 08:59:29.374659034 +0200
-@@ -1167,7 +1167,7 @@
+--- samba-3.0.23a.orig/source/nsswitch/winbindd_util.c	2006-07-23 18:51:14.878423111 +0200
++++ samba-3.0.23a/source/nsswitch/winbindd_util.c	2006-07-23 18:52:13.274896121 +0200
+@@ -1181,7 +1181,7 @@
  	SMB_STRUCT_STAT stbuf;
  	TDB_CONTEXT *idmap_tdb;
  
@@ -354,10 +354,10 @@
  
  	if (!file_exist(idmap_name, &stbuf)) {
  		/* nothing to convert return */
-Index: samba-3.0.23/source/param/loadparm.c
+Index: samba-3.0.23a/source/param/loadparm.c
 ===================================================================
---- samba-3.0.23.orig/source/param/loadparm.c	2006-07-11 08:58:32.362269743 +0200
-+++ samba-3.0.23/source/param/loadparm.c	2006-07-11 08:59:29.382659089 +0200
+--- samba-3.0.23a.orig/source/param/loadparm.c	2006-07-23 18:51:14.938423596 +0200
++++ samba-3.0.23a/source/param/loadparm.c	2006-07-23 18:52:13.294896283 +0200
 @@ -107,6 +107,9 @@
  	char *szAddPrinterCommand;
  	char *szDeletePrinterCommand;
@@ -382,10 +382,10 @@
  	{"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.23/source/passdb/secrets.c
+Index: samba-3.0.23a/source/passdb/secrets.c
 ===================================================================
---- samba-3.0.23.orig/source/passdb/secrets.c	2006-07-11 08:58:32.230268847 +0200
-+++ samba-3.0.23/source/passdb/secrets.c	2006-07-11 08:59:29.386659116 +0200
+--- samba-3.0.23a.orig/source/passdb/secrets.c	2006-07-23 18:51:14.718421815 +0200
++++ samba-3.0.23a/source/passdb/secrets.c	2006-07-23 18:52:13.298896316 +0200
 @@ -58,8 +58,7 @@
  	if (tdb)
  		return True;
@@ -396,10 +396,10 @@
  
  	tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
  
-Index: samba-3.0.23/source/printing/nt_printing.c
+Index: samba-3.0.23a/source/printing/nt_printing.c
 ===================================================================
---- samba-3.0.23.orig/source/printing/nt_printing.c	2006-07-11 08:58:32.394269960 +0200
-+++ samba-3.0.23/source/printing/nt_printing.c	2006-07-11 08:59:29.394659171 +0200
+--- samba-3.0.23a.orig/source/printing/nt_printing.c	2006-07-23 18:51:14.986423985 +0200
++++ samba-3.0.23a/source/printing/nt_printing.c	2006-07-23 18:52:13.314896445 +0200
 @@ -551,28 +551,28 @@
   
  	if (tdb_drivers)
@@ -444,10 +444,10 @@
  		pstrcat(printdb_path, sharename);
  		pstrcat(printdb_path, ".tdb");
  
-Index: samba-3.0.23/source/printing/printing.c
+Index: samba-3.0.23a/source/printing/printing.c
 ===================================================================
---- samba-3.0.23.orig/source/printing/printing.c	2006-07-11 08:58:32.422270150 +0200
-+++ samba-3.0.23/source/printing/printing.c	2006-07-11 08:59:29.398659199 +0200
+--- samba-3.0.23a.orig/source/printing/printing.c	2006-07-23 18:51:15.038424406 +0200
++++ samba-3.0.23a/source/printing/printing.c	2006-07-23 18:52:13.322896510 +0200
 @@ -183,8 +183,8 @@
  	int services = lp_numservices();
  	int snum;
@@ -459,10 +459,10 @@
  	mkdir(printing_path,0755);
  
  	/* handle a Samba upgrade */
-Index: samba-3.0.23/source/printing/printing_db.c
+Index: samba-3.0.23a/source/printing/printing_db.c
 ===================================================================
---- samba-3.0.23.orig/source/printing/printing_db.c	2006-07-11 08:58:32.454270367 +0200
-+++ samba-3.0.23/source/printing/printing_db.c	2006-07-11 08:59:29.402659226 +0200
+--- samba-3.0.23a.orig/source/printing/printing_db.c	2006-07-23 18:51:15.094424860 +0200
++++ samba-3.0.23a/source/printing/printing_db.c	2006-07-23 18:52:13.326896543 +0200
 @@ -91,7 +91,7 @@
  		DLIST_ADD(print_db_head, p);
  	}
@@ -472,10 +472,10 @@
  	pstrcat(printdb_path, printername);
  	pstrcat(printdb_path, ".tdb");
  
-Index: samba-3.0.23/source/sam/idmap_tdb.c
+Index: samba-3.0.23a/source/sam/idmap_tdb.c
 ===================================================================
---- samba-3.0.23.orig/source/sam/idmap_tdb.c	2006-07-11 08:58:32.490270612 +0200
-+++ samba-3.0.23/source/sam/idmap_tdb.c	2006-07-11 08:59:29.402659226 +0200
+--- samba-3.0.23a.orig/source/sam/idmap_tdb.c	2006-07-23 18:51:15.150425313 +0200
++++ samba-3.0.23a/source/sam/idmap_tdb.c	2006-07-23 18:52:13.326896543 +0200
 @@ -449,7 +449,7 @@
  	BOOL tdb_is_new = False;
  
@@ -485,10 +485,10 @@
  	if (!tdbfile) {
  		DEBUG(0, ("idmap_init: out of memory!\n"));
  		return NT_STATUS_NO_MEMORY;
-Index: samba-3.0.23/source/smbd/lanman.c
+Index: samba-3.0.23a/source/smbd/lanman.c
 ===================================================================
---- samba-3.0.23.orig/source/smbd/lanman.c	2006-07-11 08:58:32.522270829 +0200
-+++ samba-3.0.23/source/smbd/lanman.c	2006-07-11 08:59:29.406659254 +0200
+--- samba-3.0.23a.orig/source/smbd/lanman.c	2006-07-23 18:51:15.210425799 +0200
++++ samba-3.0.23a/source/smbd/lanman.c	2006-07-23 18:52:13.338896640 +0200
 @@ -1052,9 +1052,9 @@
  	BOOL local_list_only;
  	int i;
@@ -501,10 +501,10 @@
  		return 0;
  	}
  
-Index: samba-3.0.23/source/utils/net_idmap.c
+Index: samba-3.0.23a/source/utils/net_idmap.c
 ===================================================================
---- samba-3.0.23.orig/source/utils/net_idmap.c	2006-07-11 08:58:32.554271046 +0200
-+++ samba-3.0.23/source/utils/net_idmap.c	2006-07-11 08:59:29.410659281 +0200
+--- samba-3.0.23a.orig/source/utils/net_idmap.c	2006-07-23 18:51:15.262426220 +0200
++++ samba-3.0.23a/source/utils/net_idmap.c	2006-07-23 18:52:13.342896672 +0200
 @@ -136,7 +136,7 @@
  		return NT_STATUS_UNSUCCESSFUL;
  	}
@@ -514,10 +514,10 @@
  	if (!tdbfile) {
  		DEBUG(0, ("idmap_init: out of memory!\n"));
  		return NT_STATUS_NO_MEMORY;
-Index: samba-3.0.23/source/registry/reg_db.c
+Index: samba-3.0.23a/source/registry/reg_db.c
 ===================================================================
---- samba-3.0.23.orig/source/registry/reg_db.c	2006-07-11 08:58:32.582271236 +0200
-+++ samba-3.0.23/source/registry/reg_db.c	2006-07-11 08:59:29.410659281 +0200
+--- samba-3.0.23a.orig/source/registry/reg_db.c	2006-07-23 18:51:15.314426641 +0200
++++ samba-3.0.23a/source/registry/reg_db.c	2006-07-23 18:52:13.346896705 +0200
 @@ -205,12 +205,12 @@
  	if ( tdb_reg )
  		return True;
@@ -548,10 +548,10 @@
  	}
  
  	unbecome_root();
-Index: samba-3.0.23/source/lib/account_pol.c
+Index: samba-3.0.23a/source/lib/account_pol.c
 ===================================================================
---- samba-3.0.23.orig/source/lib/account_pol.c	2006-07-11 08:58:32.066267733 +0200
-+++ samba-3.0.23/source/lib/account_pol.c	2006-07-11 08:59:29.414659309 +0200
+--- samba-3.0.23a.orig/source/lib/account_pol.c	2006-07-23 18:51:14.446419612 +0200
++++ samba-3.0.23a/source/lib/account_pol.c	2006-07-23 18:52:13.350896737 +0200
 @@ -262,7 +262,7 @@
  		return True;
  	}
@@ -561,10 +561,10 @@
  	if (!tdb) {
  		DEBUG(0,("Failed to open account policy database\n"));
  		return False;
-Index: samba-3.0.23/source/registry/reg_perfcount.c
+Index: samba-3.0.23a/source/registry/reg_perfcount.c
 ===================================================================
---- samba-3.0.23.orig/source/registry/reg_perfcount.c	2006-07-11 08:58:32.614271454 +0200
-+++ samba-3.0.23/source/registry/reg_perfcount.c	2006-07-11 08:59:29.414659309 +0200
+--- samba-3.0.23a.orig/source/registry/reg_perfcount.c	2006-07-23 18:51:15.370427095 +0200
++++ samba-3.0.23a/source/registry/reg_perfcount.c	2006-07-23 18:52:13.354896770 +0200
 @@ -44,7 +44,7 @@
  	
  	fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
@@ -583,10 +583,10 @@
  
  	/* no registry keys; just create the perfmon directory */
  	
-Index: samba-3.0.23/source/rpc_server/srv_eventlog_lib.c
+Index: samba-3.0.23a/source/rpc_server/srv_eventlog_lib.c
 ===================================================================
---- samba-3.0.23.orig/source/rpc_server/srv_eventlog_lib.c	2006-07-11 08:58:32.654271725 +0200
-+++ samba-3.0.23/source/rpc_server/srv_eventlog_lib.c	2006-07-11 08:59:29.418659336 +0200
+--- samba-3.0.23a.orig/source/rpc_server/srv_eventlog_lib.c	2006-07-23 18:51:15.438427645 +0200
++++ samba-3.0.23a/source/rpc_server/srv_eventlog_lib.c	2006-07-23 18:52:13.358896802 +0200
 @@ -67,7 +67,7 @@
  {
  	fstring path;
@@ -605,11 +605,11 @@
  	if ( !directory_exist( eventlogdir, NULL ) )
  		mkdir( eventlogdir, 0755 );	
  	
-Index: samba-3.0.23/source/passdb/pdb_tdb.c
+Index: samba-3.0.23a/source/passdb/pdb_tdb.c
 ===================================================================
---- samba-3.0.23.orig/source/passdb/pdb_tdb.c	2006-07-11 08:58:32.266269091 +0200
-+++ samba-3.0.23/source/passdb/pdb_tdb.c	2006-07-11 08:59:29.422659364 +0200
-@@ -1598,7 +1598,7 @@
+--- samba-3.0.23a.orig/source/passdb/pdb_tdb.c	2006-07-23 18:51:14.774422268 +0200
++++ samba-3.0.23a/source/passdb/pdb_tdb.c	2006-07-23 18:52:13.362896834 +0200
+@@ -1608,7 +1608,7 @@
  	/* save the path for later */
  			   
  	if ( !location ) {

Modified: trunk/patches/installswat.sh.patch
===================================================================
--- trunk/patches/installswat.sh.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/installswat.sh.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/source/script/installswat.sh
+Index: samba-3.0.23a/source/script/installswat.sh
 ===================================================================
---- samba-3.0.23.orig/source/script/installswat.sh	2006-07-11 08:58:31.342262818 +0200
-+++ samba-3.0.23/source/script/installswat.sh	2006-07-11 08:59:31.930676587 +0200
+--- samba-3.0.23a.orig/source/script/installswat.sh	2006-07-23 18:51:13.042408243 +0200
++++ samba-3.0.23a/source/script/installswat.sh	2006-07-23 18:52:17.638931480 +0200
 @@ -194,7 +194,11 @@
  
  # Install/ remove Using Samba book (but only if it is there)

Modified: trunk/patches/make-distclean.patch
===================================================================
--- trunk/patches/make-distclean.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/make-distclean.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/source/Makefile.in
+Index: samba-3.0.23a/source/Makefile.in
 ===================================================================
---- samba-3.0.23.orig/source/Makefile.in	2006-07-11 08:59:29.326658704 +0200
-+++ samba-3.0.23/source/Makefile.in	2006-07-11 08:59:32.806682604 +0200
+--- samba-3.0.23a.orig/source/Makefile.in	2006-07-23 18:52:13.206895570 +0200
++++ samba-3.0.23a/source/Makefile.in	2006-07-23 18:52:19.762948690 +0200
 @@ -1521,6 +1521,7 @@
  
  python_clean:

Modified: trunk/patches/nmbd-signalling.patch
===================================================================
--- trunk/patches/nmbd-signalling.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/nmbd-signalling.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/source/nmbd/nmbd_subnetdb.c
+Index: samba-3.0.23a/source/nmbd/nmbd_subnetdb.c
 ===================================================================
---- samba-3.0.23.orig/source/nmbd/nmbd_subnetdb.c	2006-07-11 08:58:30.918259940 +0200
-+++ samba-3.0.23/source/nmbd/nmbd_subnetdb.c	2006-07-11 08:59:33.706688788 +0200
+--- samba-3.0.23a.orig/source/nmbd/nmbd_subnetdb.c	2006-07-23 18:51:12.342402575 +0200
++++ samba-3.0.23a/source/nmbd/nmbd_subnetdb.c	2006-07-23 18:52:21.750964799 +0200
 @@ -185,12 +185,16 @@
  	struct in_addr unicast_ip, ipzero;
  

Modified: trunk/patches/non-linux-ports.patch
===================================================================
--- trunk/patches/non-linux-ports.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/non-linux-ports.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/source/configure.in
+Index: samba-3.0.23a/source/configure.in
 ===================================================================
---- samba-3.0.23.orig/source/configure.in	2006-07-11 08:59:29.334658759 +0200
-+++ samba-3.0.23/source/configure.in	2006-07-11 08:59:34.602694945 +0200
+--- samba-3.0.23a.orig/source/configure.in	2006-07-23 18:52:13.222895700 +0200
++++ samba-3.0.23a/source/configure.in	2006-07-23 18:52:23.610979870 +0200
 @@ -755,6 +755,15 @@
        fi
      ;;
@@ -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" 
-@@ -5014,7 +5026,7 @@
+@@ -5028,7 +5040,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>],
  [\
-@@ -5277,10 +5289,10 @@
+@@ -5291,10 +5303,10 @@
  WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS
  
  case "$host_os" in

Modified: trunk/patches/nonpic-libsmbclient.patch
===================================================================
--- trunk/patches/nonpic-libsmbclient.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/nonpic-libsmbclient.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/source/Makefile.in
+Index: samba-3.0.23a/source/Makefile.in
 ===================================================================
---- samba-3.0.23.orig/source/Makefile.in	2006-07-11 08:59:32.806682604 +0200
-+++ samba-3.0.23/source/Makefile.in	2006-07-11 08:59:35.490701048 +0200
+--- samba-3.0.23a.orig/source/Makefile.in	2006-07-23 18:52:19.762948690 +0200
++++ samba-3.0.23a/source/Makefile.in	2006-07-23 18:52:25.458994844 +0200
 @@ -1098,9 +1098,9 @@
  		$(KRB5LIBS) $(LDAP_LIBS) \
  		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)

Modified: trunk/patches/pam-examples.patch
===================================================================
--- trunk/patches/pam-examples.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/pam-examples.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/source/pam_smbpass/README
+Index: samba-3.0.23a/source/pam_smbpass/README
 ===================================================================
---- samba-3.0.23.orig/source/pam_smbpass/README	2006-07-11 08:58:30.322255895 +0200
-+++ samba-3.0.23/source/pam_smbpass/README	2006-07-11 08:59:36.398707290 +0200
+--- samba-3.0.23a.orig/source/pam_smbpass/README	2006-07-23 18:51:11.330394380 +0200
++++ samba-3.0.23a/source/pam_smbpass/README	2006-07-23 18:52:27.115008263 +0200
 @@ -37,7 +37,7 @@
  	smbconf=<file>	-	specify an alternate path to the smb.conf
  				file.

Modified: trunk/patches/samba.patch
===================================================================
--- trunk/patches/samba.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/samba.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/source/client/smbmount.c
+Index: samba-3.0.23a/source/client/smbmount.c
 ===================================================================
---- samba-3.0.23.orig/source/client/smbmount.c	2006-07-11 08:58:29.918253154 +0200
-+++ samba-3.0.23/source/client/smbmount.c	2006-07-11 08:59:38.182719556 +0200
+--- samba-3.0.23a.orig/source/client/smbmount.c	2006-07-23 18:51:07.662364679 +0200
++++ samba-3.0.23a/source/client/smbmount.c	2006-07-23 18:52:30.375034680 +0200
 @@ -767,7 +767,7 @@
  					*lp = 0;
  					pstrcpy(password,lp+1);
@@ -29,10 +29,10 @@
  		}
  		strupper_m(username);
  	}
-Index: samba-3.0.23/source/web/diagnose.c
+Index: samba-3.0.23a/source/web/diagnose.c
 ===================================================================
---- samba-3.0.23.orig/source/web/diagnose.c	2006-07-11 08:58:29.950253371 +0200
-+++ samba-3.0.23/source/web/diagnose.c	2006-07-11 08:59:38.182719556 +0200
+--- samba-3.0.23a.orig/source/web/diagnose.c	2006-07-23 18:51:07.718365132 +0200
++++ samba-3.0.23a/source/web/diagnose.c	2006-07-23 18:52:30.379034712 +0200
 @@ -62,6 +62,7 @@
  {
  	static struct cli_state cli;
@@ -41,10 +41,10 @@
  	if (!cli_initialise(&cli))
  		return False;
  
-Index: samba-3.0.23/source/script/installbin.sh.in
+Index: samba-3.0.23a/source/script/installbin.sh.in
 ===================================================================
---- samba-3.0.23.orig/source/script/installbin.sh.in	2006-07-11 08:58:29.990253642 +0200
-+++ samba-3.0.23/source/script/installbin.sh.in	2006-07-11 08:59:38.182719556 +0200
+--- samba-3.0.23a.orig/source/script/installbin.sh.in	2006-07-23 18:51:07.782365651 +0200
++++ samba-3.0.23a/source/script/installbin.sh.in	2006-07-23 18:52:30.379034712 +0200
 @@ -21,13 +21,15 @@
   chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
  

Modified: trunk/patches/smbclient-pager.patch
===================================================================
--- trunk/patches/smbclient-pager.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/smbclient-pager.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/source/include/local.h
+Index: samba-3.0.23a/source/include/local.h
 ===================================================================
---- samba-3.0.23.orig/source/include/local.h	2006-07-11 08:58:29.682251552 +0200
-+++ samba-3.0.23/source/include/local.h	2006-07-11 08:59:39.166726323 +0200
+--- samba-3.0.23a.orig/source/include/local.h	2006-07-23 18:51:07.234361213 +0200
++++ samba-3.0.23a/source/include/local.h	2006-07-23 18:52:32.147049039 +0200
 @@ -109,7 +109,7 @@
  /* the default pager to use for the client "more" command. Users can
     override this with the PAGER environment variable */

Modified: trunk/patches/smbmount-mtab-flags.patch
===================================================================
--- trunk/patches/smbmount-mtab-flags.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/smbmount-mtab-flags.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/source/client/smbmnt.c
+Index: samba-3.0.23a/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.23.orig/source/client/smbmnt.c	2006-07-11 08:58:29.518250440 +0200
-+++ samba-3.0.23/source/client/smbmnt.c	2006-07-11 08:59:40.038732321 +0200
+--- samba-3.0.23a.orig/source/client/smbmnt.c	2006-07-23 18:51:06.830357942 +0200
++++ samba-3.0.23a/source/client/smbmnt.c	2006-07-23 18:52:33.747062005 +0200
 @@ -276,7 +276,10 @@
          ment.mnt_fsname = share_name ? share_name : "none";
          ment.mnt_dir = mount_point;

Modified: trunk/patches/smbmount-nomtab.patch
===================================================================
--- trunk/patches/smbmount-nomtab.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/smbmount-nomtab.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/source/client/smbmnt.c
+Index: samba-3.0.23a/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.23.orig/source/client/smbmnt.c	2006-07-11 08:59:40.038732321 +0200
-+++ samba-3.0.23/source/client/smbmnt.c	2006-07-11 08:59:40.922738402 +0200
+--- samba-3.0.23a.orig/source/client/smbmnt.c	2006-07-23 18:52:33.747062005 +0200
++++ samba-3.0.23a/source/client/smbmnt.c	2006-07-23 18:52:35.367075133 +0200
 @@ -44,6 +44,7 @@
  static uid_t mount_uid;
  static gid_t mount_gid;
@@ -103,10 +103,10 @@
  
  	return 0;
  }	
-Index: samba-3.0.23/source/client/smbmount.c
+Index: samba-3.0.23a/source/client/smbmount.c
 ===================================================================
---- samba-3.0.23.orig/source/client/smbmount.c	2006-07-11 08:59:38.182719556 +0200
-+++ samba-3.0.23/source/client/smbmount.c	2006-07-11 08:59:40.942738540 +0200
+--- samba-3.0.23a.orig/source/client/smbmount.c	2006-07-23 18:52:30.375034680 +0200
++++ samba-3.0.23a/source/client/smbmount.c	2006-07-23 18:52:35.419075555 +0200
 @@ -46,6 +46,7 @@
  static int mount_ro;
  static unsigned mount_fmask;

Modified: trunk/patches/smbmount-unix-caps.patch
===================================================================
--- trunk/patches/smbmount-unix-caps.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/smbmount-unix-caps.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/source/client/smbmount.c
+Index: samba-3.0.23a/source/client/smbmount.c
 ===================================================================
---- samba-3.0.23.orig/source/client/smbmount.c	2006-07-11 08:59:40.942738540 +0200
-+++ samba-3.0.23/source/client/smbmount.c	2006-07-11 08:59:41.874744953 +0200
+--- samba-3.0.23a.orig/source/client/smbmount.c	2006-07-23 18:52:35.419075555 +0200
++++ samba-3.0.23a/source/client/smbmount.c	2006-07-23 18:52:37.219090141 +0200
 @@ -211,6 +211,10 @@
    		c->capabilities &= ~CAP_STATUS32;
  		c->force_dos_errors = True;

Modified: trunk/patches/smbstatus-locking.patch
===================================================================
--- trunk/patches/smbstatus-locking.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/smbstatus-locking.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/source/utils/status.c
+Index: samba-3.0.23a/source/utils/status.c
 ===================================================================
---- samba-3.0.23.orig/source/utils/status.c	2006-07-11 08:58:28.846245880 +0200
-+++ samba-3.0.23/source/utils/status.c	2006-07-11 08:59:42.766751091 +0200
+--- samba-3.0.23a.orig/source/utils/status.c	2006-07-23 18:51:04.990343043 +0200
++++ samba-3.0.23a/source/utils/status.c	2006-07-23 18:52:39.187106090 +0200
 @@ -714,6 +714,16 @@
  	if ( show_locks ) {
  		int ret;

Modified: trunk/patches/undefined-symbols.patch
===================================================================
--- trunk/patches/undefined-symbols.patch	2006-07-23 15:35:13 UTC (rev 1096)
+++ trunk/patches/undefined-symbols.patch	2006-07-23 17:54:41 UTC (rev 1097)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23/source/Makefile.in
+Index: samba-3.0.23a/source/Makefile.in
 ===================================================================
---- samba-3.0.23.orig/source/Makefile.in	2006-07-11 08:59:35.490701048 +0200
-+++ samba-3.0.23/source/Makefile.in	2006-07-11 08:59:43.654757203 +0200
+--- samba-3.0.23a.orig/source/Makefile.in	2006-07-23 18:52:25.458994844 +0200
++++ samba-3.0.23a/source/Makefile.in	2006-07-23 18:52:40.867119705 +0200
 @@ -692,7 +692,8 @@
              $(RPC_NTSVCS_OBJ) utils/passwd_util.o
  




More information about the Pkg-samba-maint mailing list