diff options
| author | Werner Koch <[email protected]> | 2014-11-11 09:13:10 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-11-11 09:13:10 +0000 |
| commit | 1adf719b2d8e2d5b912bf6655731e7e586402654 (patch) | |
| tree | 840deda4c4ae69807f6b711d42b34d0a5993d9ee /configure.ac | |
| parent | gpg: Remove warning message for non-implemented search modes. (diff) | |
| download | gnupg-1adf719b2d8e2d5b912bf6655731e7e586402654.tar.gz gnupg-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 <[email protected]>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 320ee27a7..203f29b81 100644 --- a/configure.ac +++ b/configure.ac @@ -1266,7 +1266,8 @@ AC_FUNC_VPRINTF AC_FUNC_FORK AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name]) AC_CHECK_FUNCS([strcasecmp strncasecmp ctermid times gmtime_r strtoull]) -AC_CHECK_FUNCS([unsetenv fcntl ftruncate inet_ntop canonicalize_file_name]) +AC_CHECK_FUNCS([setenv unsetenv fcntl ftruncate inet_ntop]) +AC_CHECK_FUNCS([canonicalize_file_name]) AC_CHECK_FUNCS([gettimeofday getrusage getrlimit setrlimit clock_gettime]) AC_CHECK_FUNCS([atexit raise getpagesize strftime nl_langinfo setlocale]) AC_CHECK_FUNCS([waitpid wait4 sigaction sigprocmask pipe getaddrinfo]) @@ -1296,16 +1297,6 @@ AC_CHECK_FUNCS([memicmp stpcpy strsep strlwr strtoul memmove stricmp strtol \ # end jnlib checks. - -# -# gnulib checks -# -gl_SOURCE_BASE([gl]) -gl_M4_BASE([gl/m4]) -gl_MODULES([setenv mkdtemp xsize strpbrk]) -gl_INIT - - # # W32 specific test # @@ -1770,7 +1761,6 @@ fi AC_CONFIG_FILES([ m4/Makefile Makefile po/Makefile.in -gl/Makefile common/Makefile common/w32info-rc.h kbx/Makefile |