[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepimlibs/gpgme++
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-11-29 13:43:29
Message-ID: 20101129134329.DDF44AC8A8 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1202038 by mutz:

gpgme++: extend configure checks for gpgme's gpgconf support

 M  +24 -0     ConfigureChecks.cmake  
 M  +3 -0      config-gpgme++.h.cmake  


--- trunk/KDE/kdepimlibs/gpgme++/ConfigureChecks.cmake #1202037:1202038
@@ -254,6 +254,18 @@
   #include <gpgme.h>
   int main() {
     gpgme_protocol_t proto = GPGME_PROTOCOL_GPGCONF;
+    const gpgme_protocol_t proto = GPGME_PROTOCOL_GPGCONF;
+    gpgme_ctx_t ctx = 0;
+    gpgme_conf_comp_t comp = 0;
+    gpgme_error_t e = gpgme_op_conf_load( ctx, &comp );
+    e = gpgme_op_conf_save( ctx, comp );
+    gpgme_conf_arg_t arg = 0;
+    int i = 0;
+    void * value = &i;
+    e = gpgme_conf_arg_new( &arg, GPGME_CONF_INT32, value );
+    gpgme_conf_opt_t opt = comp->options;
+    e = gpgme_conf_opt_change( opt, 0, arg );
+    gpgme_conf_release( comp );
     return 0;
   }
 " HAVE_GPGME_PROTOCOL_GPGCONF
@@ -403,6 +415,18 @@
   }
 " HAVE_GPGME_GPG_ERROR_WRAPPERS )
 
+# check if gpgme_conf_arg_new takes its 'value' by const void*
+check_cxx_source_compiles ("
+  #include <gpgme.h>
+
+  int main() {
+     gpgme_conf_arg_t arg = 0;
+     const void * value = 0;
+     gpgme_error_t e = gpgme_conf_arg_new( &arg, GPGME_CONF_STRING, value );
+     return 0;
+  }
+" HAVE_GPGME_CONF_ARG_NEW_WITH_CONST_VALUE )
+
 set(CMAKE_REQUIRED_INCLUDES)
 set(CMAKE_REQUIRED_LIBRARIES)
 
--- trunk/KDE/kdepimlibs/gpgme++/config-gpgme++.h.cmake #1202037:1202038
@@ -112,6 +112,9 @@
 # endif
 #endif
 
+/* Define to 1 if your gpgme_conf_arg_new takes its 'value' parameter as const void* */
+#cmakedefine HAVE_GPGME_CONF_ARG_NEW_WITH_CONST_VALUE 1
+
 #define GPGMEPP_ERR_SOURCE_DEFAULT 22
 #define   GPGME_ERR_SOURCE_DEFAULT ((gpgme_err_source_t)22)
 #define     GPG_ERR_SOURCE_DEFAULT ((gpg_err_source_t)22)
[prev in list] [next in list] [prev in thread] [next in thread]