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

Christian Perrier bubulle at costa.debian.org
Sat Feb 25 11:00:14 UTC 2006


Author: bubulle
Date: 2006-02-25 11:00:12 +0000 (Sat, 25 Feb 2006)
New Revision: 1032

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/series
   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:
Adapt patches for the new upstream release
Please note that libnss-soname.patch is now disabled as
a similar patch has been applied upstream


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-02-14 18:01:27 UTC (rev 1031)
+++ trunk/changelog	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,13 +1,14 @@
-samba (3.0.21b-2) UNRELEASED; urgency=low
+samba (3.0.21c-1) UNRELEASED; urgency=low
 
+  * New upstream release
   * add a few logon-related parameters as good and safe
     examples for *DC-type settings. Closes: #349051
   * add an example "add user script". Closes: #349050
   * drop outdated information from the smbfs package description
     Closes: #352828
-  
- -- Christian Perrier <bubulle at debian.org>  Wed,  8 Feb 2006 18:39:15 +0100
 
+ -- Christian Perrier <bubulle at debian.org>  Sat, 25 Feb 2006 11:58:45 +0100
+
 samba (3.0.21b-1) unstable; urgency=low
 
   * The "Tridge" release: celebrates the 2005 Free Software Award winner

Modified: trunk/patches/README_nosmbldap-tools.patch
===================================================================
--- trunk/patches/README_nosmbldap-tools.patch	2006-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/README_nosmbldap-tools.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,7 +1,7 @@
-Index: samba-3.0.21a.new/examples/LDAP/README
+Index: samba-3.0.21c/examples/LDAP/README
 ===================================================================
---- samba-3.0.21a.new.orig/examples/LDAP/README	2005-02-25 18:59:51.000000000 +0100
-+++ samba-3.0.21a.new/examples/LDAP/README	2006-01-02 09:53:32.809543869 +0100
+--- samba-3.0.21c.orig/examples/LDAP/README	2006-02-25 11:57:10.555568543 +0100
++++ samba-3.0.21c/examples/LDAP/README	2006-02-25 11:58:22.890973598 +0100
 @@ -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-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/VERSION.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,7 +1,7 @@
-Index: samba-3.0.21b/source/VERSION
+Index: samba-3.0.21c/source/VERSION
 ===================================================================
---- samba-3.0.21b.orig/source/VERSION	2006-01-25 00:46:41.000000000 +0100
-+++ samba-3.0.21b/source/VERSION	2006-02-04 08:11:10.649710209 +0100
+--- samba-3.0.21c.orig/source/VERSION	2006-02-25 11:57:09.547771875 +0100
++++ samba-3.0.21c/source/VERSION	2006-02-25 11:58:31.684199318 +0100
 @@ -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-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/adapt_machine_creation_script.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -3,10 +3,10 @@
 
 Status wrt upstream: Debian specific
 
-Index: samba-3.0.21b/docs/manpages/smb.conf.5
+Index: samba-3.0.21c/docs/manpages/smb.conf.5
 ===================================================================
---- samba-3.0.21b.orig/docs/manpages/smb.conf.5	2006-02-05 23:58:28.000000000 -0800
-+++ samba-3.0.21b/docs/manpages/smb.conf.5	2006-02-05 23:58:36.000000000 -0800
+--- samba-3.0.21c.orig/docs/manpages/smb.conf.5	2006-02-25 11:57:09.465788416 +0100
++++ samba-3.0.21c/docs/manpages/smb.conf.5	2006-02-25 11:58:33.128907806 +0100
 @@ -454,7 +454,7 @@
  
  Default: \fB\fIadd machine script\fR = \fR 

Modified: trunk/patches/autoconf.patch
===================================================================
--- trunk/patches/autoconf.patch	2006-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/autoconf.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,13 +1,13 @@
-Index: samba-3.0.21b/source/configure
+Index: samba-3.0.21c/source/configure
 ===================================================================
---- samba-3.0.21b.orig/source/configure	2006-02-05 23:55:47.000000000 -0800
-+++ samba-3.0.21b/source/configure	2006-02-05 23:57:57.000000000 -0800
+--- samba-3.0.21c.orig/source/configure	2006-02-25 11:57:09.379805763 +0100
++++ samba-3.0.21c/source/configure	2006-02-25 11:58:34.257680043 +0100
 @@ -310,7 +310,7 @@
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configdir lockdir piddir logfilebase privatedir swatdir LDSHFLAGS SONAMEFLAG SHLD HOST_OS PICFLAGS PICSUFFIX libc_cv_fpie PIE_CFLAGS PIE_LDFLAGS SHLIBEXT INSTALLLIBCMD_SH INSTALLLIBCMD_A INSTALL_LIBMSRPC LIBMSRPC_SHARED LIBMSRPC INSTALL_LIBSMBCLIENT LIBSMBCLIENT_SHARED LIBSMBCLIENT INSTALL_LIBSMBSHAREMODES LIBSMBSHAREMODES_SHARED LIBSMBSHAREMODES PRINT_LIBS AUTH_LIBS ACL_LIBS PASSDB_LIBS IDMAP_LIBS KRB5_LIBS LDAP_LIBS SHLIB_PROGS SMBWRAPPER SMBWRAP_OBJS SMBWRAP_INC EXTRA_BIN_PROGS EXTRA_SBIN_PROGS EXTRA_ALL_TARGETS CONFIG_LIBS SOCKWRAP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK PERL AR ac_ct_AR BROKEN_CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os EGREP CUPS_CONFIG LIBOBJS TERMLIBS TERMLDFLAGS ROFF DYNEXP SMBLDAP SMBLDAPUTIL KRB5CONFIG XML2_CONFIG XML_CFLAGS XML_LIBS MYSQL_CONFIG MYSQL_CFLAGS MYSQL_LIBS PGSQL_CONFIG PGSQL_CFLAGS PGSQL_LIBS WINBIND_NSS WINBIND_WINS_NSS WINBIND_NSS_LDSHFLAGS WINBIND_NSS_EXTRA_OBJS WINBIND_NSS_EXTRA_LIBS BUILD_POPT POPTLIBS FLAGS1 PYTHON PDB_STATIC PDB_MODULES RPC_STATIC RPC_MODULES IDMAP_STATIC IDMAP_MODULES CHARSET_STATIC CHARSET_MODULES AUTH_STATIC AUTH_MODULES VFS_STATIC VFS_MODULES builddir LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configdir lockdir piddir logfilebase privatedir swatdir codepagedir statedir cachedir LDSHFLAGS SONAMEFLAG SHLD HOST_OS PICFLAGS PICSUFFIX libc_cv_fpie PIE_CFLAGS PIE_LDFLAGS SHLIBEXT INSTALLLIBCMD_SH INSTALLLIBCMD_A INSTALL_LIBMSRPC LIBMSRPC_SHARED LIBMSRPC INSTALL_LIBSMBCLIENT LIBSMBCLIENT_SHARED LIBSMBCLIENT INSTALL_LIBSMBSHAREMODES LIBSMBSHAREMODES_SHARED LIBSMBSHAREMODES PRINT_LIBS AUTH_LIBS ACL_LIBS PASSDB_LIBS IDMAP_LIBS KRB5_LIBS LDAP_LIBS SHLIB_PROGS SMBWRAPPER SMBWRAP_OBJS SMBWRAP_INC EXTRA_BIN_PROGS EXTRA_SBIN_PROGS EXTRA_ALL_TARGETS CONFIG_LIBS SOCKWRAP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK PERL AR ac_ct_AR BROKEN_CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os EGREP CUPS_CONFIG LIBOBJS TERMLIBS TERMLDFLAGS ROFF DYNEXP SMBLDAP SMBLDAPUTIL KRB5CONFIG XML2_CONFIG XML_CFLAGS XML_LIBS MYSQL_CONFIG MYSQL_CFLAGS MYSQL_LIBS PGSQL_CONFIG PGSQL_CFLAGS PGSQL_LIBS WINBIND_NSS WINBIND_WINS_NSS WINBIND_NSS_LDSHFLAGS WINBIND_NSS_EXTRA_OBJS WINBIND_NSS_EXTRA_LIBS BUILD_POPT POPTLIBS FLAGS1 PYTHON PDB_STATIC PDB_MODULES RPC_STATIC RPC_MODULES IDMAP_STATIC IDMAP_MODULES CHARSET_STATIC CHARSET_MODULES AUTH_STATIC AUTH_MODULES VFS_STATIC VFS_MODULES builddir LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configdir lockdir piddir logfilebase privatedir swatdir LDSHFLAGS SONAMEFLAG SONAMEVERSIONSUFFIX SHLD HOST_OS PICFLAGS PICSUFFIX libc_cv_fpie PIE_CFLAGS PIE_LDFLAGS SHLIBEXT INSTALLLIBCMD_SH INSTALLLIBCMD_A INSTALL_LIBMSRPC LIBMSRPC_SHARED LIBMSRPC INSTALL_LIBSMBCLIENT LIBSMBCLIENT_SHARED LIBSMBCLIENT INSTALL_LIBSMBSHAREMODES LIBSMBSHAREMODES_SHARED LIBSMBSHAREMODES PRINT_LIBS AUTH_LIBS ACL_LIBS PASSDB_LIBS IDMAP_LIBS KRB5_LIBS LDAP_LIBS SHLIB_PROGS SMBWRAPPER SMBWRAP_OBJS SMBWRAP_INC EXTRA_BIN_PROGS EXTRA_SBIN_PROGS EXTRA_ALL_TARGETS CONFIG_LIBS SOCKWRAP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK PERL AR ac_ct_AR BROKEN_CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os EGREP CUPS_CONFIG LIBOBJS TERMLIBS TERMLDFLAGS ROFF DYNEXP SMBLDAP SMBLDAPUTIL KRB5CONFIG XML2_CONFIG XML_CFLAGS XML_LIBS MYSQL_CONFIG MYSQL_CFLAGS MYSQL_LIBS PGSQL_CONFIG PGSQL_CFLAGS PGSQL_LIBS WINBIND_NSS WINBIND_WINS_NSS WINBIND_NSS_LDSHFLAGS WINBIND_NSS_EXTRA_OBJS WINBIND_NSS_EXTRA_LIBS BUILD_POPT POPTLIBS FLAGS1 PYTHON PDB_STATIC PDB_MODULES RPC_STATIC RPC_MODULES IDMAP_STATIC IDMAP_MODULES CHARSET_STATIC CHARSET_MODULES AUTH_STATIC AUTH_MODULES VFS_STATIC VFS_MODULES builddir LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configdir lockdir piddir logfilebase privatedir swatdir codepagedir statedir cachedir LDSHFLAGS SONAMEFLAG SONAMEVERSIONSUFFIX SHLD HOST_OS PICFLAGS PICSUFFIX libc_cv_fpie PIE_CFLAGS PIE_LDFLAGS SHLIBEXT INSTALLLIBCMD_SH INSTALLLIBCMD_A INSTALL_LIBMSRPC LIBMSRPC_SHARED LIBMSRPC INSTALL_LIBSMBCLIENT LIBSMBCLIENT_SHARED LIBSMBCLIENT INSTALL_LIBSMBSHAREMODES LIBSMBSHAREMODES_SHARED LIBSMBSHAREMODES PRINT_LIBS AUTH_LIBS ACL_LIBS PASSDB_LIBS IDMAP_LIBS KRB5_LIBS LDAP_LIBS SHLIB_PROGS SMBWRAPPER SMBWRAP_OBJS SMBWRAP_INC EXTRA_BIN_PROGS EXTRA_SBIN_PROGS EXTRA_ALL_TARGETS CONFIG_LIBS SOCKWRAP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK PERL AR ac_ct_AR BROKEN_CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os EGREP CUPS_CONFIG LIBOBJS TERMLIBS TERMLDFLAGS ROFF DYNEXP SMBLDAP SMBLDAPUTIL KRB5CONFIG XML2_CONFIG XML_CFLAGS XML_LIBS MYSQL_CONFIG MYSQL_CFLAGS MYSQL_LIBS PGSQL_CONFIG PGSQL_CFLAGS PGSQL_LIBS WINBIND_NSS WINBIND_WINS_NSS WINBIND_NSS_LDSHFLAGS WINBIND_NSS_EXTRA_OBJS WINBIND_NSS_EXTRA_LIBS BUILD_POPT POPTLIBS FLAGS1 PYTHON PDB_STATIC PDB_MODULES RPC_STATIC RPC_MODULES IDMAP_STATIC IDMAP_MODULES CHARSET_STATIC CHARSET_MODULES AUTH_STATIC AUTH_MODULES VFS_STATIC VFS_MODULES builddir LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
@@ -44,7 +44,7 @@
      ;;
    esac
  fi;
