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 <wk@gnupg.org>

agent/gpg-agent.c

@@ -49,8 +49,7 @@
 #endif
 #include <npth.h>
 
-#define JNLIB_NEED_LOG_LOGV
+#define GNUPG_COMMON_NEED_AFLOCAL
-#define JNLIB_NEED_AFLOCAL
 #include "agent.h"
 #include <assuan.h> /* Malloc hooks  and socket wrappers. */
 

agent/preset-passphrase.c

@@ -44,7 +44,6 @@
 # include <windows.h>  /* To initialize the sockets.  fixme */
 #endif
 
-#define JNLIB_NEED_LOG_LOGV
 #include "agent.h"
 #include "simple-pwquery.h"
 #include "i18n.h"

agent/protect-tool.c

@@ -38,7 +38,6 @@
 #include <fcntl.h> /* for setmode() */
 #endif
 
-#define JNLIB_NEED_LOG_LOGV
 #include "agent.h"
 #include "i18n.h"
 #include "get-passphrase.h"

common/asshelp.c

@@ -37,7 +37,6 @@
 #include <locale.h>
 #endif
 
-#define JNLIB_NEED_LOG_LOGV
 #include "i18n.h"
 #include "util.h"
 #include "exechelp.h"

common/logging.c

@@ -56,7 +56,7 @@
 #include <assert.h>
 
 
-#define JNLIB_NEED_AFLOCAL 1
+#define GNUPG_COMMON_NEED_AFLOCAL 1
 #include "util.h"
 #include "i18n.h"
 #include "common-defs.h"

common/miscellaneous.c

@@ -31,7 +31,6 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#define JNLIB_NEED_LOG_LOGV
 #include "util.h"
 #include "iobuf.h"
 #include "i18n.h"

common/mischelp.h

@@ -81,7 +81,7 @@ time_t timegm (struct tm *tm);
 
 
 /* Include hacks which are mainly required for Slowaris.  */
-#ifdef JNLIB_NEED_AFLOCAL
+#ifdef GNUPG_COMMON_NEED_AFLOCAL
 #ifndef HAVE_W32_SYSTEM
 # include <sys/socket.h>
 # include <sys/un.h>
@@ -115,7 +115,7 @@ time_t timegm (struct tm *tm);
 # define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \
 	               + strlen ((ptr)->sun_path))
 #endif /*SUN_LEN*/
-#endif /*JNLIB_NEED_AFLOCAL*/
+#endif /*GNUPG_COMMON_NEED_AFLOCAL*/
 
 
 #endif /*LIBJNLIB_MISCHELP_H*/

common/simple-pwquery.c

@@ -40,7 +40,7 @@
 #include <locale.h>
 #endif
 
-#define JNLIB_NEED_AFLOCAL
+#define GNUPG_COMMON_NEED_AFLOCAL
 #include "../common/mischelp.h"
 #ifdef HAVE_W32_SYSTEM
 #include "../common/w32-afunix.h"
@@ -50,10 +50,6 @@
 #define SIMPLE_PWQUERY_IMPLEMENTATION 1
 #include "simple-pwquery.h"
 
-#if defined(SPWQ_USE_LOGGING) && !defined(HAVE_JNLIB_LOGGING)
-# undef SPWQ_USE_LOGGING
-#endif
-
 #ifndef _
 #define _(a) (a)
 #endif

common/simple-pwquery.h

@@ -26,9 +26,7 @@
 #include <gcrypt.h>
 #include "../common/logging.h"
 
-/* Try to write error message using the standard log mechanism.  The
+/* Try to write error message using the standard gnupg log mechanism.  */
-   current implementation requires that the HAVE_JNLIB_LOGGING is also
-   defined. */
 #define SPWQ_USE_LOGGING  1
 
 /* Memory allocation functions used by the implementation.  Note, that

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
 #

dirmngr/dirmngr-client.c

@@ -31,7 +31,6 @@
 #include <gpg-error.h>
 #include <assuan.h>
 
-#define JNLIB_NEED_LOG_LOGV
 #include "../common/logging.h"
 #include "../common/argparse.h"
 #include "../common/stringhelp.h"

dirmngr/dirmngr.c

@@ -50,8 +50,7 @@
 #endif /*HTTP_USE_GNUTLS*/
 
 
