[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-08-23 15:43:12
Message-ID: 20100823154312.E59BEAC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1167102 by mutz:

gpgme++: compile with libgpg-error v1.7 again

thanks to 'krop' for noticing

 M  +10 -0     ConfigureChecks.cmake  
 M  +8 -0      config-gpgme++.h.cmake  


--- trunk/KDE/kdepimlibs/gpgme++/ConfigureChecks.cmake #1167101:1167102
@@ -382,6 +382,16 @@
   }
 " HAVE_GPGME_IO_READWRITE )
 
+# check if gpg-error has gpg_err_set_errno (v1.8)
+check_cxx_source_compiles ("
+   #include <gpg-error.h>
+   int main() {
+     int i;
+     gpg_err_set_errno( i );
+     return 0;
+   }
+" HAVE_GPG_ERR_SET_ERRNO )
+
 # check if gpgme has gpg-error wrappers
 check_cxx_source_compiles ("
   #include <gpgme.h>
--- trunk/KDE/kdepimlibs/gpgme++/config-gpgme++.h.cmake #1167101:1167102
@@ -99,6 +99,14 @@
 /* Define to 1 if your gpgme has gpgme_io_read and gpgme_io_write */
 #cmakedefine HAVE_GPGME_IO_READWRITE 1
 
+/* Define to 1 if your gpg-error has gpg_err_set_errno */
+#cmakedefine HAVE_GPG_ERR_SET_ERRNO 1
+
+#ifndef HAVE_GPG_ERR_SET_ERRNO
+# include <errno.h>
+static inline void gpg_err_set_errno( int x ) { errno = x; }
+#endif
+
 /* Define to 1 if your gpgme has gpgme_err_set_errno(int) and friends */
 #cmakedefine HAVE_GPGME_GPG_ERROR_WRAPPERS 1
 
[prev in list] [next in list] [prev in thread] [next in thread]