-@@ -1680,6 +1688,9 @@
+@@ -1681,6 +1689,9 @@
  
  
  
@@ -54,7 +54,7 @@
  # Set defaults
  PIE_CFLAGS=""
  PIE_LDFLAGS=""
-@@ -2322,8 +2333,7 @@
+@@ -2323,8 +2334,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=$?
-@@ -2381,8 +2391,7 @@
+@@ -2382,8 +2392,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=$?
-@@ -2498,8 +2507,7 @@
+@@ -2499,8 +2508,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=$?
-@@ -2553,8 +2561,7 @@
+@@ -2554,8 +2562,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=$?
-@@ -2599,8 +2606,7 @@
+@@ -2600,8 +2607,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=$?
-@@ -2644,8 +2650,7 @@
+@@ -2645,8 +2651,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=$?
-@@ -3168,8 +3173,7 @@
+@@ -3169,8 +3174,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=$?
-@@ -3227,8 +3231,7 @@
+@@ -3228,8 +3232,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=$?
-@@ -3344,8 +3347,7 @@
+@@ -3345,8 +3348,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=$?
-@@ -3399,8 +3401,7 @@
+@@ -3400,8 +3402,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=$?
-@@ -3445,8 +3446,7 @@
+@@ -3446,8 +3447,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=$?
-@@ -3490,8 +3490,7 @@
+@@ -3491,8 +3491,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=$?
-@@ -4121,8 +4120,7 @@
+@@ -4122,8 +4121,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=$?
-@@ -4176,8 +4174,7 @@
+@@ -4177,8 +4175,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=$?
-@@ -4479,8 +4476,7 @@
+@@ -4480,8 +4477,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=$?
-@@ -4969,6 +4965,27 @@
+@@ -4970,6 +4966,27 @@
        fi
      ;;
  
@@ -232,7 +232,7 @@
  # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
  #
      *linux*)
-@@ -5126,8 +5143,7 @@
+@@ -5127,8 +5144,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=$?
-@@ -5230,8 +5246,7 @@
+@@ -5231,8 +5247,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=$?
-@@ -5363,8 +5378,7 @@
+@@ -5364,8 +5379,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=$?
-@@ -5454,8 +5468,7 @@
+@@ -5455,8 +5469,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=$?
-@@ -5627,8 +5640,7 @@
+@@ -5628,8 +5641,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=$?
-@@ -5700,8 +5712,7 @@
+@@ -5701,8 +5713,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=$?
-@@ -5755,8 +5766,7 @@
+@@ -5756,8 +5767,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=$?
-@@ -5827,8 +5837,7 @@
+@@ -5828,8 +5838,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=$?
-@@ -5882,8 +5891,7 @@
+@@ -5883,8 +5892,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=$?
-@@ -5950,8 +5958,7 @@
+@@ -5951,8 +5959,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=$?
-@@ -6021,8 +6028,7 @@
+@@ -6022,8 +6029,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=$?
-@@ -6091,8 +6097,7 @@
+@@ -6092,8 +6098,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=$?
-@@ -6166,8 +6171,7 @@
+@@ -6167,8 +6172,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=$?
-@@ -6322,8 +6326,7 @@
+@@ -6323,8 +6327,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=$?
-@@ -6474,8 +6477,7 @@
+@@ -6475,8 +6478,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=$?
-@@ -6630,8 +6632,7 @@
+@@ -6631,8 +6633,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=$?
-@@ -6787,8 +6788,7 @@
+@@ -6788,8 +6789,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=$?
-@@ -6937,8 +6937,7 @@
+@@ -6938,8 +6938,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=$?
-@@ -7092,8 +7091,7 @@
+@@ -7093,8 +7092,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=$?
-@@ -7247,8 +7245,7 @@
+@@ -7248,8 +7246,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=$?
-@@ -7399,8 +7396,7 @@
+@@ -7400,8 +7397,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=$?
-@@ -7551,8 +7547,7 @@
+@@ -7552,8 +7548,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=$?
-@@ -7702,8 +7697,7 @@
+@@ -7703,8 +7698,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=$?
-@@ -7851,8 +7845,7 @@
+@@ -7852,8 +7846,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=$?
-@@ -7920,8 +7913,7 @@
+@@ -7921,8 +7914,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=$?
-@@ -8074,8 +8066,7 @@
+@@ -8075,8 +8067,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=$?
-@@ -8221,8 +8212,7 @@
+@@ -8222,8 +8213,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=$?
-@@ -8381,8 +8371,7 @@
+@@ -8382,8 +8372,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=$?
-@@ -8544,8 +8533,7 @@
+@@ -8545,8 +8534,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=$?
-@@ -8611,8 +8599,7 @@
+@@ -8612,8 +8600,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=$?
-@@ -8766,8 +8753,7 @@
+@@ -8767,8 +8754,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=$?
-@@ -8917,8 +8903,7 @@
+@@ -8918,8 +8904,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=$?
-@@ -9069,8 +9054,7 @@
+@@ -9070,8 +9055,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=$?
-@@ -9225,8 +9209,7 @@
+@@ -9226,8 +9210,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=$?
-@@ -9376,8 +9359,7 @@
+@@ -9377,8 +9360,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=$?
-@@ -9530,8 +9512,7 @@
+@@ -9531,8 +9513,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=$?
-@@ -9597,8 +9578,7 @@
+@@ -9598,8 +9579,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=$?
-@@ -9663,8 +9643,7 @@
+@@ -9664,8 +9644,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=$?
-@@ -9734,8 +9713,7 @@
+@@ -9735,8 +9714,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=$?
-@@ -9883,8 +9861,7 @@
+@@ -9884,8 +9862,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=$?
-@@ -9946,8 +9923,7 @@
+@@ -9947,8 +9924,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=$?
-@@ -9987,8 +9963,7 @@
+@@ -9988,8 +9964,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=$?
-@@ -10044,8 +10019,7 @@
+@@ -10045,8 +10020,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=$?
-@@ -10085,8 +10059,7 @@
+@@ -10086,8 +10060,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=$?
-@@ -10150,8 +10123,7 @@
+@@ -10151,8 +10124,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=$?
-@@ -10182,10 +10154,8 @@
+@@ -10183,10 +10155,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -695,7 +695,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -10297,8 +10267,7 @@
+@@ -10298,8 +10268,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=$?
-@@ -10360,8 +10329,7 @@
+@@ -10361,8 +10330,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=$?
-@@ -10401,8 +10369,7 @@
+@@ -10402,8 +10370,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=$?
-@@ -10458,8 +10425,7 @@
+@@ -10459,8 +10426,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=$?
-@@ -10499,8 +10465,7 @@
+@@ -10500,8 +10466,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=$?
-@@ -10564,8 +10529,7 @@
+@@ -10565,8 +10530,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=$?
-@@ -10596,10 +10560,8 @@
+@@ -10597,10 +10561,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -768,7 +768,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -10711,8 +10673,7 @@
+@@ -10712,8 +10674,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=$?
-@@ -10774,8 +10735,7 @@
+@@ -10775,8 +10736,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=$?
-@@ -10815,8 +10775,7 @@
+@@ -10816,8 +10776,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=$?
-@@ -10872,8 +10831,7 @@
+@@ -10873,8 +10832,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=$?
-@@ -10913,8 +10871,7 @@
+@@ -10914,8 +10872,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=$?
-@@ -10978,8 +10935,7 @@
+@@ -10979,8 +10936,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=$?
-@@ -11010,10 +10966,8 @@
+@@ -11011,10 +10967,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -841,7 +841,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -11169,8 +11123,7 @@
+@@ -11170,8 +11124,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=$?
-@@ -11230,8 +11183,7 @@
+@@ -11231,8 +11184,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=$?
-@@ -11307,8 +11259,7 @@
+@@ -11308,8 +11260,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=$?
-@@ -11350,8 +11301,7 @@
+@@ -11351,8 +11302,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=$?
-@@ -11408,8 +11358,7 @@
+@@ -11409,8 +11359,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=$?
-@@ -11534,8 +11483,7 @@
+@@ -11535,8 +11484,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=$?
-@@ -11605,8 +11553,7 @@
+@@ -11606,8 +11554,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=$?
-@@ -11705,8 +11652,7 @@
+@@ -11706,8 +11653,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=$?
-@@ -11771,8 +11717,7 @@
+@@ -11772,8 +11718,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=$?
-@@ -11837,8 +11782,7 @@
+@@ -11838,8 +11783,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=$?
-@@ -11903,8 +11847,7 @@
+@@ -11904,8 +11848,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=$?
-@@ -11969,8 +11912,7 @@
+@@ -11970,8 +11913,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=$?
-@@ -12013,8 +11955,7 @@
+@@ -12014,8 +11956,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=$?
-@@ -12085,8 +12026,7 @@
+@@ -12086,8 +12027,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=$?
-@@ -12149,8 +12089,7 @@
+@@ -12150,8 +12090,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=$?
-@@ -12215,8 +12154,7 @@
+@@ -12216,8 +12155,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=$?
-@@ -12281,8 +12219,7 @@
+@@ -12282,8 +12220,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=$?
-@@ -12347,8 +12284,7 @@
+@@ -12348,8 +12285,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=$?
-@@ -12413,8 +12349,7 @@
+@@ -12414,8 +12350,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=$?
-@@ -12574,8 +12509,7 @@
+@@ -12575,8 +12510,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=$?
-@@ -12629,8 +12563,7 @@
+@@ -12630,8 +12564,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=$?
-@@ -12707,8 +12640,7 @@
+@@ -12708,8 +12641,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=$?
-@@ -12779,8 +12711,7 @@
+@@ -12780,8 +12712,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=$?
-@@ -12852,8 +12783,7 @@
+@@ -12853,8 +12784,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=$?
-@@ -12921,8 +12851,7 @@
+@@ -12922,8 +12852,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=$?
-@@ -12989,8 +12918,7 @@
+@@ -12990,8 +12919,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=$?
-@@ -13070,8 +12998,7 @@
+@@ -13071,8 +12999,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=$?
-@@ -13134,8 +13061,7 @@
+@@ -13135,8 +13062,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=$?
-@@ -13197,8 +13123,7 @@
+@@ -13198,8 +13124,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=$?
-@@ -13260,8 +13185,7 @@
+@@ -13261,8 +13186,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=$?
-@@ -13323,8 +13247,7 @@
+@@ -13324,8 +13248,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=$?
-@@ -13386,8 +13309,7 @@
+@@ -13387,8 +13310,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=$?
-@@ -13449,8 +13371,7 @@
+@@ -13450,8 +13372,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=$?
-@@ -13512,8 +13433,7 @@
+@@ -13513,8 +13434,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=$?
-@@ -13786,8 +13706,7 @@
+@@ -13787,8 +13707,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=$?
-@@ -13936,8 +13855,7 @@
+@@ -13937,8 +13856,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=$?
-@@ -14088,8 +14006,7 @@
+@@ -14089,8 +14007,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=$?
-@@ -14240,8 +14157,7 @@
+@@ -14241,8 +14158,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=$?
-@@ -14309,8 +14225,7 @@
+@@ -14310,8 +14226,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=$?
-@@ -14405,8 +14320,7 @@
+@@ -14406,8 +14321,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=$?
-@@ -14555,8 +14469,7 @@
+@@ -14556,8 +14470,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=$?
-@@ -14707,8 +14620,7 @@
+@@ -14708,8 +14621,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=$?
-@@ -14859,8 +14771,7 @@
+@@ -14860,8 +14772,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=$?
-@@ -14928,8 +14839,7 @@
+@@ -14929,8 +14840,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=$?
-@@ -15026,8 +14936,7 @@
+@@ -15027,8 +14937,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=$?
-@@ -15136,8 +15045,7 @@
+@@ -15137,8 +15046,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=$?
-@@ -15211,8 +15119,7 @@
+@@ -15212,8 +15120,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=$?
-@@ -15288,8 +15195,7 @@
+@@ -15289,8 +15196,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=$?
-@@ -15365,8 +15271,7 @@
+@@ -15366,8 +15272,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=$?
-@@ -15442,8 +15347,7 @@
+@@ -15443,8 +15348,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=$?
-@@ -15530,8 +15434,7 @@
+@@ -15531,8 +15435,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=$?
-@@ -15585,8 +15488,7 @@
+@@ -15586,8 +15489,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=$?
-@@ -15687,8 +15589,7 @@
+@@ -15688,8 +15590,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=$?
-@@ -15791,8 +15692,7 @@
+@@ -15792,8 +15693,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=$?
-@@ -15915,8 +15815,7 @@
+@@ -15916,8 +15816,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=$?
-@@ -16026,8 +15925,7 @@
+@@ -16027,8 +15926,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=$?
-@@ -16138,8 +16036,7 @@
+@@ -16139,8 +16037,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=$?
-@@ -16248,8 +16145,7 @@
+@@ -16249,8 +16146,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=$?
-@@ -16357,8 +16253,7 @@
+@@ -16358,8 +16254,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=$?
-@@ -16469,8 +16364,7 @@
+@@ -16470,8 +16365,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=$?
-@@ -16577,8 +16471,7 @@
+@@ -16578,8 +16472,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=$?
-@@ -16685,8 +16578,7 @@
+@@ -16686,8 +16579,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=$?
-@@ -16792,8 +16684,7 @@
+@@ -16793,8 +16685,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=$?
-@@ -16904,8 +16795,7 @@
+@@ -16905,8 +16796,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=$?
-@@ -17008,8 +16898,7 @@
+@@ -17009,8 +16899,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=$?
-@@ -17111,8 +17000,7 @@
+@@ -17112,8 +17001,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=$?
-@@ -17213,8 +17101,7 @@
+@@ -17214,8 +17102,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=$?
-@@ -17319,8 +17206,7 @@
+@@ -17320,8 +17207,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=$?
-@@ -17386,8 +17272,7 @@
+@@ -17387,8 +17273,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=$?
-@@ -17541,8 +17426,7 @@
+@@ -17542,8 +17427,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=$?
-@@ -17647,8 +17531,7 @@
+@@ -17648,8 +17532,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=$?
-@@ -17756,8 +17639,7 @@
+@@ -17757,8 +17640,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=$?
-@@ -17864,8 +17746,7 @@
+@@ -17865,8 +17747,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=$?
-@@ -17967,8 +17848,7 @@
+@@ -17968,8 +17849,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=$?
-@@ -18071,8 +17951,7 @@
+@@ -18072,8 +17952,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=$?
-@@ -18178,8 +18057,7 @@
+@@ -18179,8 +18058,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=$?
-@@ -18287,8 +18165,7 @@
+@@ -18288,8 +18166,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=$?
-@@ -18394,8 +18271,7 @@
+@@ -18395,8 +18272,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=$?
-@@ -18502,8 +18378,7 @@
+@@ -18503,8 +18379,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=$?
-@@ -18608,8 +18483,7 @@
+@@ -18609,8 +18484,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=$?
-@@ -18715,8 +18589,7 @@
+@@ -18716,8 +18590,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1651,7 +1651,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18823,8 +18696,7 @@
+@@ -18824,8 +18697,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1661,7 +1661,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18930,8 +18802,7 @@
+@@ -18931,8 +18803,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1671,7 +1671,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19037,8 +18908,7 @@
+@@ -19038,8 +18909,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1681,7 +1681,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19142,8 +19012,7 @@
+@@ -19143,8 +19013,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1691,7 +1691,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19244,8 +19113,7 @@
+@@ -19245,8 +19114,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1701,7 +1701,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19306,8 +19174,7 @@
+@@ -19307,8 +19175,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -1711,7 +1711,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19335,7 +19202,7 @@
+@@ -19336,7 +19203,7 @@
  #
  #
  case "$host_os" in
