gnupg/tools/watchgnupg.c points to non-existent "../jnlib/mischelp.h"

[Hans-Christoph Steiner]

When I removed --disable-tools from the Android GnuPG build, it died
with this error:

watchgnupg.c:50:31: fatal error: ../jnlib/mischelp.h: No such file or
directory


This simple patch fixed the build, but I haven't tested the resulting
build yet:

diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c
index 592819b..c7a404e 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


It seems that there are some other vestiges of this jnlib folder which
seems to have been merged into common:

hans at palatschinken gnupg $ find . -type f -name '*.[hc]' |xargs grep
'jnlib/'
./common/pka.c:compile-command: "cc -DUSE_DNS_PKA -DTEST -I..
-I../include -Wall -g -o pka pka.c -lresolv ../tools/no-libgcrypt.o
../jnlib/libjnlib.a"
./common/srv.c:compile-command: "cc -DTEST -I.. -I../include -Wall -g -o
srv srv.c -lresolv  ../tools/no-libgcrypt.o  ../jnlib/libjnlib.a"
./dirmngr/no-libgcrypt.c:   ../jnlib/libjnlib.a .  ../common/util.h
defines macros to map them
./keyserver/no-libgcrypt.c:   ../jnlib/libjnlib.a .  ../common/util.h
defines macros to map them
./tools/no-libgcrypt.c:   ../jnlib/libjnlib.a .  ../common/util.h
defines macros to map them


.hc