-#define JNLIB_NEED_LOG_LOGV
+#define GNUPG_COMMON_NEED_AFLOCAL
-#define JNLIB_NEED_AFLOCAL
 #include "dirmngr.h"
 
 #include <assuan.h>

dirmngr/dirmngr_ldap.c

@@ -49,7 +49,6 @@
 #endif
 
 
-#define JNLIB_NEED_LOG_LOGV
 #include <gpg-error.h>
 #include "../common/logging.h"
 #include "../common/argparse.h"

dirmngr/server.c

@@ -30,7 +30,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#define JNLIB_NEED_LOG_LOGV
 #include "dirmngr.h"
 #include <assuan.h>
 

g10/keyedit.c

@@ -31,7 +31,6 @@
 # include <readline/readline.h>
 #endif
 
-#define JNLIB_NEED_LOG_LOGV
 #include "gpg.h"
 #include "options.h"
 #include "packet.h"

kbx/kbxutil.c

@@ -28,7 +28,6 @@
 #include <limits.h>
 #include <assert.h>
 
-#define JNLIB_NEED_LOG_LOGV
 #include <gpg-error.h>
 #include "../common/logging.h"
 #include "../common/argparse.h"

scd/ccid-driver.c

@@ -108,12 +108,10 @@
 #define CCID_MAX_BUF (2048+7+10)
 
 /* Depending on how this source is used we either define our error
-   output to go to stderr or to the jnlib based logging functions.  We
+   output to go to stderr or to the GnuPG based logging functions.  We
-   use the latter when GNUPG_MAJOR_VERSION is defines or when both,
+   use the latter when GNUPG_MAJOR_VERSION or GNUPG_SCD_MAIN_HEADER
-   GNUPG_SCD_MAIN_HEADER and HAVE_JNLIB_LOGGING are defined.
+   are defined.  */
-*/
+#if defined(GNUPG_MAJOR_VERSION) || defined(GNUPG_SCD_MAIN_HEADER)
-#if defined(GNUPG_MAJOR_VERSION) \
-    || (defined(GNUPG_SCD_MAIN_HEADER) && defined(HAVE_JNLIB_LOGGING))
 
 #if defined(GNUPG_SCD_MAIN_HEADER)
 #  include GNUPG_SCD_MAIN_HEADER

scd/sc-copykeys.c

@@ -27,7 +27,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#define JNLIB_NEED_LOG_LOGV
 #include "scdaemon.h"
 #include <gcrypt.h>
 

scd/scdaemon.c

@@ -37,8 +37,7 @@
 #include <signal.h>
 #include <npth.h>
 
-#define JNLIB_NEED_LOG_LOGV
+#define GNUPG_COMMON_NEED_AFLOCAL
-#define JNLIB_NEED_AFLOCAL
 #include "scdaemon.h"
 #include <ksba.h>
 #include <gcrypt.h>

sm/certchain.c

@@ -28,8 +28,6 @@
 #include <stdarg.h>
 #include <assert.h>
 
-#define JNLIB_NEED_LOG_LOGV /* We need log_logv. */
-
 #include "gpgsm.h"
 #include <gcrypt.h>
 #include <ksba.h>

tools/gpg-check-pattern.c

@@ -40,8 +40,6 @@
 #include <regex.h>
 #include <ctype.h>
 
-
-#define JNLIB_NEED_LOG_LOGV
 #include "util.h"
 #include "i18n.h"
 #include "sysutils.h"

tools/gpgconf-comp.c

@@ -44,7 +44,6 @@
 #endif
 
 /* For log_logv(), asctimestamp(), gnupg_get_time ().  */
-#define JNLIB_NEED_LOG_LOGV
 #include "util.h"
 #include "i18n.h"
 #include "exechelp.h"

tools/symcryptrun.c

@@ -86,7 +86,6 @@
 #endif
 #include <gpg-error.h>
 
-#define JNLIB_NEED_LOG_LOGV
 #include "i18n.h"
 #include "../common/util.h"
 #include "../common/init.h"

tools/watchgnupg.c

@@ -49,7 +49,7 @@
 #define BUGREPORT_LINE ""
 #endif
 #if !defined(SUN_LEN) || !defined(PF_LOCAL) || !defined(AF_LOCAL)
-#define JNLIB_NEED_AFLOCAL
+#define GNUPG_COMMON_NEED_AFLOCAL
 #include "../common/mischelp.h"
 #endif