From 575230d91bba95697518da418ea0e8712f889a0f Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
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 <wk@gnupg.org>
---
 scd/scdaemon.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'scd/scdaemon.c')

diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 39925ce99..2cabee87d 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -37,8 +37,7 @@
 #include <signal.h>
 #include <npth.h>
 
-#define JNLIB_NEED_LOG_LOGV
-#define JNLIB_NEED_AFLOCAL
+#define GNUPG_COMMON_NEED_AFLOCAL
 #include "scdaemon.h"
 #include <ksba.h>
 #include <gcrypt.h>
-- 
cgit v1.2.3