@@ -1720,7 +1720,7 @@
         # glibc <= 2.3.2 has a broken getgrouplist
         if test "$cross_compiling" = yes; then
    { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-@@ -19468,8 +19335,7 @@
+@@ -19469,8 +19336,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=$?
-@@ -19540,8 +19406,7 @@
+@@ -19541,8 +19407,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=$?
-@@ -19604,8 +19469,7 @@
+@@ -19605,8 +19470,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=$?
-@@ -19667,8 +19531,7 @@
+@@ -19668,8 +19532,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=$?
-@@ -19764,8 +19627,7 @@
+@@ -19765,8 +19628,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=$?
-@@ -19854,8 +19716,7 @@
+@@ -19855,8 +19717,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=$?
-@@ -19966,8 +19827,7 @@
+@@ -19967,8 +19828,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=$?
-@@ -20067,8 +19927,7 @@
+@@ -20068,8 +19928,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=$?
-@@ -20139,8 +19998,7 @@
+@@ -20140,8 +19999,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=$?
-@@ -20243,8 +20101,7 @@
+@@ -20244,8 +20102,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=$?
-@@ -20353,8 +20210,7 @@
+@@ -20354,8 +20211,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=$?
-@@ -20454,8 +20310,7 @@
+@@ -20455,8 +20311,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=$?
-@@ -20526,8 +20381,7 @@
+@@ -20527,8 +20382,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=$?
-@@ -20630,8 +20484,7 @@
+@@ -20631,8 +20485,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=$?
-@@ -20741,8 +20594,7 @@
+@@ -20742,8 +20595,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=$?
-@@ -20842,8 +20694,7 @@
+@@ -20843,8 +20695,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=$?
-@@ -20914,8 +20765,7 @@
+@@ -20915,8 +20766,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=$?
-@@ -21018,8 +20868,7 @@
+@@ -21019,8 +20869,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=$?
-@@ -21128,8 +20977,7 @@
+@@ -21129,8 +20978,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=$?
-@@ -21229,8 +21077,7 @@
+@@ -21230,8 +21078,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=$?
-@@ -21301,8 +21148,7 @@
+@@ -21302,8 +21149,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=$?
-@@ -21405,8 +21251,7 @@
+@@ -21406,8 +21252,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=$?
-@@ -21517,8 +21362,7 @@
+@@ -21518,8 +21363,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=$?
-@@ -21618,8 +21462,7 @@
+@@ -21619,8 +21463,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=$?
-@@ -21690,8 +21533,7 @@
+@@ -21691,8 +21534,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=$?
-@@ -21794,8 +21636,7 @@
+@@ -21795,8 +21637,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=$?
-@@ -21905,8 +21746,7 @@
+@@ -21906,8 +21747,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=$?
-@@ -22006,8 +21846,7 @@
+@@ -22007,8 +21847,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=$?
-@@ -22078,8 +21917,7 @@
+@@ -22079,8 +21918,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=$?
-@@ -22182,8 +22020,7 @@
+@@ -22183,8 +22021,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=$?
-@@ -22292,8 +22129,7 @@
+@@ -22293,8 +22130,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=$?
-@@ -22393,8 +22229,7 @@
+@@ -22394,8 +22230,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2040,7 +2040,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22465,8 +22300,7 @@
+@@ -22466,8 +22301,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2050,7 +2050,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22569,8 +22403,7 @@
+@@ -22570,8 +22404,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2060,7 +2060,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22680,8 +22513,7 @@
+@@ -22681,8 +22514,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2070,7 +2070,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22781,8 +22613,7 @@
+@@ -22782,8 +22614,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2080,7 +2080,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22853,8 +22684,7 @@
+@@ -22854,8 +22685,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2090,7 +2090,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22957,8 +22787,7 @@
+@@ -22958,8 +22788,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2100,7 +2100,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23067,8 +22896,7 @@
+@@ -23068,8 +22897,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2110,7 +2110,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23168,8 +22996,7 @@
+@@ -23169,8 +22997,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2120,7 +2120,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23240,8 +23067,7 @@
+@@ -23241,8 +23068,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2130,7 +2130,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23344,8 +23170,7 @@
+@@ -23345,8 +23171,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2140,7 +2140,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23455,8 +23280,7 @@
+@@ -23456,8 +23281,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2150,7 +2150,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23556,8 +23380,7 @@
+@@ -23557,8 +23381,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2160,7 +2160,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23628,8 +23451,7 @@
+@@ -23629,8 +23452,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2170,7 +2170,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23732,8 +23554,7 @@
+@@ -23733,8 +23555,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2180,7 +2180,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23842,8 +23663,7 @@
+@@ -23843,8 +23664,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2190,7 +2190,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23943,8 +23763,7 @@
+@@ -23944,8 +23764,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2200,7 +2200,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24015,8 +23834,7 @@
+@@ -24016,8 +23835,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2210,7 +2210,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24119,8 +23937,7 @@
+@@ -24120,8 +23938,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2220,7 +2220,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24202,8 +24019,7 @@
+@@ -24203,8 +24020,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2230,7 +2230,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24257,8 +24073,7 @@
+@@ -24258,8 +24074,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2240,7 +2240,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24362,8 +24177,7 @@
+@@ -24363,8 +24178,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2250,7 +2250,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24467,8 +24281,7 @@
+@@ -24468,8 +24282,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2260,7 +2260,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24569,8 +24382,7 @@
+@@ -24570,8 +24383,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2270,7 +2270,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24642,8 +24454,7 @@
+@@ -24643,8 +24455,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2280,7 +2280,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24697,8 +24508,7 @@
+@@ -24698,8 +24509,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2290,7 +2290,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24803,8 +24613,7 @@
+@@ -24804,8 +24614,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2300,7 +2300,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24908,8 +24717,7 @@
+@@ -24909,8 +24718,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2310,7 +2310,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25012,8 +24820,7 @@
+@@ -25013,8 +24821,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2320,7 +2320,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25117,8 +24924,7 @@
+@@ -25118,8 +24925,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2330,7 +2330,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25222,8 +25028,7 @@
+@@ -25223,8 +25029,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2340,7 +2340,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25339,8 +25144,7 @@
+@@ -25340,8 +25145,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2350,7 +2350,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25443,8 +25247,7 @@
+@@ -25444,8 +25248,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2360,7 +2360,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25547,8 +25350,7 @@
+@@ -25548,8 +25351,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2370,7 +2370,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25651,8 +25453,7 @@
+@@ -25652,8 +25454,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2380,7 +2380,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25709,11 +25510,14 @@
+@@ -25711,11 +25512,14 @@
  
    # and these are for particular systems
    case "$host_os" in
@@ -2397,7 +2397,7 @@
  			BLDSHARED="true"
  			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
  				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -26207,8 +26011,7 @@
+@@ -26210,8 +26014,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2407,7 +2407,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26607,8 +26410,7 @@
+@@ -26610,8 +26413,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2417,7 +2417,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26674,8 +26476,7 @@
+@@ -26677,8 +26479,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2427,7 +2427,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26954,8 +26755,7 @@
+@@ -26957,8 +26758,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2437,7 +2437,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27018,8 +26818,7 @@
+@@ -27021,8 +26821,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2447,7 +2447,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27080,8 +26879,7 @@
+@@ -27083,8 +26882,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2457,7 +2457,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27196,8 +26994,7 @@
+@@ -27199,8 +26997,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2467,7 +2467,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27259,8 +27056,7 @@
+@@ -27262,8 +27059,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2477,7 +2477,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27451,8 +27247,7 @@
+@@ -27454,8 +27250,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2487,7 +2487,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27560,8 +27355,7 @@
+@@ -27563,8 +27358,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2497,7 +2497,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27625,8 +27419,7 @@
+@@ -27628,8 +27422,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2507,7 +2507,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27688,8 +27481,7 @@
+@@ -27691,8 +27484,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2517,7 +2517,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27751,8 +27543,7 @@
+@@ -27754,8 +27546,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2527,7 +2527,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27814,8 +27605,7 @@
+@@ -27817,8 +27608,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2537,7 +2537,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27877,8 +27667,7 @@
+@@ -27880,8 +27670,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2547,7 +2547,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27940,8 +27729,7 @@
+@@ -27943,8 +27732,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2557,7 +2557,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28003,8 +27791,7 @@
+@@ -28006,8 +27794,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2567,7 +2567,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28066,8 +27853,7 @@
+@@ -28069,8 +27856,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2577,7 +2577,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28129,8 +27915,7 @@
+@@ -28132,8 +27918,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2587,7 +2587,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28192,8 +27977,7 @@
+@@ -28195,8 +27980,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2597,7 +2597,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28256,8 +28040,7 @@
+@@ -28259,8 +28043,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2607,7 +2607,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28320,8 +28103,7 @@
+@@ -28323,8 +28106,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2617,7 +2617,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28425,8 +28207,7 @@
+@@ -28428,8 +28210,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2627,7 +2627,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28478,8 +28259,7 @@
+@@ -28481,8 +28262,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2637,7 +2637,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28532,8 +28312,7 @@
+@@ -28535,8 +28315,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2647,7 +2647,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28590,8 +28369,7 @@
+@@ -28593,8 +28372,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2657,7 +2657,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29163,8 +28941,7 @@
+@@ -29166,8 +28944,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2667,7 +2667,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29294,8 +29071,7 @@
+@@ -29297,8 +29074,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2677,7 +2677,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29359,8 +29135,7 @@
+@@ -29362,8 +29138,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2687,7 +2687,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29424,8 +29199,7 @@
+@@ -29427,8 +29202,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2697,7 +2697,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29489,8 +29263,7 @@
+@@ -29492,8 +29266,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2707,7 +2707,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29559,8 +29332,7 @@
+@@ -29562,8 +29335,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2717,7 +2717,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29821,8 +29593,7 @@
+@@ -29824,8 +29596,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2727,7 +2727,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30788,8 +30559,7 @@
+@@ -30791,8 +30562,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2737,7 +2737,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30852,8 +30622,7 @@
+@@ -30855,8 +30625,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2747,7 +2747,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30923,8 +30692,7 @@
+@@ -30926,8 +30695,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2757,7 +2757,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30992,8 +30760,7 @@
+@@ -30995,8 +30763,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2767,7 +2767,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31242,8 +31009,7 @@
+@@ -31245,8 +31012,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2777,7 +2777,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31513,8 +31279,7 @@
+@@ -31516,8 +31282,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2787,7 +2787,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31695,8 +31460,7 @@
+@@ -31698,8 +31463,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2797,7 +2797,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31796,8 +31560,7 @@
+@@ -31799,8 +31563,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2807,7 +2807,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31923,8 +31686,7 @@
+@@ -31926,8 +31689,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2817,7 +2817,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31990,8 +31752,7 @@
+@@ -31993,8 +31755,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2827,7 +2827,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32162,8 +31923,7 @@
+@@ -32165,8 +31926,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2837,7 +2837,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32277,8 +32037,7 @@
+@@ -32280,8 +32040,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2847,7 +2847,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32392,8 +32151,7 @@
+@@ -32395,8 +32154,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2857,7 +2857,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32630,8 +32388,7 @@
+@@ -32633,8 +32391,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2867,7 +2867,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32815,8 +32572,7 @@
+@@ -32818,8 +32575,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2877,7 +2877,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32979,8 +32735,7 @@
+@@ -32982,8 +32738,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2887,7 +2887,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33077,8 +32832,7 @@
+@@ -33080,8 +32835,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2897,7 +2897,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33177,8 +32931,7 @@
+@@ -33180,8 +32934,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2907,7 +2907,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33275,8 +33028,7 @@
+@@ -33278,8 +33031,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2917,7 +2917,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33373,8 +33125,7 @@
+@@ -33376,8 +33128,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2927,7 +2927,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33473,8 +33224,7 @@
+@@ -33476,8 +33227,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2937,7 +2937,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33579,8 +33329,7 @@
+@@ -33582,8 +33332,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2947,7 +2947,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33677,8 +33426,7 @@
+@@ -33680,8 +33429,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2957,7 +2957,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33778,8 +33526,7 @@
+@@ -33781,8 +33529,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2967,7 +2967,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33906,8 +33653,7 @@
+@@ -33909,8 +33656,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2977,7 +2977,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34009,8 +33755,7 @@
+@@ -34012,8 +33758,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2987,7 +2987,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34112,8 +33857,7 @@
+@@ -34115,8 +33860,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2997,7 +2997,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34215,8 +33959,7 @@
+@@ -34218,8 +33962,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3007,7 +3007,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34318,8 +34061,7 @@
+@@ -34321,8 +34064,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3017,7 +3017,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34421,8 +34163,7 @@
+@@ -34424,8 +34166,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3027,7 +3027,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34524,8 +34265,7 @@
+@@ -34527,8 +34268,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3037,7 +3037,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34627,8 +34367,7 @@
+@@ -34630,8 +34370,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3047,7 +3047,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34730,8 +34469,7 @@
+@@ -34733,8 +34472,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3057,7 +3057,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34833,8 +34571,7 @@
+@@ -34836,8 +34574,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3067,7 +3067,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34936,8 +34673,7 @@
+@@ -34939,8 +34676,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3077,7 +3077,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35039,8 +34775,7 @@
+@@ -35042,8 +34778,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3087,7 +3087,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35142,8 +34877,7 @@
+@@ -35145,8 +34880,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3097,7 +3097,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35245,8 +34979,7 @@
+@@ -35248,8 +34982,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3107,7 +3107,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35348,8 +35081,7 @@
+@@ -35351,8 +35084,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3117,7 +3117,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35451,8 +35183,7 @@
+@@ -35454,8 +35186,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3127,7 +3127,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35554,8 +35285,7 @@
+@@ -35557,8 +35288,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3137,7 +3137,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35657,8 +35387,7 @@
+@@ -35660,8 +35390,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3147,7 +3147,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35760,8 +35489,7 @@
+@@ -35763,8 +35492,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3157,7 +3157,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35863,8 +35591,7 @@
+@@ -35866,8 +35594,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3167,7 +3167,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35966,8 +35693,7 @@
+@@ -35969,8 +35696,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3177,7 +3177,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36069,8 +35795,7 @@
+@@ -36072,8 +35798,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3187,7 +3187,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36172,8 +35897,7 @@
+@@ -36175,8 +35900,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3197,7 +3197,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36275,8 +35999,7 @@
+@@ -36278,8 +36002,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3207,7 +3207,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36378,8 +36101,7 @@
+@@ -36381,8 +36104,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3217,7 +3217,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36481,8 +36203,7 @@
+@@ -36484,8 +36206,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3227,7 +3227,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36584,8 +36305,7 @@
+@@ -36587,8 +36308,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3237,7 +3237,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36687,8 +36407,7 @@
+@@ -36690,8 +36410,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3247,7 +3247,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36790,8 +36509,7 @@
+@@ -36793,8 +36512,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3257,7 +3257,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36893,8 +36611,7 @@
+@@ -36896,8 +36614,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3267,7 +3267,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36996,8 +36713,7 @@
+@@ -36999,8 +36716,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3277,7 +3277,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37099,8 +36815,7 @@
+@@ -37102,8 +36818,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3287,7 +3287,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37166,8 +36881,7 @@
+@@ -37169,8 +36884,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3297,7 +3297,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37227,8 +36941,7 @@
+@@ -37230,8 +36944,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3307,7 +3307,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37290,8 +37003,7 @@
+@@ -37293,8 +37006,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3317,7 +3317,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37353,8 +37065,7 @@
+@@ -37356,8 +37068,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3327,7 +3327,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37416,8 +37127,7 @@
+@@ -37419,8 +37130,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3337,7 +3337,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37479,8 +37189,7 @@
+@@ -37482,8 +37192,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3347,7 +3347,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37542,8 +37251,7 @@
+@@ -37545,8 +37254,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3357,7 +3357,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37605,8 +37313,7 @@
+@@ -37608,8 +37316,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3367,7 +3367,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37667,8 +37374,7 @@
+@@ -37670,8 +37377,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3377,7 +3377,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37730,8 +37436,7 @@
+@@ -37733,8 +37439,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3387,7 +3387,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37793,8 +37498,7 @@
+@@ -37796,8 +37501,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3397,7 +3397,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37856,8 +37560,7 @@
+@@ -37859,8 +37563,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3407,7 +3407,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37919,8 +37622,7 @@
+@@ -37922,8 +37625,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3417,7 +3417,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37973,8 +37675,7 @@
+@@ -37976,8 +37678,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3427,7 +3427,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38038,8 +37739,7 @@
+@@ -38041,8 +37742,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3437,7 +3437,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38101,8 +37801,7 @@
+@@ -38104,8 +37804,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3447,7 +3447,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38164,8 +37863,7 @@
+@@ -38167,8 +37866,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3457,7 +3457,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38227,8 +37925,7 @@
+@@ -38230,8 +37928,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3467,7 +3467,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38290,8 +37987,7 @@
+@@ -38293,8 +37990,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3477,7 +3477,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38354,8 +38050,7 @@
+@@ -38357,8 +38053,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3487,7 +3487,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38417,8 +38112,7 @@
+@@ -38420,8 +38115,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3497,7 +3497,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38575,8 +38269,7 @@
+@@ -38578,8 +38272,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3507,7 +3507,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38889,8 +38582,7 @@
+@@ -38892,8 +38585,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3517,7 +3517,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39292,8 +38984,7 @@
+@@ -39295,8 +38987,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3527,7 +3527,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39411,8 +39102,7 @@
+@@ -39414,8 +39105,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3537,7 +3537,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39466,8 +39156,7 @@
+@@ -39469,8 +39159,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3547,7 +3547,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39874,8 +39563,7 @@
+@@ -39877,8 +39566,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3557,7 +3557,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40032,8 +39720,7 @@
+@@ -40035,8 +39723,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3567,7 +3567,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40184,8 +39871,7 @@
+@@ -40187,8 +39874,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3577,7 +3577,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40342,8 +40028,7 @@
+@@ -40345,8 +40031,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3587,7 +3587,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40409,8 +40094,7 @@
+@@ -40412,8 +40097,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3597,7 +3597,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40716,8 +40400,7 @@
+@@ -40719,8 +40403,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3607,7 +3607,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40905,8 +40588,7 @@
+@@ -40908,8 +40591,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3617,7 +3617,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40975,8 +40657,7 @@
+@@ -40978,8 +40660,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3627,7 +3627,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41162,8 +40843,7 @@
+@@ -41165,8 +40846,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3637,7 +3637,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41251,8 +40931,7 @@
+@@ -41254,8 +40934,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3647,7 +3647,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41341,8 +41020,7 @@
+@@ -41344,8 +41023,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3657,7 +3657,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41415,8 +41093,7 @@
+@@ -41418,8 +41096,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3667,7 +3667,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41785,8 +41462,7 @@
+@@ -41788,8 +41465,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3677,7 +3677,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42188,8 +41864,7 @@
+@@ -42191,8 +41867,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3687,7 +3687,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42389,8 +42064,7 @@
+@@ -42392,8 +42067,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3697,7 +3697,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42457,8 +42131,7 @@
+@@ -42460,8 +42134,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3707,7 +3707,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42520,8 +42193,7 @@
+@@ -42523,8 +42196,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3717,7 +3717,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42587,8 +42259,7 @@
+@@ -42590,8 +42262,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3727,7 +3727,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42661,8 +42332,7 @@
+@@ -42664,8 +42335,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3737,7 +3737,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42724,8 +42394,7 @@
+@@ -42727,8 +42397,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3747,7 +3747,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42791,8 +42460,7 @@
+@@ -42794,8 +42463,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3757,7 +3757,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42903,8 +42571,7 @@
+@@ -42906,8 +42574,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3767,7 +3767,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42971,8 +42638,7 @@
+@@ -42974,8 +42641,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3777,7 +3777,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43034,8 +42700,7 @@
+@@ -43037,8 +42703,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3787,7 +3787,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43093,8 +42758,7 @@
+@@ -43096,8 +42761,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3797,7 +3797,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43156,8 +42820,7 @@
+@@ -43159,8 +42823,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3807,7 +3807,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43200,8 +42863,7 @@
+@@ -43203,8 +42866,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3817,7 +3817,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43244,8 +42906,7 @@
+@@ -43247,8 +42909,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3827,7 +3827,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43288,8 +42949,7 @@
+@@ -43291,8 +42952,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3837,7 +3837,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43332,8 +42992,7 @@
+@@ -43335,8 +42995,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3847,7 +3847,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43376,8 +43035,7 @@
+@@ -43379,8 +43038,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3857,7 +3857,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43420,8 +43078,7 @@
+@@ -43423,8 +43081,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3867,7 +3867,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43466,8 +43123,7 @@
+@@ -43469,8 +43126,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3877,7 +3877,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43510,8 +43166,7 @@
+@@ -43513,8 +43169,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3887,7 +3887,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43554,8 +43209,7 @@
+@@ -43557,8 +43212,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3897,7 +3897,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43598,8 +43252,7 @@
+@@ -43601,8 +43255,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3907,7 +3907,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43642,8 +43295,7 @@
+@@ -43645,8 +43298,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3917,7 +3917,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43686,8 +43338,7 @@
+@@ -43689,8 +43341,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3927,7 +3927,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43730,8 +43381,7 @@
+@@ -43733,8 +43384,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3937,7 +3937,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43800,7 +43450,7 @@
+@@ -43803,7 +43453,7 @@
  echo "${ECHO_T}yes" >&6;
  
  	case "$host_os" in
@@ -3946,7 +3946,7 @@
  		echo "$as_me:$LINENO: checking for linux sendfile64 support" >&5
  echo $ECHO_N "checking for linux sendfile64 support... $ECHO_C" >&6
  if test "${samba_cv_HAVE_SENDFILE64+set}" = set; then
-@@ -43836,8 +43486,7 @@
+@@ -43839,8 +43489,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3956,7 +3956,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43897,8 +43546,7 @@
+@@ -43900,8 +43549,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3966,7 +3966,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43963,8 +43611,7 @@
+@@ -43966,8 +43614,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3976,7 +3976,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44085,8 +43732,7 @@
+@@ -44088,8 +43735,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3986,7 +3986,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44177,8 +43823,7 @@
+@@ -44180,8 +43826,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3996,7 +3996,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44266,8 +43911,7 @@
+@@ -44269,8 +43914,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4006,7 +4006,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44353,8 +43997,7 @@
+@@ -44356,8 +44000,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4016,7 +4016,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44438,8 +44081,7 @@
+@@ -44441,8 +44084,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4026,7 +4026,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44535,8 +44177,7 @@
+@@ -44538,8 +44180,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4036,7 +4036,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44630,8 +44271,7 @@
+@@ -44633,8 +44274,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4046,7 +4046,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44711,10 +44351,10 @@
+@@ -44714,10 +44354,10 @@
  WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS
  
  case "$host_os" in
@@ -4059,7 +4059,7 @@
  		# FreeBSD winbind client is implemented as a wrapper around
  		# the Linux version.
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \
-@@ -44843,8 +44483,7 @@
+@@ -44846,8 +44486,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4069,7 +4069,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44888,8 +44527,7 @@
+@@ -44891,8 +44530,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4079,7 +4079,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44958,8 +44596,7 @@
+@@ -44961,8 +44599,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4089,7 +4089,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45003,8 +44640,7 @@
+@@ -45006,8 +44643,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4099,7 +4099,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45070,8 +44706,7 @@
+@@ -45073,8 +44709,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4109,7 +4109,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45115,8 +44750,7 @@
+@@ -45118,8 +44753,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4119,7 +4119,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45184,8 +44818,7 @@
+@@ -45187,8 +44821,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4129,7 +4129,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45229,8 +44862,7 @@
+@@ -45232,8 +44865,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4139,7 +4139,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45296,8 +44928,7 @@
+@@ -45299,8 +44931,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4149,7 +4149,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45341,8 +44972,7 @@
+@@ -45344,8 +44975,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4159,7 +4159,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45434,8 +45064,7 @@
+@@ -45437,8 +45067,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4169,7 +4169,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48139,6 +47768,9 @@
+@@ -48142,6 +47771,9 @@
  s, at logfilebase@,$logfilebase,;t t
  s, at privatedir@,$privatedir,;t t
  s, at swatdir@,$swatdir,;t t
@@ -4178,8 +4178,8 @@
 +s, at cachedir@,$cachedir,;t t
  s, at LDSHFLAGS@,$LDSHFLAGS,;t t
  s, at SONAMEFLAG@,$SONAMEFLAG,;t t
- s, at SHLD@,$SHLD,;t t
-@@ -48412,11 +48044,6 @@
+ s, at SONAMEVERSIONSUFFIX@,$SONAMEVERSIONSUFFIX,;t t
+@@ -48416,11 +48048,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -4191,7 +4191,7 @@
    # Let's still pretend it is `configure' which instantiates (i.e., don't
    # use $as_me), people would be surprised to read:
    #    /* config.h.  Generated by config.status.  */
-@@ -48455,6 +48082,12 @@
+@@ -48459,6 +48086,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -4204,10 +4204,10 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
-Index: samba-3.0.21b/source/include/config.h.in
+Index: samba-3.0.21c/source/include/config.h.in
 ===================================================================
---- samba-3.0.21b.orig/source/include/config.h.in	2006-02-05 23:55:47.000000000 -0800
-+++ samba-3.0.21b/source/include/config.h.in	2006-02-05 23:56:47.000000000 -0800
+--- samba-3.0.21c.orig/source/include/config.h.in	2006-02-25 11:57:09.380805562 +0100
++++ samba-3.0.21c/source/include/config.h.in	2006-02-25 11:58:34.265678429 +0100
 @@ -48,6 +48,9 @@
  /* Define to turn on dmalloc debugging */
  #undef ENABLE_DMALLOC

Modified: trunk/patches/cups.patch
===================================================================
--- trunk/patches/cups.patch	2006-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/cups.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,8 +1,8 @@
-Index: samba-3.0.21b/source/include/includes.h
+Index: samba-3.0.21c/source/include/includes.h
 ===================================================================
---- samba-3.0.21b.orig/source/include/includes.h	2006-02-06 00:01:10.000000000 -0800
-+++ samba-3.0.21b/source/include/includes.h	2006-02-06 00:01:15.000000000 -0800
-@@ -1066,10 +1066,7 @@
+--- samba-3.0.21c.orig/source/include/includes.h	2006-02-25 11:57:11.836310142 +0100
++++ samba-3.0.21c/source/include/includes.h	2006-02-25 11:58:13.919783766 +0100
+@@ -1068,10 +1068,7 @@
  #endif
  
  #ifndef DEFAULT_PRINTING

Modified: trunk/patches/documentation.patch
===================================================================
--- trunk/patches/documentation.patch	2006-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/documentation.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,7 +1,7 @@
-Index: samba-3.0.21a/docs/manpages/swat.8
+Index: samba-3.0.21c/docs/manpages/swat.8
 ===================================================================
---- samba-3.0.21a.orig/docs/manpages/swat.8	2005-12-29 17:21:21.000000000 +0100
-+++ samba-3.0.21a/docs/manpages/swat.8	2006-01-24 23:05:53.000000000 +0100
+--- samba-3.0.21c.orig/docs/manpages/swat.8	2006-02-25 11:57:11.752327087 +0100
++++ samba-3.0.21c/docs/manpages/swat.8	2006-02-25 11:58:14.717622783 +0100
 @@ -81,51 +81,6 @@
  \-h|\-\-help
  Print a summary of command line options\&.
@@ -65,10 +65,10 @@
  
  .SH "WARNINGS"
  
-Index: samba-3.0.21a/docs/manpages/nmbd.8
+Index: samba-3.0.21c/docs/manpages/nmbd.8
 ===================================================================
---- samba-3.0.21a.orig/docs/manpages/nmbd.8	2005-12-29 17:19:14.000000000 +0100
-+++ samba-3.0.21a/docs/manpages/nmbd.8	2006-01-24 23:17:44.000000000 +0100
+--- samba-3.0.21c.orig/docs/manpages/nmbd.8	2006-02-25 11:57:11.753326885 +0100
++++ samba-3.0.21c/docs/manpages/nmbd.8	2006-02-25 11:58:14.719622379 +0100
 @@ -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.21a/docs/manpages/smbd.8
+Index: samba-3.0.21c/docs/manpages/smbd.8
 ===================================================================
---- samba-3.0.21a.orig/docs/manpages/smbd.8	2005-12-29 17:20:29.000000000 +0100
-+++ samba-3.0.21a/docs/manpages/smbd.8	2006-01-24 23:10:20.000000000 +0100
+--- samba-3.0.21c.orig/docs/manpages/smbd.8	2006-02-25 11:57:11.754326683 +0100
++++ samba-3.0.21c/docs/manpages/smbd.8	2006-02-25 11:58:14.721621976 +0100
 @@ -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.21a/docs/manpages/lmhosts.5
+Index: samba-3.0.21c/docs/manpages/lmhosts.5
 ===================================================================
---- samba-3.0.21a.orig/docs/manpages/lmhosts.5	2005-12-29 17:18:53.000000000 +0100
-+++ samba-3.0.21a/docs/manpages/lmhosts.5	2006-01-24 23:27:15.000000000 +0100
+--- samba-3.0.21c.orig/docs/manpages/lmhosts.5	2006-02-25 11:57:11.755326481 +0100
++++ samba-3.0.21c/docs/manpages/lmhosts.5	2006-02-25 11:58:14.722621774 +0100
 @@ -73,7 +73,7 @@
  .SH "FILES"
  
@@ -126,10 +126,10 @@
  
  .SH "VERSION"
  
-Index: samba-3.0.21a/docs/manpages/ntlm_auth.1
+Index: samba-3.0.21c/docs/manpages/ntlm_auth.1
 ===================================================================
---- samba-3.0.21a.orig/docs/manpages/ntlm_auth.1	2005-12-29 17:19:24.000000000 +0100
-+++ samba-3.0.21a/docs/manpages/ntlm_auth.1	2006-01-24 23:21:35.000000000 +0100
+--- samba-3.0.21c.orig/docs/manpages/ntlm_auth.1	2006-02-25 11:57:11.756326280 +0100
++++ samba-3.0.21c/docs/manpages/ntlm_auth.1	2006-02-25 11:58:14.723621572 +0100
 @@ -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.21a/docs/manpages/tdbbackup.8
+Index: samba-3.0.21c/docs/manpages/tdbbackup.8
 ===================================================================
---- samba-3.0.21a.orig/docs/manpages/tdbbackup.8	2005-12-29 17:21:24.000000000 +0100
-+++ samba-3.0.21a/docs/manpages/tdbbackup.8	2006-01-24 23:26:18.000000000 +0100
+--- samba-3.0.21c.orig/docs/manpages/tdbbackup.8	2006-02-25 11:57:11.757326078 +0100
++++ samba-3.0.21c/docs/manpages/tdbbackup.8	2006-02-25 11:58:14.724621371 +0100
 @@ -72,13 +72,13 @@
  
  .TP 3
@@ -178,10 +178,10 @@
  .LP
  
  .SH "VERSION"
-Index: samba-3.0.21a/docs/manpages/winbindd.8
+Index: samba-3.0.21c/docs/manpages/winbindd.8
 ===================================================================
---- samba-3.0.21a.orig/docs/manpages/winbindd.8	2005-12-29 17:21:42.000000000 +0100
-+++ samba-3.0.21a/docs/manpages/winbindd.8	2006-01-24 23:23:25.000000000 +0100
+--- samba-3.0.21c.orig/docs/manpages/winbindd.8	2006-02-25 11:57:11.758325876 +0100
++++ samba-3.0.21c/docs/manpages/winbindd.8	2006-02-25 11:58:14.726620967 +0100
 @@ -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-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/fhs.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,7 +1,7 @@
-Index: samba-3.0.21b/source/Makefile.in
+Index: samba-3.0.21c/source/Makefile.in
 ===================================================================
---- samba-3.0.21b.orig/source/Makefile.in	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/Makefile.in	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/Makefile.in	2006-02-25 11:57:11.584360975 +0100
++++ samba-3.0.21c/source/Makefile.in	2006-02-25 11:58:15.760412374 +0100
 @@ -91,6 +91,13 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
@@ -25,7 +25,7 @@
  PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS)
  
  # Note that all executable programs now provide for an optional executable suffix.
