From 575230d91bba95697518da418ea0e8712f889a0f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 24 Apr 2015 16:10:15 +0200 Subject: common: Remove two JNLIB_ macros (jnlib merge). * configure.ac: Merge seperate jnlib checks. (HAVE_JNLIB_LOGGING): Remove. * common/logging.c, common/simple-pwquery.c (JNLIB_NEED_AFLOCAL): Rename to GNUPG_COMMON_NEED_AFLOCAL. Change all tests. -- Signed-off-by: Werner Koch --- configure.ac | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 05d423182..58e35f405 100644 --- a/configure.ac +++ b/configure.ac @@ -527,9 +527,6 @@ AH_BOTTOM([ /* Tell Libgcrypt not to include deprecated definitions. */ #define GCRYPT_NO_DEPRECATED 1 -/* We use jnlib, so tell other modules about it. */ -#define HAVE_JNLIB_LOGGING 1 - /* Our HTTP code is used in estream mode. */ #define HTTP_USE_ESTREAM 1 @@ -1174,7 +1171,8 @@ fi AC_MSG_NOTICE([checking for header files]) AC_HEADER_STDC AC_CHECK_HEADERS([string.h unistd.h langinfo.h termio.h locale.h getopt.h \ - pty.h utmp.h pwd.h inttypes.h signal.h sys/select.h]) + pty.h utmp.h pwd.h inttypes.h signal.h sys/select.h \ + signal.h]) AC_HEADER_TIME @@ -1255,6 +1253,10 @@ 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]) AC_CHECK_FUNCS([ttyname rand ftello fsync stat lstat]) +AC_CHECK_FUNCS([memicmp stpcpy strsep strlwr strtoul memmove stricmp strtol \ + memrchr isascii timegm getrusage setrlimit stat setlocale \ + flockfile funlockfile fopencookie funopen getpwnam getpwuid \ + getenv inet_pton strpbrk]) if test "$have_android_system" = yes; then # On Android ttyname is a stub but prints an error message. @@ -1269,17 +1271,6 @@ if test $ac_cv_func_mmap != yes -a $mmap_needed = yes; then AC_MSG_ERROR([[Sorry, the current implemenation requires mmap.]]) fi -# -# These are needed by the jnlib parts in common. -# Note: We already checked pwd.h. -AC_CHECK_HEADERS([signal.h]) -AC_CHECK_FUNCS([memicmp stpcpy strsep strlwr strtoul memmove stricmp strtol \ - memrchr isascii timegm getrusage setrlimit stat setlocale \ - flockfile funlockfile fopencookie funopen getpwnam getpwuid \ - getenv inet_pton strpbrk]) -# end jnlib checks. - - # # W32 specific test # -- cgit v1.2.3