[svn] GnuPG - r5441 - in trunk: . common

[svn author wk]

Author: wk
Date: 2010-10-08 16:37:42 +0200 (Fri, 08 Oct 2010)
New Revision: 5441

Modified:
   trunk/ChangeLog
   trunk/autogen.sh
   trunk/common/asshelp.c
   trunk/configure.ac
Log:
New configure optionh --enable-dirmngr-auto-start.
autogen.sh enables this for CE.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-10-08 11:11:08 UTC (rev 5440)
+++ trunk/ChangeLog	2010-10-08 14:37:42 UTC (rev 5441)
@@ -1,3 +1,9 @@
+2010-10-08  Werner Koch  <wk at g10code.com>
+
+	* configure.ac: Add option --enable-dirmngr-auto-start.
+	(USE_DIRMNGR_AUTO_START): New ac_define.
+	* autogen.sh <--build-w32ce>: Use new option.
+
 2010-10-06  Werner Koch  <wk at g10code.com>
 
 	* configure.ac: Make --enable-standard-socket the default.

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2010-10-08 11:11:08 UTC (rev 5440)
+++ trunk/autogen.sh	2010-10-08 14:37:42 UTC (rev 5441)
@@ -103,7 +103,8 @@
           w32root="$w32ce_root"
           [ -z "$w32root" ] && w32root="$HOME/w32ce_root"
           toolprefixes="$w32ce_toolprefixes arm-mingw32ce"
-          extraoptions="--disable-scdaemon --disable-zip $w32ce_extraoptions"
+          extraoptions="--enable-dirmngr-auto-start --disable-scdaemon "
+          extraoptions="$extraoptions --disable-zip $w32ce_extraoptions"
           ;;
         *)
           [ -z "$w32root" ] && w32root="$HOME/w32root"

Modified: trunk/common/asshelp.c
===================================================================
--- trunk/common/asshelp.c	2010-10-08 11:11:08 UTC (rev 5440)
+++ trunk/common/asshelp.c	2010-10-08 14:37:42 UTC (rev 5441)
@@ -547,7 +547,6 @@
   gpg_error_t err;
   assuan_context_t ctx;
   const char *sockname;
-  lock_spawn_t lock;
       
   *r_ctx = NULL;
 
@@ -560,8 +559,10 @@
 
   sockname = dirmngr_socket_name ();
   err = assuan_socket_connect (ctx, sockname, 0, 0);
+#ifdef USE_DIRMNGR_AUTO_START
   if (err)
     {
+      lock_spawn_t lock;
       const char *argv[2];
 
       /* With no success try start a new Dirmngr.  On most systems
@@ -619,6 +620,13 @@
       
       unlock_spawning (&lock, "dirmngr");
     }
+#else
+  (void)homedir;
+  (void)dirmngr_program;
+  (void)verbose;
+  (void)status_cb;
+  (void)status_cb_arg;
+#endif /*USE_DIRMNGR_AUTO_START*/
  
   if (err)
     {

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2010-10-08 11:11:08 UTC (rev 5440)
+++ trunk/configure.ac	2010-10-08 14:37:42 UTC (rev 5441)
@@ -80,6 +80,7 @@
 disable_keyserver_path=no
 use_ccid_driver=yes
 use_standard_socket=yes
+dirmngr_auto_start=no
 
 try_ks_ldap=no
 
@@ -339,7 +340,23 @@
               use_ccid_driver=$enableval)
 AC_MSG_RESULT($use_ccid_driver)
 
+# 
+# Dirmngr is nowadays a system service and thus it usually does no
+# make sense to start it as needed.  However on some systems this is
+# possible; this option enable the feature.
+#
+AC_MSG_CHECKING([whether to auto start dirmngr])
+AC_ARG_ENABLE(dirmngr-auto-start,
+              AC_HELP_STRING([--enable-dirmngr-auto-start],
+                             [enable auto starting of the dirmngr]),
+              dirmngr_auto_start=$enableval)
+AC_MSG_RESULT($dirmngr_auto_start)
+if test "$dirmngr_auto_start" = yes ; then
+    AC_DEFINE(USE_DIRMNGR_AUTO_START,1,
+              [Define to enable auto starting of the dirmngr])
+fi
 
+
 #
 # To avoid double inclusion of config.h which might happen at some
 # places, we add the usual double inclusion protection at the top of
@@ -1655,6 +1672,7 @@
         Default dirmngr:   $show_gnupg_dirmngr_pgm
 
         Use standard socket: $use_standard_socket
+        Dirmngr auto start:  $dirmngr_auto_start
 "
 if test x"$use_regex" != xyes ; then
 echo "