-@@ -1431,7 +1438,7 @@
+@@ -1432,7 +1439,7 @@
  	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
  
  installdat: installdirs
@@ -34,10 +34,10 @@
  
  installmsg: installdirs
  	@$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR)$(LIBDIR) $(srcdir)
-Index: samba-3.0.21b/source/configure.in
+Index: samba-3.0.21c/source/configure.in
 ===================================================================
---- samba-3.0.21b.orig/source/configure.in	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/configure.in	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/configure.in	2006-02-25 11:57:11.585360773 +0100
++++ samba-3.0.21c/source/configure.in	2006-02-25 11:58:15.771410155 +0100
 @@ -35,7 +35,7 @@
  [  --with-fhs              Use FHS-compliant paths (default=no)],
  [ case "$withval" in
@@ -68,10 +68,10 @@
  
  dnl Unique-to-Samba variables we'll be playing with.
  AC_SUBST(SHELL)
-Index: samba-3.0.21b/source/dynconfig.c
+Index: samba-3.0.21c/source/dynconfig.c
 ===================================================================
---- samba-3.0.21b.orig/source/dynconfig.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/dynconfig.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/dynconfig.c	2006-02-25 11:57:11.586360572 +0100
++++ samba-3.0.21c/source/dynconfig.c	2006-02-25 11:58:15.772409953 +0100
 @@ -53,6 +53,13 @@
  pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
  
@@ -114,10 +114,10 @@
 +	return lp_lockdir();
 +#endif
 +}
