From 1adf719b2d8e2d5b912bf6655731e7e586402654 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 11 Nov 2014 10:13:10 +0100 Subject: 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 --- tools/Makefile.am | 4 ++-- tools/symcryptrun.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/Makefile.am b/tools/Makefile.am index 340901a00..1ba03772a 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -69,8 +69,8 @@ if !HAVE_W32CE_SYSTEM noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit endif -common_libs = $(libcommon) ../gl/libgnu.a -commonpth_libs = $(libcommonpth) ../gl/libgnu.a +common_libs = $(libcommon) +commonpth_libs = $(libcommonpth) # Some modules require PTH under W32CE. if HAVE_W32CE_SYSTEM diff --git a/tools/symcryptrun.c b/tools/symcryptrun.c index eff14c946..48562b16b 100644 --- a/tools/symcryptrun.c +++ b/tools/symcryptrun.c @@ -90,7 +90,6 @@ #include "i18n.h" #include "../common/util.h" #include "../common/init.h" -#include "mkdtemp.h" /* FIXME: Bah. For spwq_secure_free. */ #define SIMPLE_PWQUERY_IMPLEMENTATION 1 -- cgit v1.2.3