Mapped another error.

6 files changed, 20 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 2d8c43b..341eb11 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 0.9.4
+------------------------------------------------
+
+
 Noteworthy changes in version 0.9.3 (2006-10-10)
 ------------------------------------------------
 
diff --git a/configure.ac b/configure.ac
index 44d0b9b..278607d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ min_automake_version="1.9.3"
 
 # Version number: Remember to change it immediately *after* a release.
 #                 Add a "-cvs" prefix for non-released code.
-AC_INIT(libassuan, 0.9.3, [email protected])
+AC_INIT(libassuan, 0.9.4-cvs, [email protected])
 # Note, that this is not yet available as a shared library.
 
 PACKAGE=$PACKAGE_NAME
diff --git a/src/ChangeLog b/src/ChangeLog
index 8f83288..053b798 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
+2006-10-16  Werner Koch  <[email protected]>
+
+	* mkerrors: Map ASSUAN_Not_Confirmed.
+
 2006-10-10  Werner Koch  <[email protected]>
 
+	* libassuan.m4 (AM_PATH_LIBASSUAN_PTH)
+	(AM_PATH_LIBASSUAN_PTHREAD): Fixed.
+
 	* assuan-buffer.c (assuan_sendfd): Implement a runtime detection
 	of implemented descripotr passing.
 
diff --git a/src/assuan.h b/src/assuan.h
index 7247daa..cbc386b 100644
--- a/src/assuan.h
+++ b/src/assuan.h
@@ -249,9 +249,11 @@ extern "C"
 #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
diff --git a/src/libassuan.m4 b/src/libassuan.m4
index 680f93b..2844470 100644
--- a/src/libassuan.m4
+++ b/src/libassuan.m4
@@ -125,8 +125,8 @@ dnl
 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 @@ dnl
 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=""
diff --git a/src/mkerrors b/src/mkerrors
index ded7ba3..5748541 100755
--- a/src/mkerrors
+++ b/src/mkerrors
@@ -84,6 +84,7 @@ _assuan_error (int oldcode)
     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 @@ cat <<EOF
               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;
               }