-Index: samba-3.0.21b/source/groupdb/mapping.c
+Index: samba-3.0.21c/source/groupdb/mapping.c
 ===================================================================
---- samba-3.0.21b.orig/source/groupdb/mapping.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/groupdb/mapping.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/groupdb/mapping.c	2006-02-25 11:57:11.587360370 +0100
++++ samba-3.0.21c/source/groupdb/mapping.c	2006-02-25 11:58:15.776409146 +0100
 @@ -129,7 +129,7 @@
  	
  	if (tdb)
@@ -127,10 +127,10 @@
  	if (!tdb) {
  		DEBUG(0,("Failed to open group mapping database\n"));
  		return False;
-Index: samba-3.0.21b/source/include/dynconfig.h
+Index: samba-3.0.21c/source/include/dynconfig.h
 ===================================================================
---- samba-3.0.21b.orig/source/include/dynconfig.h	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/include/dynconfig.h	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/include/dynconfig.h	2006-02-25 11:57:11.588360168 +0100
++++ samba-3.0.21c/source/include/dynconfig.h	2006-02-25 11:58:15.777408944 +0100
 @@ -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.21b/source/intl/lang_tdb.c
+Index: samba-3.0.21c/source/intl/lang_tdb.c
 ===================================================================
---- samba-3.0.21b.orig/source/intl/lang_tdb.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/intl/lang_tdb.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/intl/lang_tdb.c	2006-02-25 11:57:11.589359967 +0100
++++ samba-3.0.21c/source/intl/lang_tdb.c	2006-02-25 11:58:15.779408541 +0100
 @@ -128,7 +128,7 @@
  	if (!lang) 
  		return True;
@@ -157,10 +157,10 @@
  	if (stat(msg_path, &st) != 0) {
  		/* the msg file isn't available */
  		DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path, 
-Index: samba-3.0.21b/source/lib/util.c
+Index: samba-3.0.21c/source/lib/util.c
 ===================================================================
---- samba-3.0.21b.orig/source/lib/util.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/lib/util.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/lib/util.c	2006-02-25 11:57:11.590359765 +0100
++++ samba-3.0.21c/source/lib/util.c	2006-02-25 11:58:15.784407532 +0100
 @@ -2410,6 +2410,61 @@
  }
  
@@ -223,10 +223,10 @@
   * @brief Returns the platform specific shared library extension.
   *
   * @retval Pointer to a static #fstring containing the extension.
-Index: samba-3.0.21b/source/lib/util_unistr.c
+Index: samba-3.0.21c/source/lib/util_unistr.c
 ===================================================================
---- samba-3.0.21b.orig/source/lib/util_unistr.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/lib/util_unistr.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/lib/util_unistr.c	2006-02-25 11:57:11.591359563 +0100
++++ samba-3.0.21c/source/lib/util_unistr.c	2006-02-25 11:58:15.787406927 +0100
 @@ -58,8 +58,8 @@
  	}
  	initialised = 1;
