diff options
| author | Werner Koch <wk@gnupg.org> | 2014-11-11 10:13:10 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-11-11 10:13:10 +0100 |
| commit | 1adf719b2d8e2d5b912bf6655731e7e586402654 (patch) | |
| tree | 840deda4c4ae69807f6b711d42b34d0a5993d9ee /agent | |
| parent | gpg: Remove warning message for non-implemented search modes. (diff) | |
| download | gnupg2-1adf719b2d8e2d5b912bf6655731e7e586402654.tar.xz gnupg2-1adf719b2d8e2d5b912bf6655731e7e586402654.zip | |
Remove use of gnulib (part 1)
* gl/: Remove entire tree.
* configure.ac: Remove gnulib tests and the gl/ Makefile.
(setenv): Add to AC_CHECK_FUNCS.
* autogen.rc (extra_aclocal_flags): Set to empty.
* Makefile.am (ACLOCAL_AMFLAGS): Remove -I gl/m4
(SUBDIRS): Remove gl/.
* agent/Makefile.am (common_libs): Remove ../gl/gnulib.a
* common/Makefile.am (t_common_ldadd): Ditto.
* dirmngr/Makefile.am (dirmngr_LDADD): Ditto.
(dirmngr_ldap_LDADD, dirmngr_client_LDADD): Ditto.
* g10/Makefile.am (needed_libs): Ditto.
* g13/Makefile.am (g13_LDADD): Ditto.
* kbx/Makefile.am (kbxutil_LDADD): Ditto.
($(PROGRAMS)): Ditto.
* scd/Makefile.am (scdaemon_LDADD): Ditto.
* sm/Makefile.am (common_libs): Ditto.
* tools/Makefile.am (common_libs, commonpth_libs): Ditto.
* agent/gpg-agent.c: Remove "mkdtemp.h"
* g10/exec.c: Ditto.
* scd/scdaemon.c: Ditto.
* tools/symcryptrun.c: Ditto.
* common/sysutils.c: Remove "setenv.h"
* common/t-timestuff.c: Use putenv if setenv is not available.
--
gnulib has always been a cause of trouble in GnuPG because we used
only a very few functions and the complex include machinery of gnulib
is quite complex and the cause for many build problems for example on
OS X. This is not gnulib's fault but due to our limited use of gnulib
and that we only rarely update the gnulib code to avoid regressions.
In part two we will address the functions
mkdtemp
setenv
unsetenv
strpbrk
which may bot be implemented on all platforms. They are not required
on a libc based system.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/Makefile.am | 4 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/agent/Makefile.am b/agent/Makefile.am index ff15d0305..bcf178810 100644 --- a/agent/Makefile.am +++ b/agent/Makefile.am @@ -55,8 +55,8 @@ gpg_agent_SOURCES = \ call-scd.c \ learncard.c -common_libs = $(libcommon) ../gl/libgnu.a -commonpth_libs = $(libcommonpth) ../gl/libgnu.a +common_libs = $(libcommon) +commonpth_libs = $(libcommonpth) if HAVE_W32CE_SYSTEM pwquery_libs = else diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 720f5f4cc..5960fe329 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -55,7 +55,6 @@ #include <assuan.h> /* Malloc hooks and socket wrappers. */ #include "i18n.h" -#include "mkdtemp.h" /* Gnulib replacement. */ #include "sysutils.h" #include "gc-opt-flags.h" #include "exechelp.h" |