From: Marcus Brinkmann <mb@g10code.com>
Date: Sun, 3 Dec 2006 02:00:43 +0000 (+0000)
Subject: 2006-12-03  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: gpgme-1.2.0@1385~188
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3ad7656d760fbe097dd356c9e69be38b0ca596b9;p=gpgme.git

2006-12-03  Marcus Brinkmann  <marcus@g10code.de>

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

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 24c2512..6899474 100644
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,5 +1,8 @@
 2006-12-03  Marcus Brinkmann  <marcus@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@g10code.de>
diff --git a/trunk/configure.ac b/trunk/configure.ac
index 31f05bf..c03e42f 100644
--- a/trunk/configure.ac
+++ b/trunk/configure.ac
@@ -470,8 +470,8 @@ AC_CHECK_HEADERS([sys/uio.h])
 
 # 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 @@ AC_CHECK_MEMBER(struct cmsghdr.cmsg_len,
 #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.