@@ -247,10 +247,10 @@
  	if (valid_file) {
  		valid_table = valid_file;
  		mapped_file = 1;
-Index: samba-3.0.21b/source/libsmb/samlogon_cache.c
+Index: samba-3.0.21c/source/libsmb/samlogon_cache.c
 ===================================================================
---- samba-3.0.21b.orig/source/libsmb/samlogon_cache.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/libsmb/samlogon_cache.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/libsmb/samlogon_cache.c	2006-02-25 11:57:11.593359160 +0100
++++ samba-3.0.21c/source/libsmb/samlogon_cache.c	2006-02-25 11:58:15.788406725 +0100
 @@ -34,7 +34,7 @@
  BOOL netsamlogon_cache_init(void)
  {
@@ -269,10 +269,10 @@
  				   TDB_DEFAULT, O_RDWR, 0600);
  		if (!tdb) {
  			DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
-Index: samba-3.0.21b/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.0.21c/source/nmbd/nmbd_serverlistdb.c
 ===================================================================
---- samba-3.0.21b.orig/source/nmbd/nmbd_serverlistdb.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/nmbd/nmbd_serverlistdb.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/nmbd/nmbd_serverlistdb.c	2006-02-25 11:57:11.594358958 +0100
++++ samba-3.0.21c/source/nmbd/nmbd_serverlistdb.c	2006-02-25 11:58:15.790406322 +0100
 @@ -327,7 +327,7 @@
  
  	updatecount++;
@@ -282,10 +282,10 @@
  	trim_char(fname,'\0' ,'/');
  	pstrcat(fname,"/");
  	pstrcat(fname,SERVER_LIST);
-Index: samba-3.0.21b/source/nmbd/nmbd_winsserver.c
+Index: samba-3.0.21c/source/nmbd/nmbd_winsserver.c
 ===================================================================
---- samba-3.0.21b.orig/source/nmbd/nmbd_winsserver.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/nmbd/nmbd_winsserver.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/nmbd/nmbd_winsserver.c	2006-02-25 11:57:11.603357143 +0100
++++ samba-3.0.21c/source/nmbd/nmbd_winsserver.c	2006-02-25 11:58:15.795405313 +0100
 @@ -244,7 +244,7 @@
  
  	add_samba_names_to_subnet(wins_server_subnet);
@@ -304,10 +304,10 @@
  	all_string_sub(fname,"//", "/", 0);
  	slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
  
-Index: samba-3.0.21b/source/passdb/login_cache.c
+Index: samba-3.0.21c/source/passdb/login_cache.c
 ===================================================================
---- samba-3.0.21b.orig/source/passdb/login_cache.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/passdb/login_cache.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/passdb/login_cache.c	2006-02-25 11:57:11.604356941 +0100
++++ samba-3.0.21c/source/passdb/login_cache.c	2006-02-25 11:58:15.797404910 +0100
 @@ -36,7 +36,7 @@
  	/* skip file open if it's already opened */
  	if (cache) return True;
@@ -317,10 +317,10 @@
  	if (cache_fname)
  		DEBUG(5, ("Opening cache file at %s\n", cache_fname));
  	else {
-Index: samba-3.0.21b/source/nsswitch/winbindd_cache.c
+Index: samba-3.0.21c/source/nsswitch/winbindd_cache.c
 ===================================================================
---- samba-3.0.21b.orig/source/nsswitch/winbindd_cache.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/nsswitch/winbindd_cache.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/nsswitch/winbindd_cache.c	2006-02-25 11:57:11.606356537 +0100
++++ samba-3.0.21c/source/nsswitch/winbindd_cache.c	2006-02-25 11:58:15.800404304 +0100
 @@ -58,7 +58,7 @@
  	if (opt_nocache)
  		return;
@@ -339,10 +339,10 @@
  				   TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0600);
  
  	if (wcache->tdb == NULL) {
-Index: samba-3.0.21b/source/nsswitch/winbindd_util.c
+Index: samba-3.0.21c/source/nsswitch/winbindd_util.c
 ===================================================================
---- samba-3.0.21b.orig/source/nsswitch/winbindd_util.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/nsswitch/winbindd_util.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/nsswitch/winbindd_util.c	2006-02-25 11:57:11.607356336 +0100
++++ samba-3.0.21c/source/nsswitch/winbindd_util.c	2006-02-25 11:58:15.803403699 +0100
 @@ -1172,7 +1172,7 @@
  	SMB_STRUCT_STAT stbuf;
  	TDB_CONTEXT *idmap_tdb;
@@ -352,10 +352,10 @@
  
  	if (!file_exist(idmap_name, &stbuf)) {
  		/* nothing to convert return */
-Index: samba-3.0.21b/source/param/loadparm.c
+Index: samba-3.0.21c/source/param/loadparm.c
 ===================================================================
---- samba-3.0.21b.orig/source/param/loadparm.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/param/loadparm.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/param/loadparm.c	2006-02-25 11:57:11.608356134 +0100
++++ samba-3.0.21c/source/param/loadparm.c	2006-02-25 11:58:15.994365168 +0100
 @@ -105,6 +105,9 @@
  	char *szAddPrinterCommand;
  	char *szDeletePrinterCommand;
@@ -380,10 +380,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.21b/source/passdb/pdb_tdb.c
+Index: samba-3.0.21c/source/passdb/pdb_tdb.c
 ===================================================================
---- samba-3.0.21b.orig/source/passdb/pdb_tdb.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/passdb/pdb_tdb.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/passdb/pdb_tdb.c	2006-02-25 11:57:11.605356739 +0100
++++ samba-3.0.21c/source/passdb/pdb_tdb.c	2006-02-25 11:58:15.997364563 +0100
 @@ -918,10 +918,7 @@
  	if (location) {
  		tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location);
@@ -396,10 +396,10 @@
  		tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, tdbfile);
  	}
  
-Index: samba-3.0.21b/source/passdb/secrets.c
+Index: samba-3.0.21c/source/passdb/secrets.c
 ===================================================================
---- samba-3.0.21b.orig/source/passdb/secrets.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/passdb/secrets.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/passdb/secrets.c	2006-02-25 11:57:11.605356739 +0100
++++ samba-3.0.21c/source/passdb/secrets.c	2006-02-25 11:58:15.999364159 +0100
 @@ -58,8 +58,7 @@
  	if (tdb)
  		return True;
@@ -410,10 +410,10 @@
  
  	tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
  
-Index: samba-3.0.21b/source/printing/nt_printing.c
+Index: samba-3.0.21c/source/printing/nt_printing.c
 ===================================================================
---- samba-3.0.21b.orig/source/printing/nt_printing.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/printing/nt_printing.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/printing/nt_printing.c	2006-02-25 11:57:11.609355932 +0100
++++ samba-3.0.21c/source/printing/nt_printing.c	2006-02-25 11:58:16.008362344 +0100
 @@ -530,28 +530,28 @@
   
  	if (tdb_drivers)
@@ -458,10 +458,10 @@
  		pstrcat(printdb_path, sharename);
  		pstrcat(printdb_path, ".tdb");
  
-Index: samba-3.0.21b/source/printing/printing.c
+Index: samba-3.0.21c/source/printing/printing.c
 ===================================================================
---- samba-3.0.21b.orig/source/printing/printing.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/printing/printing.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/printing/printing.c	2006-02-25 11:57:11.627352301 +0100
++++ samba-3.0.21c/source/printing/printing.c	2006-02-25 11:58:16.013361335 +0100
 @@ -183,8 +183,8 @@
  	int services = lp_numservices();
  	int snum;
@@ -473,10 +473,10 @@
  	mkdir(printing_path,0755);
  
  	/* handle a Samba upgrade */
-Index: samba-3.0.21b/source/printing/printing_db.c
+Index: samba-3.0.21c/source/printing/printing_db.c
 ===================================================================
---- samba-3.0.21b.orig/source/printing/printing_db.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/printing/printing_db.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/printing/printing_db.c	2006-02-25 11:57:11.628352100 +0100
++++ samba-3.0.21c/source/printing/printing_db.c	2006-02-25 11:58:16.015360931 +0100
 @@ -89,7 +89,7 @@
  		DLIST_ADD(print_db_head, p);
  	}
@@ -486,10 +486,10 @@
  	pstrcat(printdb_path, printername);
  	pstrcat(printdb_path, ".tdb");
  
-Index: samba-3.0.21b/source/rpc_server/srv_srvsvc_nt.c
+Index: samba-3.0.21c/source/rpc_server/srv_srvsvc_nt.c
 ===================================================================
---- samba-3.0.21b.orig/source/rpc_server/srv_srvsvc_nt.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/rpc_server/srv_srvsvc_nt.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/rpc_server/srv_srvsvc_nt.c	2006-02-25 11:57:11.630351696 +0100
++++ samba-3.0.21c/source/rpc_server/srv_srvsvc_nt.c	2006-02-25 11:58:16.019360125 +0100
 @@ -158,10 +158,10 @@
   
  	if (share_tdb && local_pid == sys_getpid())
@@ -503,10 +503,10 @@
  		return False;
  	}
   
