[[[
Move declarations of svn_auth_get_(gnome_keyring|kwallet)_* to svn_auth.h.

* subversion/include/svn_auth.h
  (svn_auth_get_gnome_keyring_simple_provider,
   svn_auth_get_gnome_keyring_ssl_client_cert_pw_provider,
   svn_auth_get_kwallet_simple_provider,
   svn_auth_get_kwallet_ssl_client_cert_pw_provider): Move to here from
   svn_auth_dso.h.

* subversion/include/svn_auth_dso.h: Delete.

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c:
* subversion/libsvn_auth_kwallet/kwallet.cpp: Don't include "svn_auth_dso.h".

* build/generator/extractor.py
  (_filter_names): Append svn_auth_get_*_provider.
]]]

Index: subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
===================================================================
--- subversion/libsvn_auth_gnome_keyring/gnome_keyring.c	(revision 33244)
+++ subversion/libsvn_auth_gnome_keyring/gnome_keyring.c	(working copy)
@@ -24,7 +24,6 @@
 
 #include <apr_pools.h>
 #include "svn_auth.h"
-#include "svn_auth_dso.h"
 #include "svn_error.h"
 
 #include "private/svn_auth_private.h"
Index: subversion/include/svn_auth_dso.h
===================================================================
--- subversion/include/svn_auth_dso.h	(revision 33244)
+++ subversion/include/svn_auth_dso.h	(working copy)
@@ -1,111 +0,0 @@
-/**
- * @copyright
- * ====================================================================
- * Copyright (c) 2008 CollabNet.  All rights reserved.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at http://subversion.tigris.org/license-1.html.
- * If newer versions of this license are posted there, you may use a
- * newer version instead, at your option.
- *
- * This software consists of voluntary contributions made by many
- * individuals.  For exact contribution history, see the revision
- * history and logs, available at http://subversion.tigris.org/.
- * ====================================================================
- * @endcopyright
- *
- * @file svn_auth_dso.h
- * @brief Subversion's authentication system - Support for DSOs
- */
-
-#ifndef SVN_AUTH_DSO_H
-#define SVN_AUTH_DSO_H
-
-#include <apr_pools.h>
-
-#include "svn_auth.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * Create and return @a *provider, an authentication provider of type @c
- * svn_auth_cred_simple_t that gets/sets information from the user's
- * ~/.subversion configuration directory.  Allocate @a *provider in
- * @a pool.
- *
- * This is like svn_client_get_simple_provider(), except that the
- * password is stored in GNOME Keyring.
- *
- * @since New in 1.6
- * @note This function actually works only on systems with
- * libsvn_auth_gnome_keyring and GNOME Keyring installed.
- */
-void
-svn_auth_get_gnome_keyring_simple_provider
-    (svn_auth_provider_object_t **provider,
-     apr_pool_t *pool);
-
-
-/**
- * Create and return @a *provider, an authentication provider of type @c
- * svn_auth_cred_ssl_client_cert_pw_t that gets/sets information from the
- * user's ~/.subversion configuration directory.  Allocate @a *provider in
- * @a pool.
- *
- * This is like svn_client_get_ssl_client_cert_pw_file_provider(), except
- * that the password is stored in GNOME Keyring.
- *
- * @since New in 1.6
- * @note This function actually works only on systems with
- * libsvn_auth_gnome_keyring and GNOME Keyring installed.
- */
-void
-svn_auth_get_gnome_keyring_ssl_client_cert_pw_provider
-  (svn_auth_provider_object_t **provider,
-   apr_pool_t *pool);
-
-
-/**
- * Create and return @a *provider, an authentication provider of type @c
- * svn_auth_cred_simple_t that gets/sets information from the user's
- * ~/.subversion configuration directory.  Allocate @a *provider in
- * @a pool.
- *
- * This is like svn_client_get_simple_provider(), except that the
- * password is stored in KWallet.
- *
- * @since New in 1.6
- * @note This function actually works only on systems with libsvn_auth_kwallet
- * and KWallet installed.
- */
-void
-svn_auth_get_kwallet_simple_provider(svn_auth_provider_object_t **provider,
-                                     apr_pool_t *pool);
-
-
-/**
- * Create and return @a *provider, an authentication provider of type @c
- * svn_auth_cred_ssl_client_cert_pw_t that gets/sets information from the
- * user's ~/.subversion configuration directory.  Allocate @a *provider in
- * @a pool.
- *
- * This is like svn_client_get_ssl_client_cert_pw_file_provider(), except
- * that the password is stored in KWallet.
- *
- * @since New in 1.6
- * @note This function actually works only on systems with libsvn_auth_kwallet
- * and KWallet installed.
- */
-void
-svn_auth_get_kwallet_ssl_client_cert_pw_provider
-  (svn_auth_provider_object_t **provider,
-   apr_pool_t *pool);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* SVN_AUTH_DSO_H */
Index: subversion/include/svn_auth.h
===================================================================
--- subversion/include/svn_auth.h	(revision 33244)
+++ subversion/include/svn_auth.h	(working copy)
@@ -844,7 +844,83 @@ svn_auth_get_keychain_ssl_client_cert_pw_provider
    apr_pool_t *pool);
 #endif /* DARWIN || DOXYGEN */
 
