From 8156a38674421deef6c2eb3e91e0186fe7fe4b26 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Fri, 24 Aug 2012 09:29:56 +0200
Subject: [PATCH] Fix left over use of jnlib on some platforms

* tools/watchgnupg.c: Take mischelp.h from common/ and not jnlib/.

--

Also fixed in some comments.
---
 common/srv.c         | 2 +-
 scd/Makefile.am      | 2 +-
 tools/no-libgcrypt.c | 2 +-
 tools/watchgnupg.c   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/srv.c b/common/srv.c
index c493f973e..74afbcb71 100644
--- a/common/srv.c
+++ b/common/srv.c
@@ -326,6 +326,6 @@ main(int argc,char *argv[])
 
 /*
 Local Variables:
-compile-command: "cc -DTEST -I.. -I../include -Wall -g -o srv srv.c -lresolv  ../tools/no-libgcrypt.o  ../jnlib/libjnlib.a"
+compile-command: "cc -DTEST -I.. -I../include -Wall -g -o srv srv.c -lresolv  ../tools/no-libgcrypt.o  ../common/libcommon.a"
 End:
 */
diff --git a/scd/Makefile.am b/scd/Makefile.am
index 09aea0e84..a0c0369e7 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -61,7 +61,7 @@ scdaemon_LDADD = $(libcommonpth) ../gl/libgnu.a \
 #	app.c app-common.h app-help.c $(card_apps)
 #
 #sc_copykeys_LDADD = \
-#	../jnlib/libjnlib.a ../common/libcommon.a \
+#	../common/libcommon.a \
 #	../common/libsimple-pwquery.a \
 #	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
 #	 $(LIBUSB_LIBS) \
diff --git a/tools/no-libgcrypt.c b/tools/no-libgcrypt.c
index 9e5256646..b56cc385d 100644
--- a/tools/no-libgcrypt.c
+++ b/tools/no-libgcrypt.c
@@ -22,7 +22,7 @@
 
 
 /* Replace libgcrypt's malloc functions which are used by
-   ../jnlib/libjnlib.a .  ../common/util.h defines macros to map them
+   ../common/libcommon.a .  ../common/util.h defines macros to map them
    to xmalloc etc. */
 static void
 out_of_memory (void)
diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c
index 1bd9e8003..060aa0424 100644
--- a/tools/watchgnupg.c
+++ b/tools/watchgnupg.c
@@ -47,7 +47,7 @@
 #endif
 #if !defined(SUN_LEN) || !defined(PF_LOCAL) || !defined(AF_LOCAL)
 #define JNLIB_NEED_AFLOCAL
-#include "../jnlib/mischelp.h"
+#include "../common/mischelp.h"
 #endif