summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--THANKS1
-rw-r--r--src/ChangeLog5
-rw-r--r--src/libassuan.m44
3 files changed, 8 insertions, 2 deletions
diff --git a/THANKS b/THANKS
index 3c566a2..5555006 100644
--- a/THANKS
+++ b/THANKS
@@ -3,6 +3,7 @@ Alain Guibert alguibert+gpd at free.fr
Marc Mutz mutz at kde.org
Michael Nottebrock michaelnottebrock at gmx.net
Nelson H. F. Beebe beebe at math dot utah dot edu
+Rex Dieter rdieter at math dot unl dot edu
Ville Skyttä ville.skytta@iki.fi
diff --git a/src/ChangeLog b/src/ChangeLog
index 053b798..b5bef81 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-18 Werner Koch <wk@g10code.com>
+
+ * libassuan.m4: Pass "pthread" to the common macro. Reported by
+ Rex Dieter.
+
2006-10-16 Werner Koch <wk@g10code.com>
* mkerrors: Map ASSUAN_Not_Confirmed.
diff --git a/src/libassuan.m4 b/src/libassuan.m4
index 2844470..95b6190 100644
--- a/src/libassuan.m4
+++ b/src/libassuan.m4
@@ -120,7 +120,7 @@ AC_DEFUN([AM_PATH_LIBASSUAN],
dnl AM_PATH_LIBASSUAN_PTH([MINIMUM-VERSION,
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGSand LIBASSUAN_PTH_LIBS
+dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGS and LIBASSUAN_PTH_LIBS
dnl
AC_DEFUN([AM_PATH_LIBASSUAN_PTH],
[ _AM_PATH_LIBASSUAN_COMMON($1,pth)
@@ -144,7 +144,7 @@ dnl Test for libassuan and define LIBASSUAN_PTHREAD_CFLAGS
dnl and LIBASSUAN_PTHREAD_LIBS
dnl
AC_DEFUN([AM_PATH_LIBASSUAN_PTHREAD],
-[ _AM_PATH_LIBASSUAN_COMMON($1,pth)
+[ _AM_PATH_LIBASSUAN_COMMON($1,pthread)
if test $ok = yes; then
LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --cflags`
LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --libs`