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>

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
-   current implementation requires that the HAVE_JNLIB_LOGGING is also
-   defined. */
+/* Try to write error message using the standard gnupg log mechanism.  */
 #define SPWQ_USE_LOGGING  1
 
 /* Memory allocation functions used by the implementation.  Note, that