[svn] dirmngr - r327 - in trunk: . src

[svn author marcus]

Author: marcus
Date: 2009-10-16 20:27:13 +0200 (Fri, 16 Oct 2009)
New Revision: 327

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/ChangeLog
   trunk/src/Makefile.am
   trunk/src/dirmngr.c
Log:
2009-10-16  Marcus Brinkmann  <marcus at g10code.com>

	* configure.ac: Test for libassuan instead of libassuan-pth.

src/
2009-10-16  Marcus Brinkmann  <marcus at g10code.com>

	* Makefile.am: (dirmngr_LDADD): Link to $(LIBASSUAN_LIBS) instead
	of $(LIBASSUAN_PTH_LIBS).
	* dirmngr.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
	(main): Call assuan_set_system_hooks and assuan_sock_init.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-09-22 23:15:15 UTC (rev 326)
+++ trunk/ChangeLog	2009-10-16 18:27:13 UTC (rev 327)
@@ -1,3 +1,7 @@
+2009-10-16  Marcus Brinkmann  <marcus at g10code.com>
+
+	* configure.ac: Test for libassuan instead of libassuan-pth.
+
 2009-09-22  Marcus Brinkmann  <marcus at g10code.de>
 
 	* configure.ac (NEED_LIBASSUAN_API, NEED_LIBASSUAN_VERSION): Bump

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-09-22 23:15:15 UTC (rev 326)
+++ trunk/src/ChangeLog	2009-10-16 18:27:13 UTC (rev 327)
@@ -1,3 +1,10 @@
+2009-10-16  Marcus Brinkmann  <marcus at g10code.com>
+
+	* Makefile.am: (dirmngr_LDADD): Link to $(LIBASSUAN_LIBS) instead
+	of $(LIBASSUAN_PTH_LIBS).
+	* dirmngr.c: Invoke ASSUAN_SYSTEM_PTH_IMPL.
+	(main): Call assuan_set_system_hooks and assuan_sock_init.
+
 2009-09-22  Marcus Brinkmann  <marcus at g10code.de>
 
 	* dirmngr.c (main): Update to new Assuan interface.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-09-22 23:15:15 UTC (rev 326)
+++ trunk/configure.ac	2009-10-16 18:27:13 UTC (rev 327)
@@ -236,8 +236,8 @@
                   have_libassuan=yes,have_libassuan=no)
 if test "$have_libassuan" = "yes"; then
   have_libassuan=no
-  AM_PATH_LIBASSUAN_PTH("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
-                        have_libassuan=yes,have_libassuan=no)
+  AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
+		    have_libassuan=yes,have_libassuan=no)
 fi
 
 

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-09-22 23:15:15 UTC (rev 326)
+++ trunk/src/Makefile.am	2009-10-16 18:27:13 UTC (rev 327)
@@ -47,7 +47,7 @@
 	estream-printf.h validate.c validate.h exechelp.h exechelp.c	\
 	get-path.c
 
-dirmngr_LDADD = ../jnlib/libjnlib.a $(LIBOBJS) $(LIBASSUAN_PTH_LIBS)  \
+dirmngr_LDADD = ../jnlib/libjnlib.a $(LIBOBJS) $(LIBASSUAN_LIBS)  \
 	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(PTH_LIBS) $(LIBINTL) $(LIBICONV)
 
 if HAVE_W32_SYSTEM

Modified: trunk/src/dirmngr.c
===================================================================
--- trunk/src/dirmngr.c	2009-09-22 23:15:15 UTC (rev 326)
+++ trunk/src/dirmngr.c	2009-10-16 18:27:13 UTC (rev 327)
@@ -253,9 +253,10 @@
 static void handle_connections (assuan_fd_t listen_fd);
 
 /* Pth wrapper function definitions. */
+ASSUAN_SYSTEM_PTH_IMPL;
+
 GCRY_THREAD_OPTION_PTH_IMPL;
 
-
 static const char *
 my_strusage( int level )
 {
@@ -661,6 +662,8 @@
   assuan_set_malloc_hooks (&malloc_hooks);
   assuan_set_assuan_log_prefix (log_get_prefix (NULL));
   assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
+  assuan_set_system_hooks (ASSUAN_SYSTEM_PTH);
+  assuan_sock_init ();
 
   /* Setup I18N. */
   i18n_init();