diff options
| author | Werner Koch <[email protected]> | 2014-08-26 15:47:22 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-08-26 15:47:54 +0000 |
| commit | 519305feb888b529c005b40445d041a088a2f8fc (patch) | |
| tree | 74994a5b568e059982ca83a0daa8b7d96035355d /configure.ac | |
| parent | gpg: Allow for positional parameters in the passphrase prompt. (diff) | |
| download | gnupg-519305feb888b529c005b40445d041a088a2f8fc.tar.gz gnupg-519305feb888b529c005b40445d041a088a2f8fc.zip | |
Switch to the libgpg-error provided estream.
* configure.ac (NEED_GPG_ERROR_VERSION): Reguire 1.14.
(GPGRT_ENABLE_ES_MACROS): Define.
(estream_INIT): Remove.
* m4/estream.m4: Remove.
* common/estream-printf.c, common/estream-printf.h: Remove.
* common/estream.c, common/estream.h: Remove.
* common/init.c (_init_common_subsystems): Call gpgrt initialization.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index ec259c322..80af6face 100644 --- a/configure.ac +++ b/configure.ac @@ -50,7 +50,7 @@ m4_define([mym4_revision_dec], m4_argn(8, mym4_verslist)) m4_esyscmd([echo ]mym4_version[>VERSION]) AC_INIT([mym4_package],[mym4_version], [http://bugs.gnupg.org]) -NEED_GPG_ERROR_VERSION=1.13 +NEED_GPG_ERROR_VERSION=1.14 NEED_LIBGCRYPT_API=1 NEED_LIBGCRYPT_VERSION=1.6.0 @@ -497,6 +497,8 @@ AH_BOTTOM([ # endif #endif +/* Provide the es_ macro for estream. */ +#define GPGRT_ENABLE_ES_MACROS 1 /* Tell libgcrypt not to use its own libgpg-error implementation. */ #define USE_LIBGPG_ERROR 1 @@ -515,11 +517,6 @@ AH_BOTTOM([ handler. */ #define HTTP_NO_WSASTARTUP -/* We want to use the libgcrypt provided memory allocation for - asprintf. */ -#define _ESTREAM_PRINTF_REALLOC gcry_realloc -#define _ESTREAM_PRINTF_EXTRA_INCLUDE "../common/util.h" - /* Under Windows we use the gettext code from libgpg-error. */ #define GPG_ERR_ENABLE_GETTEXT_MACROS @@ -1495,14 +1492,6 @@ if test "$GCC" = yes; then if test x"$_gcc_psign" = xyes ; then CFLAGS="$CFLAGS -Wpointer-arith" fi - - # The undocumented option -Wno-psabi suppresses the annoying - # "the ABI of passing union with long double has changed in GCC 4.4" - # which is emitted in estream-printf.c but entirely irrelvant - # because that union is local to the file. - if test x"$_gcc_silent_wno" = xyes ; then - CFLAGS="$CFLAGS -Wno-psabi" - fi fi @@ -1518,12 +1507,6 @@ AC_ARG_ENABLE(optimization, fi]) # -# Prepare building of estream -# -estream_INIT - - -# # Decide what to build # |