diff options
author | Werner Koch <[email protected]> | 2007-05-15 16:10:48 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2007-05-15 16:10:48 +0000 |
commit | 5f3bca96826fbaf9c4469a7eedef9294f4d74bfb (patch) | |
tree | dae425970a8c0dd0f77ab62c91b2700dfbaa811e /configure.ac | |
parent | Preparing 2.0.4 (diff) | |
download | gnupg-5f3bca96826fbaf9c4469a7eedef9294f4d74bfb.tar.gz gnupg-5f3bca96826fbaf9c4469a7eedef9294f4d74bfb.zip |
Use estream_asprintf instead of the GNU asprintf.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index e2c9c7ed4..48be044d0 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,8 @@ min_automake_version="1.10" # Remember to change the version number immediately *after* a release. # Set my_issvn to "yes" for non-released code. Remember to run an # "svn up" and "autogen.sh" right before creating a distribution. -m4_define([my_version], [2.0.4]) -m4_define([my_issvn], [no]) +m4_define([my_version], [2.0.5]) +m4_define([my_issvn], [yes]) m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \ @@ -426,6 +426,11 @@ AH_BOTTOM([ currently enables it by default for no reason. */ #define PTH_SYSCALL_SOFT 0 +/* We want to use the libgcrypt provided memory allocation for + asprintf. */ +#define ESTREAM_ASPRINTF_MALLOC gcry_malloc +#define ESTREAM_ASPRINTF_FREE gcry_free +#define ESTREAM_PRINTF_EXTRA_INCLUDE "util.h" #endif /*GNUPG_CONFIG_H_INCLUDED*/ ]) @@ -986,7 +991,7 @@ AC_CHECK_FUNCS([flockfile funlockfile fopencookie funopen]) # gl_SOURCE_BASE([gl]) gl_M4_BASE([gl/m4]) -gl_MODULES([setenv mkdtemp vasprintf xsize]) +gl_MODULES([setenv mkdtemp xsize]) gl_INIT @@ -1189,6 +1194,12 @@ fi # +# Prepare building of estream +# +estream_INIT + + +# # Decide what to build # missing_pth=no |