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 /m4 | |
| 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 'm4')
| -rw-r--r-- | m4/Makefile.am | 2 | ||||
| -rw-r--r-- | m4/estream.m4 | 49 |
2 files changed, 0 insertions, 51 deletions
diff --git a/m4/Makefile.am b/m4/Makefile.am index f94c0c1b2..05a2be366 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -8,8 +8,6 @@ EXTRA_DIST += gpg-error.m4 libgcrypt.m4 libassuan.m4 ksba.m4 EXTRA_DIST += autobuild.m4 -EXTRA_DIST += estream.m4 - EXTRA_DIST += sys_socket_h.m4 socklen.m4 EXTRA_DIST += ChangeLog-2011 diff --git a/m4/estream.m4 b/m4/estream.m4 deleted file mode 100644 index b61059a47..000000000 --- a/m4/estream.m4 +++ /dev/null @@ -1,49 +0,0 @@ -dnl Autoconf macros for libestream -dnl Copyright (C) 2007 g10 Code GmbH -dnl -dnl This file is free software; as a special exception the author gives -dnl unlimited permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl -dnl This file is distributed in the hope that it will be useful, but -dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - -dnl estream_PRINTF_INIT -dnl Prepare build of source included estream-printf.c -dnl -AC_DEFUN([estream_PRINTF_INIT], -[ - AC_MSG_NOTICE([checking system features for estream-printf]) - AC_CHECK_HEADERS(stdint.h) - AC_TYPE_LONG_LONG_INT - AC_TYPE_LONG_DOUBLE - AC_TYPE_INTMAX_T - AC_TYPE_UINTMAX_T - AC_CHECK_TYPES([ptrdiff_t]) - AC_CHECK_SIZEOF([unsigned long]) - AC_CHECK_SIZEOF([void *]) - AC_CACHE_CHECK([for nl_langinfo and THOUSANDS_SEP], - estream_cv_langinfo_thousands_sep, - [AC_TRY_LINK([#include <langinfo.h>], - [char* cs = nl_langinfo(THOUSANDS_SEP); return !cs;], - estream_cv_langinfo_thousands_sep=yes, - estream_cv_langinfo_thousands_sep=no) - ]) - if test $estream_cv_langinfo_thousands_sep = yes; then - AC_DEFINE(HAVE_LANGINFO_THOUSANDS_SEP, 1, - [Define if you have <langinfo.h> and nl_langinfo(THOUSANDS_SEP).]) - fi -]) - - -dnl estream_INIT -dnl Prepare build of source included estream.c -dnl -AC_DEFUN([estream_INIT], -[ - AC_REQUIRE([estream_PRINTF_INIT]) - AC_MSG_NOTICE([checking system features for estream]) - -]) |