diff options
| author | Werner Koch <wk@gnupg.org> | 2006-11-14 17:40:44 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2006-11-14 17:40:44 +0100 |
| commit | a9c688e4d97d7c4f2a5929560bbfd4ca7b26b9c9 (patch) | |
| tree | a42a30911a979e32293f5b6f68a9ef250c582500 /m4 | |
| parent | New command GETEVENTCOUNTER. (diff) | |
| download | gnupg2-a9c688e4d97d7c4f2a5929560bbfd4ca7b26b9c9.tar.xz gnupg2-a9c688e4d97d7c4f2a5929560bbfd4ca7b26b9c9.zip | |
Silent GETEVENT command. Requires latest libassuan.
agent/
* command.c (post_cmd_notify, io_monitor): New.
(register_commands, start_command_handler): Register them.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 4 | ||||
| -rw-r--r-- | m4/libassuan.m4 | 19 |
2 files changed, 21 insertions, 2 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index c556d40d1..4b034d7d9 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2006-11-14 Werner Koch <wk@g10code.com> + + * libassuan.m4: Updated from libassuan SVN. + 2006-10-09 Werner Koch <wk@g10code.com> * gnupg-pth.m4: New. Taken from ../acinclude.m4. diff --git a/m4/libassuan.m4 b/m4/libassuan.m4 index 284447014..e099b666d 100644 --- a/m4/libassuan.m4 +++ b/m4/libassuan.m4 @@ -96,6 +96,21 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], ]) +dnl AM_CHECK_LIBASSUAN([MINIMUM-VERSION, +dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +dnl Test whether libassuan has at least MINIMUM-VERSION. This is +dnl used to test for features only available in newer versions. +dnl +AC_DEFUN([AM_CHECK_LIBASSUAN], +[ _AM_PATH_LIBASSUAN_COMMON($1) + if test $ok = yes; then + ifelse([$2], , :, [$2]) + else + ifelse([$3], , :, [$3]) + fi +]) + + dnl AM_PATH_LIBASSUAN([MINIMUM-VERSION, @@ -120,7 +135,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 +159,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` |