[svn] gpgme - r1443 - in trunk: . src

[svn author marcus]

Author: marcus
Date: 2009-12-22 14:00:30 +0100 (Tue, 22 Dec 2009)
New Revision: 1443

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/ChangeLog
   trunk/src/debug.c
Log:
2009-12-22  Marcus Brinkmann  <marcus at g10code.de>

	* configure.ac: Do not use echo -n.  Test for __thread.

src/
2009-12-22  Marcus Brinkmann  <marcus at g10code.de>

	* debug.c: Test for TLS, not __GNUC__


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-12-17 17:36:20 UTC (rev 1442)
+++ trunk/ChangeLog	2009-12-22 13:00:30 UTC (rev 1443)
@@ -1,3 +1,7 @@
+2009-12-22  Marcus Brinkmann  <marcus at g10code.de>
+
+	* configure.ac: Do not use echo -n.  Test for __thread.
+
 2009-12-17  Marcus Brinkmann  <marcus at g10code.de>
 
 	* configure.ac: Make largefile check more robust.

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-12-17 17:36:20 UTC (rev 1442)
+++ trunk/src/ChangeLog	2009-12-22 13:00:30 UTC (rev 1443)
@@ -1,3 +1,7 @@
+2009-12-22  Marcus Brinkmann  <marcus at g10code.de>
+
+	* debug.c: Test for TLS, not __GNUC__
+
 2009-12-15  Marcus Brinkmann  <marcus at g10code.de>
 
 	* assuan-support.c (my_spawn): Calloc, not malloc, the fd_items.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-12-17 17:36:20 UTC (rev 1442)
+++ trunk/configure.ac	2009-12-22 13:00:30 UTC (rev 1443)
@@ -34,7 +34,7 @@
 m4_define(my_version, [1.2.1])
 m4_define(my_issvn, [yes])
 
-m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
+m4_define([svn_revision], m4_esyscmd([printf "%d" $( (svn info 2>/dev/null \
             || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
 AC_INIT([gpgme], 
         [my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision])],
@@ -224,6 +224,17 @@
     fi
 fi
 
+# Only used for debugging, so no serious test needed (for actual
+# functionality you have to test libc as well, this only tests the
+# compiler).
+AC_CACHE_CHECK([for __thread],[gpgme_cv_tls_works],
+   AC_COMPILE_IFELSE([__thread int foo;],
+     gpgme_cv_tls_works=yes,gpgme_cv_tls_works=no))
+if test "$gpgme_cv_tls_works" = yes; then
+  AC_DEFINE(HAVE_TLS, [1], [Define if __thread is supported])
+fi
+
+
 # Checks for library functions.
 AC_FUNC_FSEEKO
 

Modified: trunk/src/debug.c
===================================================================
--- trunk/src/debug.c	2009-12-17 17:36:20 UTC (rev 1442)
+++ trunk/src/debug.c	2009-12-22 13:00:30 UTC (rev 1443)
@@ -55,7 +55,7 @@
 static FILE *errfp;
 
 
-#ifdef __GNUC__
+#ifdef HAVE_TLS
 #define FRAME_NR
 static __thread int frame_nr = 0;
 #endif