-Index: samba-3.0.21b/source/sam/idmap_tdb.c
+Index: samba-3.0.21c/source/sam/idmap_tdb.c
 ===================================================================
---- samba-3.0.21b.orig/source/sam/idmap_tdb.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/sam/idmap_tdb.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/sam/idmap_tdb.c	2006-02-25 11:57:11.631351494 +0100
++++ samba-3.0.21c/source/sam/idmap_tdb.c	2006-02-25 11:58:16.022359519 +0100
 @@ -487,7 +487,7 @@
  	BOOL tdb_is_new = False;
  
@@ -516,10 +516,10 @@
  	if (!tdbfile) {
  		DEBUG(0, ("idmap_init: out of memory!\n"));
  		return NT_STATUS_NO_MEMORY;
-Index: samba-3.0.21b/source/smbd/lanman.c
+Index: samba-3.0.21c/source/smbd/lanman.c
 ===================================================================
---- samba-3.0.21b.orig/source/smbd/lanman.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/smbd/lanman.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/smbd/lanman.c	2006-02-25 11:57:11.633351091 +0100
++++ samba-3.0.21c/source/smbd/lanman.c	2006-02-25 11:58:16.028358309 +0100
 @@ -1040,9 +1040,9 @@
    BOOL local_list_only;
    int i;
@@ -532,10 +532,10 @@
      return(0);
    }
  
-Index: samba-3.0.21b/source/utils/net_idmap.c
+Index: samba-3.0.21c/source/utils/net_idmap.c
 ===================================================================
---- samba-3.0.21b.orig/source/utils/net_idmap.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/utils/net_idmap.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/utils/net_idmap.c	2006-02-25 11:57:11.633351091 +0100
++++ samba-3.0.21c/source/utils/net_idmap.c	2006-02-25 11:58:16.071349634 +0100
 @@ -136,7 +136,7 @@
  		return NT_STATUS_UNSUCCESSFUL;
  	}
