[svn] assuan - r220 - in trunk: . src

[svn author wk]

Author: wk
Date: 2006-10-16 19:35:28 +0200 (Mon, 16 Oct 2006)
New Revision: 220

Modified:
   trunk/NEWS
   trunk/configure.ac
   trunk/src/ChangeLog
   trunk/src/assuan.h
   trunk/src/libassuan.m4
   trunk/src/mkerrors
Log:
Mapped another error.


Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-10-10 10:53:05 UTC (rev 219)
+++ trunk/NEWS	2006-10-16 17:35:28 UTC (rev 220)
@@ -1,3 +1,7 @@
+Noteworthy changes in version 0.9.4
+------------------------------------------------
+
+
 Noteworthy changes in version 0.9.3 (2006-10-10)
 ------------------------------------------------
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-10-10 10:53:05 UTC (rev 219)
+++ trunk/configure.ac	2006-10-16 17:35:28 UTC (rev 220)
@@ -25,7 +25,7 @@
 
 # Version number: Remember to change it immediately *after* a release.
 #                 Add a "-cvs" prefix for non-released code.
-AC_INIT(libassuan, 0.9.3, gnupg-devel at gnupg.org)
+AC_INIT(libassuan, 0.9.4-cvs, gnupg-devel at gnupg.org)
 # Note, that this is not yet available as a shared library.
 
 PACKAGE=$PACKAGE_NAME

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2006-10-10 10:53:05 UTC (rev 219)
+++ trunk/src/ChangeLog	2006-10-16 17:35:28 UTC (rev 220)
@@ -1,5 +1,12 @@
+2006-10-16  Werner Koch  <wk at g10code.com>
+
+	* mkerrors: Map ASSUAN_Not_Confirmed.
+
 2006-10-10  Werner Koch  <wk at g10code.com>
 
+	* libassuan.m4 (AM_PATH_LIBASSUAN_PTH)
+	(AM_PATH_LIBASSUAN_PTHREAD): Fixed.
+
 	* assuan-buffer.c (assuan_sendfd): Implement a runtime detection
 	of implemented descripotr passing.
 

Modified: trunk/src/assuan.h
===================================================================
--- trunk/src/assuan.h	2006-10-10 10:53:05 UTC (rev 219)
+++ trunk/src/assuan.h	2006-10-16 17:35:28 UTC (rev 220)
@@ -249,9 +249,11 @@
 #define  ASSUAN_Unexpected_Data 125
 #define  ASSUAN_Invalid_Status 126
 #define  ASSUAN_Locale_Problem 127
+#endif
 #define  ASSUAN_Not_Confirmed 128
 
   /* Warning: Don't use the Error codes, below they are deprecated. */
+#ifndef _ASSUAN_IN_LIBASSUAN
 #define  ASSUAN_Bad_Certificate 201
 #define  ASSUAN_Bad_Certificate_Chain 202
 #define  ASSUAN_Missing_Certificate 203

Modified: trunk/src/libassuan.m4
===================================================================
--- trunk/src/libassuan.m4	2006-10-10 10:53:05 UTC (rev 219)
+++ trunk/src/libassuan.m4	2006-10-16 17:35:28 UTC (rev 220)
@@ -125,8 +125,8 @@
 AC_DEFUN([AM_PATH_LIBASSUAN_PTH],
 [ _AM_PATH_LIBASSUAN_COMMON($1,pth)
   if test $ok = yes; then
-    LIBASSUAN_PTH_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
-    LIBASSUAN_PTH_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
+    LIBASSUAN_PTH_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --cflags`
+    LIBASSUAN_PTH_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --libs`
     ifelse([$2], , :, [$2])
   else
     LIBASSUAN_PTH_CFLAGS=""
@@ -146,8 +146,8 @@
 AC_DEFUN([AM_PATH_LIBASSUAN_PTHREAD],
 [ _AM_PATH_LIBASSUAN_COMMON($1,pth)
   if test $ok = yes; then
-    LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
-    LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
+    LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --cflags`
+    LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --libs`
     ifelse([$2], , :, [$2])
   else
     LIBASSUAN_PTHREAD_CFLAGS=""

Modified: trunk/src/mkerrors
===================================================================
--- trunk/src/mkerrors	2006-10-10 10:53:05 UTC (rev 219)
+++ trunk/src/mkerrors	2006-10-16 17:35:28 UTC (rev 220)
@@ -84,6 +84,7 @@
     case ASSUAN_Unknown_Command:         n = 275; break;
     case ASSUAN_Canceled:                n = 277; break;
     case ASSUAN_No_Secret_Key:           n =  17; break;
+    case ASSUAN_Not_Confirmed:           n = 114; break;
 
     case ASSUAN_Read_Error:
       switch (errno)
@@ -200,6 +201,7 @@
               case 274: n = ASSUAN_Unexpected_Command     ; break;
               case 275: n = ASSUAN_Unknown_Command        ; break;
               case 277: n = ASSUAN_Canceled               ; break;
+              case 114: n = ASSUAN_Not_Confirmed          ; break;
               case ((1<<15)|86): n = ASSUAN_Out_Of_Core   ; break;
               default:  n = 0; break;
               }