[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-24 8:47:53
Message-ID: 20100824084753.03757AC86A () svn ! kde ! org
[Download RAW message or body]

SVN commit 1167280 by mutz:

config-gpgme++.h.cmake: work around the CMake bug that makes \
check_cxx_source_compiles try to link instead of just compile, leading to a failed \
HAVE_GPG_ERR_SET_ERRNO check, while HAVE_GPGME_GPG_ERROR_WRAPPERS, which is stronger, \
succeeds.

Fixed by #ifndef'ing the replacement code also on HAVE_GPGME_GPG_ERROR_WRAPPERS.
Thanks to Andy for noticing.

 M  +5 -3      config-gpgme++.h.cmake  


--- trunk/KDE/kdepimlibs/gpgme++/config-gpgme++.h.cmake #1167279:1167280
@@ -102,14 +102,16 @@
 /* Define to 1 if your gpg-error has gpg_err_set_errno */
 #cmakedefine HAVE_GPG_ERR_SET_ERRNO 1
 
+/* Define to 1 if your gpgme has gpgme_err_set_errno(int) and friends */
+#cmakedefine HAVE_GPGME_GPG_ERROR_WRAPPERS 1
+
+#ifndef HAVE_GPGME_GPG_ERROR_WRAPPERS
 #ifndef HAVE_GPG_ERR_SET_ERRNO
 # include <errno.h>
 static inline void gpg_err_set_errno( int x ) { errno = x; }
 #endif
+#endif
 
-/* Define to 1 if your gpgme has gpgme_err_set_errno(int) and friends */
-#cmakedefine HAVE_GPGME_GPG_ERROR_WRAPPERS 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]