[svn] gpgme - r1196 - trunk

[svn author marcus]

Author: marcus
Date: 2006-12-03 03:00:43 +0100 (Sun, 03 Dec 2006)
New Revision: 1196

Modified:
   trunk/ChangeLog
   trunk/configure.ac
Log:
2006-12-03  Marcus Brinkmann  <marcus at g10code.de>

	* configure.ac: Use descriptor passing only if --enable-fd-passing
	is provided.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-12-02 23:58:35 UTC (rev 1195)
+++ trunk/ChangeLog	2006-12-03 02:00:43 UTC (rev 1196)
@@ -1,5 +1,8 @@
 2006-12-03  Marcus Brinkmann  <marcus at g10code.de>
 
+	* configure.ac: Use descriptor passing only if --enable-fd-passing
+	is provided.
+
 	* configure.ac: Add check for use of descriptor passing.
 
 2006-11-29  Marcus Brinkmann  <marcus at g10code.de>

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-12-02 23:58:35 UTC (rev 1195)
+++ trunk/configure.ac	2006-12-03 02:00:43 UTC (rev 1196)
@@ -470,8 +470,8 @@
 
 # Assuan check for descriptor passing.
 AC_CHECK_MEMBER(struct cmsghdr.cmsg_len,
-                [use_descriptor_passing=yes],
-                [use_descriptor_passing=no
+                [supports_descriptor_passing=yes],
+                [supports_descriptor_passing=no
                  AC_MSG_WARN([
 ***
 *** Data structure for sending ancillary data missing.
@@ -488,10 +488,23 @@
 #endif
 #include <unistd.h>
        ])
+
+AC_ARG_ENABLE(fd-passing,
+  AC_HELP_STRING([--enable-fd-passing], [use FD passing if supported]),
+  use_desciptor_passing=$withval)
+
+if test "$supports_descriptor_passing" != "yes"; then
+  use_descriptor_passing=no
+fi
+
 if test "$use_descriptor_passing" = "yes"; then
- AC_DEFINE(USE_DESCRIPTOR_PASSING, 1,
-            [Defined if descriptor passing is supported])
+  fd_passing=1
+else
+  fd_passing=0
 fi
+
+AC_DEFINE_UNQUOTED(USE_DESCRIPTOR_PASSING, $fd_passing,
+          [Defined if descriptor passing is enabled and supported])
 AM_CONDITIONAL(USE_DESCRIPTOR_PASSING, test "$use_descriptor_passing" = "yes")
 
 # End of assuan checks.