@@ -545,10 +545,10 @@
  	if (!tdbfile) {
  		DEBUG(0, ("idmap_init: out of memory!\n"));
  		return NT_STATUS_NO_MEMORY;
-Index: samba-3.0.21b/source/wrepld/process.c
+Index: samba-3.0.21c/source/wrepld/process.c
 ===================================================================
---- samba-3.0.21b.orig/source/wrepld/process.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/wrepld/process.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/wrepld/process.c	2006-02-25 11:57:11.634350889 +0100
++++ samba-3.0.21c/source/wrepld/process.c	2006-02-25 11:58:16.073349231 +0100
 @@ -197,7 +197,7 @@
  {
  	TDB_CONTEXT *tdb;
@@ -567,10 +567,10 @@
  	if (!tdb) {
  		DEBUG(2,("send_entry_request: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) ));
  		return;
-Index: samba-3.0.21b/source/registry/reg_db.c
+Index: samba-3.0.21c/source/registry/reg_db.c
 ===================================================================
---- samba-3.0.21b.orig/source/registry/reg_db.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/registry/reg_db.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/registry/reg_db.c	2006-02-25 11:57:11.635350688 +0100
++++ samba-3.0.21c/source/registry/reg_db.c	2006-02-25 11:58:16.076348626 +0100
 @@ -205,12 +205,12 @@
  	if ( tdb_reg )
  		return True;
@@ -601,10 +601,10 @@
  	}
  
  	unbecome_root();
-Index: samba-3.0.21b/source/lib/account_pol.c
+Index: samba-3.0.21c/source/lib/account_pol.c
 ===================================================================
---- samba-3.0.21b.orig/source/lib/account_pol.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/lib/account_pol.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/lib/account_pol.c	2006-02-25 11:57:11.592359361 +0100
++++ samba-3.0.21c/source/lib/account_pol.c	2006-02-25 11:58:16.078348222 +0100
 @@ -262,7 +262,7 @@
  		return True;
  	}
@@ -614,10 +614,10 @@
  	if (!tdb) {
  		DEBUG(0,("Failed to open account policy database\n"));
  		return False;
-Index: samba-3.0.21b/source/registry/reg_perfcount.c
+Index: samba-3.0.21c/source/registry/reg_perfcount.c
 ===================================================================
---- samba-3.0.21b.orig/source/registry/reg_perfcount.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/registry/reg_perfcount.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/registry/reg_perfcount.c	2006-02-25 11:57:11.636350486 +0100
++++ samba-3.0.21c/source/registry/reg_perfcount.c	2006-02-25 11:58:16.081347617 +0100
 @@ -44,7 +44,7 @@
  	
  	fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
@@ -636,10 +636,10 @@
  
  	/* no registry keys; just create the perfmon directory */
  	
-Index: samba-3.0.21b/source/rpc_server/srv_eventlog_lib.c
+Index: samba-3.0.21c/source/rpc_server/srv_eventlog_lib.c
 ===================================================================
---- samba-3.0.21b.orig/source/rpc_server/srv_eventlog_lib.c	2006-02-06 00:01:09.000000000 -0800
-+++ samba-3.0.21b/source/rpc_server/srv_eventlog_lib.c	2006-02-06 00:01:23.000000000 -0800
+--- samba-3.0.21c.orig/source/rpc_server/srv_eventlog_lib.c	2006-02-25 11:57:11.630351696 +0100
++++ samba-3.0.21c/source/rpc_server/srv_eventlog_lib.c	2006-02-25 11:58:16.083347214 +0100
 @@ -67,7 +67,7 @@
  {
  	fstring path;

Modified: trunk/patches/installswat.sh.patch
===================================================================
--- trunk/patches/installswat.sh.patch	2006-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/installswat.sh.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,7 +1,7 @@
-Index: samba-3.0.21a.new/source/script/installswat.sh
+Index: samba-3.0.21c/source/script/installswat.sh
 ===================================================================
---- samba-3.0.21a.new.orig/source/script/installswat.sh	2005-12-20 16:28:39.000000000 +0100
-+++ samba-3.0.21a.new/source/script/installswat.sh	2006-01-02 09:45:50.547172952 +0100
+--- samba-3.0.21c.orig/source/script/installswat.sh	2006-02-25 11:57:11.178442873 +0100
++++ samba-3.0.21c/source/script/installswat.sh	2006-02-25 11:58:18.019956453 +0100
 @@ -114,7 +114,11 @@
  
  # Install Using Samba book (but only if it is there)

Modified: trunk/patches/make-distclean.patch
===================================================================
--- trunk/patches/make-distclean.patch	2006-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/make-distclean.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,8 +1,8 @@
-Index: samba-3.0.21a.new/source/Makefile.in
+Index: samba-3.0.21c/source/Makefile.in
 ===================================================================
---- samba-3.0.21a.new.orig/source/Makefile.in	2006-01-02 09:43:36.349338911 +0100
-+++ samba-3.0.21a.new/source/Makefile.in	2006-01-02 09:58:46.622122510 +0100
-@@ -1490,6 +1490,7 @@
+--- samba-3.0.21c.orig/source/Makefile.in	2006-02-25 11:58:15.760412374 +0100
++++ samba-3.0.21c/source/Makefile.in	2006-02-25 11:58:18.819795065 +0100
+@@ -1491,6 +1491,7 @@
  
  python_clean:
  	@-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
@@ -10,7 +10,7 @@
  
  # revert to the previously installed version
  revert:
-@@ -1558,6 +1559,7 @@
+@@ -1559,6 +1560,7 @@
  	@rm -f include/proto.h include/build_env.h  include/wrepld_proto.h \
  		nsswitch/winbindd_proto.h web/swat_proto.h \
  		client/client_proto.h utils/net_proto.h \
@@ -18,7 +18,7 @@
  		smbd/build_options.c
  
  MKPROTO_SH = $(srcdir)/script/mkproto.sh
-@@ -1634,6 +1636,7 @@
+@@ -1641,6 +1643,7 @@
  
  distclean: realclean
  	-rm -f include/stamp-h

Modified: trunk/patches/nmbd-signalling.patch
===================================================================
--- trunk/patches/nmbd-signalling.patch	2006-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/nmbd-signalling.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,7 +1,7 @@
-Index: samba-3.0.21a.new/source/nmbd/nmbd_subnetdb.c
+Index: samba-3.0.21c/source/nmbd/nmbd_subnetdb.c
 ===================================================================
---- samba-3.0.21a.new.orig/source/nmbd/nmbd_subnetdb.c	2005-04-18 18:38:20.000000000 +0200
-+++ samba-3.0.21a.new/source/nmbd/nmbd_subnetdb.c	2006-01-02 09:45:53.644545861 +0100
+--- samba-3.0.21c.orig/source/nmbd/nmbd_subnetdb.c	2006-02-25 11:57:10.924494109 +0100
++++ samba-3.0.21c/source/nmbd/nmbd_subnetdb.c	2006-02-25 11:58:19.605636501 +0100
 @@ -214,12 +214,16 @@
  	struct in_addr unicast_ip, ipzero;
  

Modified: trunk/patches/non-linux-ports.patch
===================================================================
--- trunk/patches/non-linux-ports.patch	2006-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/non-linux-ports.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,8 +1,8 @@
-Index: samba-3.0.21b/source/configure.in
+Index: samba-3.0.21c/source/configure.in
 ===================================================================
---- samba-3.0.21b.orig/source/configure.in	2006-02-06 00:00:28.000000000 -0800
-+++ samba-3.0.21b/source/configure.in	2006-02-06 00:00:29.000000000 -0800
-@@ -638,6 +638,15 @@
+--- samba-3.0.21c.orig/source/configure.in	2006-02-25 11:58:15.771410155 +0100
++++ samba-3.0.21c/source/configure.in	2006-02-25 11:58:20.524451106 +0100
+@@ -639,6 +639,15 @@
        fi
      ;;
  
@@ -18,7 +18,7 @@
  # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
  #
      *linux*)
-@@ -1197,7 +1206,7 @@
+@@ -1198,7 +1207,7 @@
  # 
  #
  case "$host_os" in
@@ -27,7 +27,7 @@
         # glibc <= 2.3.2 has a broken getgrouplist
         AC_TRY_RUN([
  #include <unistd.h>
-@@ -1403,7 +1412,10 @@
+@@ -1405,7 +1414,10 @@
  
    # and these are for particular systems
    case "$host_os" in
@@ -39,7 +39,7 @@
  			BLDSHARED="true"
  			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
  				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined" 
-@@ -4651,7 +4663,7 @@
+@@ -4654,7 +4666,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>],
  [\
-@@ -4914,10 +4926,10 @@
+@@ -4917,10 +4929,10 @@
  WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS
  
  case "$host_os" in

Modified: trunk/patches/nonpic-libsmbclient.patch
===================================================================
--- trunk/patches/nonpic-libsmbclient.patch	2006-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/nonpic-libsmbclient.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,8 +1,8 @@
-Index: samba-3.0.21a.new/source/Makefile.in
+Index: samba-3.0.21c/source/Makefile.in
 ===================================================================
---- samba-3.0.21a.new.orig/source/Makefile.in	2006-01-02 09:45:52.416794431 +0100
-+++ samba-3.0.21a.new/source/Makefile.in	2006-01-02 09:58:11.514218283 +0100
-@@ -1064,9 +1064,9 @@
+--- samba-3.0.21c.orig/source/Makefile.in	2006-02-25 11:58:18.819795065 +0100
++++ samba-3.0.21c/source/Makefile.in	2006-02-25 11:58:21.336287297 +0100
+@@ -1065,9 +1065,9 @@
  		$(KRB5LIBS) $(LDAP_LIBS) \
  		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
  
@@ -14,7 +14,7 @@
  
  bin/libsmbsharemodes. at SHLIBEXT@: $(LIBSMBSHAREMODES_PICOBJS)
  	@echo Linking libsmbsharemodes shared library $@
-@@ -1083,9 +1083,9 @@
+@@ -1084,9 +1084,9 @@
  	@$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) $(LIBS) \
  	@SONAMEFLAG@`basename $@`.$(LIBMSRPC_MAJOR)
  

Modified: trunk/patches/pam-examples.patch
===================================================================
--- trunk/patches/pam-examples.patch	2006-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/pam-examples.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,7 +1,7 @@
-Index: samba-3.0.21a.new/source/pam_smbpass/README
+Index: samba-3.0.21c/source/pam_smbpass/README
 ===================================================================
---- samba-3.0.21a.new.orig/source/pam_smbpass/README	2005-02-25 18:59:30.000000000 +0100
-+++ samba-3.0.21a.new/source/pam_smbpass/README	2006-01-02 09:53:31.455818173 +0100
+--- samba-3.0.21c.orig/source/pam_smbpass/README	2006-02-25 11:57:10.632553011 +0100
++++ samba-3.0.21c/source/pam_smbpass/README	2006-02-25 11:58:22.133126513 +0100
 @@ -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-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/samba.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,7 +1,7 @@
-Index: samba-3.0.21b/source/client/smbmount.c
+Index: samba-3.0.21c/source/client/smbmount.c
 ===================================================================
---- samba-3.0.21b.orig/source/client/smbmount.c	2006-02-05 23:59:59.000000000 -0800
-+++ samba-3.0.21b/source/client/smbmount.c	2006-02-06 00:00:14.000000000 -0800
+--- samba-3.0.21c.orig/source/client/smbmount.c	2006-02-25 11:57:10.475584681 +0100
++++ samba-3.0.21c/source/client/smbmount.c	2006-02-25 11:58:23.681814024 +0100
 @@ -767,7 +767,7 @@
  					*lp = 0;
  					pstrcpy(password,lp+1);
@@ -20,7 +20,7 @@
  			} else if(!strcmp(opts, "credentials")) {
  				pstrcpy(credentials,opteq+1);
  			} else if(!strcmp(opts, "netbiosname")) {
-@@ -891,7 +891,7 @@
+@@ -893,7 +893,7 @@
  			*p = 0;
  			pstrcpy(password,p+1);
  			got_pass = True;
@@ -29,10 +29,10 @@
  		}
  		strupper_m(username);
  	}
-Index: samba-3.0.21b/source/web/diagnose.c
+Index: samba-3.0.21c/source/web/diagnose.c
 ===================================================================
---- samba-3.0.21b.orig/source/web/diagnose.c	2006-02-05 23:59:59.000000000 -0800
-+++ samba-3.0.21b/source/web/diagnose.c	2006-02-06 00:00:05.000000000 -0800
+--- samba-3.0.21c.orig/source/web/diagnose.c	2006-02-25 11:57:10.476584479 +0100
++++ samba-3.0.21c/source/web/diagnose.c	2006-02-25 11:58:23.683813621 +0100
 @@ -62,6 +62,7 @@
  {
  	static struct cli_state cli;
@@ -41,10 +41,10 @@
  	if (!cli_initialise(&cli))
  		return False;
  
-Index: samba-3.0.21b/source/script/installbin.sh
+Index: samba-3.0.21c/source/script/installbin.sh
 ===================================================================
---- samba-3.0.21b.orig/source/script/installbin.sh	2006-02-05 23:59:59.000000000 -0800
-+++ samba-3.0.21b/source/script/installbin.sh	2006-02-06 00:00:05.000000000 -0800
+--- samba-3.0.21c.orig/source/script/installbin.sh	2006-02-25 11:57:10.477584277 +0100
++++ samba-3.0.21c/source/script/installbin.sh	2006-02-25 11:58:23.684813419 +0100
 @@ -24,12 +24,14 @@
   chmod $INSTALLPERMS $BINDIR/$p2
  

Modified: trunk/patches/series
===================================================================
--- trunk/patches/series	2006-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/series	2006-02-25 11:00:12 UTC (rev 1032)
@@ -18,4 +18,5 @@
 VERSION.patch
 adapt_machine_creation_script.patch
 autoconf.patch
-libnss-soname.patch
+# This has been applied upstream
+# libnss-soname.patch

Modified: trunk/patches/smbclient-pager.patch
===================================================================
--- trunk/patches/smbclient-pager.patch	2006-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/smbclient-pager.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,7 +1,7 @@
-Index: samba-3.0.21a.new/source/include/local.h
+Index: samba-3.0.21c/source/include/local.h
 ===================================================================
---- samba-3.0.21a.new.orig/source/include/local.h	2005-11-09 19:29:00.000000000 +0100
-+++ samba-3.0.21a.new/source/include/local.h	2006-01-02 09:53:35.411016735 +0100
+--- samba-3.0.21c.orig/source/include/local.h	2006-02-25 11:57:10.314617157 +0100
++++ samba-3.0.21c/source/include/local.h	2006-02-25 11:58:24.566635487 +0100
 @@ -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-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/smbmount-mtab-flags.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,7 +1,7 @@
-Index: samba-3.0.21a.new/source/client/smbmnt.c
+Index: samba-3.0.21c/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.21a.new.orig/source/client/smbmnt.c	2005-07-28 15:19:53.000000000 +0200
-+++ samba-3.0.21a.new/source/client/smbmnt.c	2006-01-02 09:58:20.140474856 +0100
+--- samba-3.0.21c.orig/source/client/smbmnt.c	2006-02-25 11:57:10.224635312 +0100
++++ samba-3.0.21c/source/client/smbmnt.c	2006-02-25 11:58:25.369473493 +0100
 @@ -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-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/smbmount-nomtab.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,7 +1,7 @@
-Index: samba-3.0.21b/source/client/smbmnt.c
+Index: samba-3.0.21c/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.21b.orig/source/client/smbmnt.c	2006-02-05 23:59:39.000000000 -0800
-+++ samba-3.0.21b/source/client/smbmnt.c	2006-02-05 23:59:39.000000000 -0800
+--- samba-3.0.21c.orig/source/client/smbmnt.c	2006-02-25 11:58:25.369473493 +0100
++++ samba-3.0.21c/source/client/smbmnt.c	2006-02-25 11:58:26.169312103 +0100
 @@ -44,6 +44,7 @@
  static uid_t mount_uid;
  static gid_t mount_gid;
@@ -103,10 +103,10 @@
  
  	return 0;
  }	
-Index: samba-3.0.21b/source/client/smbmount.c
+Index: samba-3.0.21c/source/client/smbmount.c
 ===================================================================
---- samba-3.0.21b.orig/source/client/smbmount.c	2006-02-05 23:59:39.000000000 -0800
-+++ samba-3.0.21b/source/client/smbmount.c	2006-02-05 23:59:53.000000000 -0800
+--- samba-3.0.21c.orig/source/client/smbmount.c	2006-02-25 11:58:23.681814024 +0100
++++ samba-3.0.21c/source/client/smbmount.c	2006-02-25 11:58:26.184309077 +0100
 @@ -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-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/smbmount-unix-caps.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,7 +1,7 @@
-Index: samba-3.0.21a.new/source/client/smbmount.c
+Index: samba-3.0.21c/source/client/smbmount.c
 ===================================================================
---- samba-3.0.21a.new.orig/source/client/smbmount.c	2006-01-02 09:57:48.391891301 +0100
-+++ samba-3.0.21a.new/source/client/smbmount.c	2006-01-02 09:57:49.591648836 +0100
+--- samba-3.0.21c.orig/source/client/smbmount.c	2006-02-25 11:58:26.184309077 +0100
++++ samba-3.0.21c/source/client/smbmount.c	2006-02-25 11:58:26.999144662 +0100
 @@ -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-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/smbstatus-locking.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,8 +1,8 @@
-Index: samba-3.0.21b/source/utils/status.c
+Index: samba-3.0.21c/source/utils/status.c
 ===================================================================
---- samba-3.0.21b.orig/source/utils/status.c	2006-02-05 23:59:10.000000000 -0800
-+++ samba-3.0.21b/source/utils/status.c	2006-02-05 23:59:17.000000000 -0800
-@@ -703,6 +703,16 @@
+--- samba-3.0.21c.orig/source/utils/status.c	2006-02-25 11:57:09.791722656 +0100
++++ samba-3.0.21c/source/utils/status.c	2006-02-25 11:58:27.799983070 +0100
+@@ -708,6 +708,16 @@
  	if ( show_locks ) {
  		int ret;
  

Modified: trunk/patches/undefined-symbols.patch
===================================================================
--- trunk/patches/undefined-symbols.patch	2006-02-14 18:01:27 UTC (rev 1031)
+++ trunk/patches/undefined-symbols.patch	2006-02-25 11:00:12 UTC (rev 1032)
@@ -1,9 +1,9 @@
-Index: samba-3.0.21a.new/source/Makefile.in
+Index: samba-3.0.21c/source/Makefile.in
 ===================================================================
---- samba-3.0.21a.new.orig/source/Makefile.in	2006-01-02 09:53:29.905132385 +0100
-+++ samba-3.0.21a.new/source/Makefile.in	2006-01-02 09:57:52.987962455 +0100
-@@ -673,7 +673,8 @@
-             $(RPC_NTSVCS_OBJ)
+--- samba-3.0.21c.orig/source/Makefile.in	2006-02-25 11:58:21.336287297 +0100
++++ samba-3.0.21c/source/Makefile.in	2006-02-25 11:58:30.862365147 +0100
+@@ -674,7 +674,8 @@
+             $(RPC_NTSVCS_OBJ) utils/passwd_util.o
  
  WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) \
 -	$(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ)
@@ -12,7 +12,7 @@
  
  WINBIND_WINS_NSS_PICOBJS = $(WINBIND_WINS_NSS_OBJ:.o=. at PICSUFFIX@)
  
-@@ -1060,7 +1061,7 @@
+@@ -1061,7 +1062,7 @@
  
  bin/libsmbclient. at SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
  	@echo Linking libsmbclient shared library $@




More information about the Pkg-samba-maint mailing list