+#if (!defined(DARWIN) && !defined(WIN32)) || defined(DOXYGEN)
+/**
+ * Create and return @a *provider, an authentication provider of type @c
+ * svn_auth_cred_simple_t that gets/sets information from the user's
+ * ~/.subversion configuration directory.  Allocate @a *provider in
+ * @a pool.
+ *
+ * This is like svn_client_get_simple_provider(), except that the
+ * password is stored in GNOME Keyring.
+ *
+ * @since New in 1.6
+ * @note This function actually works only on systems with
+ * libsvn_auth_gnome_keyring and GNOME Keyring installed.
+ */
+void
+svn_auth_get_gnome_keyring_simple_provider
+    (svn_auth_provider_object_t **provider,
+     apr_pool_t *pool);
 
+
+/**
+ * Create and return @a *provider, an authentication provider of type @c
+ * svn_auth_cred_ssl_client_cert_pw_t that gets/sets information from the
+ * user's ~/.subversion configuration directory.  Allocate @a *provider in
+ * @a pool.
+ *
+ * This is like svn_client_get_ssl_client_cert_pw_file_provider(), except
+ * that the password is stored in GNOME Keyring.
+ *
+ * @since New in 1.6
+ * @note This function actually works only on systems with
+ * libsvn_auth_gnome_keyring and GNOME Keyring installed.
+ */
+void
+svn_auth_get_gnome_keyring_ssl_client_cert_pw_provider
+  (svn_auth_provider_object_t **provider,
+   apr_pool_t *pool);
+
+
+/**
+ * Create and return @a *provider, an authentication provider of type @c
+ * svn_auth_cred_simple_t that gets/sets information from the user's
+ * ~/.subversion configuration directory.  Allocate @a *provider in
+ * @a pool.
+ *
+ * This is like svn_client_get_simple_provider(), except that the
+ * password is stored in KWallet.
+ *
+ * @since New in 1.6
+ * @note This function actually works only on systems with libsvn_auth_kwallet
+ * and KWallet installed.
+ */
+void
+svn_auth_get_kwallet_simple_provider(svn_auth_provider_object_t **provider,
+                                     apr_pool_t *pool);
+
+
+/**
+ * Create and return @a *provider, an authentication provider of type @c
+ * svn_auth_cred_ssl_client_cert_pw_t that gets/sets information from the
+ * user's ~/.subversion configuration directory.  Allocate @a *provider in
+ * @a pool.
+ *
+ * This is like svn_client_get_ssl_client_cert_pw_file_provider(), except
+ * that the password is stored in KWallet.
+ *
+ * @since New in 1.6
+ * @note This function actually works only on systems with libsvn_auth_kwallet
+ * and KWallet installed.
+ */
+void
+svn_auth_get_kwallet_ssl_client_cert_pw_provider
+  (svn_auth_provider_object_t **provider,
+   apr_pool_t *pool);
+#endif /* (!DARWIN && !WIN32) || DOXYGEN */
+
+
 /** Create and return @a *provider, an authentication provider of type @c
  * svn_auth_cred_username_t that gets/sets information from a user's
  * ~/.subversion configuration directory.  Allocate @a *provider in
Index: subversion/libsvn_auth_kwallet/kwallet.cpp
===================================================================
--- subversion/libsvn_auth_kwallet/kwallet.cpp	(revision 33244)
+++ subversion/libsvn_auth_kwallet/kwallet.cpp	(working copy)
@@ -24,7 +24,6 @@
 
 #include <apr_pools.h>
 #include "svn_auth.h"
-#include "svn_auth_dso.h"
 #include "svn_error.h"
 #include "svn_version.h"
 
Index: build/generator/extractor.py
===================================================================
--- build/generator/extractor.py	(revision 33244)
+++ build/generator/extractor.py	(working copy)
@@ -3,7 +3,7 @@
 # extractor.py: extract function names from declarations in header files
 #
 # ====================================================================
-# Copyright (c) 2000-2006 CollabNet.  All rights reserved.
+# Copyright (c) 2000-2006, 2008 CollabNet.  All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution.  The terms
@@ -45,6 +45,10 @@ _filter_names = [
   # Not available on Windows
   'svn_auth_get_keychain_simple_provider', 
   'svn_auth_get_keychain_ssl_client_cert_pw_provider',
+  'svn_auth_get_gnome_keyring_simple_provider',
+  'svn_auth_get_gnome_keyring_ssl_client_cert_pw_provider',
+  'svn_auth_get_kwallet_simple_provider',
+  'svn_auth_get_kwallet_ssl_client_cert_pw_provider',
   ]
 
 if __name__ == '__main__':