agent: Resolve conflict of util.h.

* agent/Makefile.am (AM_CPPFLAGS): Remove -I$(top_srcdir)/common.
* agent/call-pinentry.c, agent/call-scd.c: Follow the change.
* agent/command-ssh.c, agent/command.c, agent/cvt-openpgp.c: Ditto.
* agent/divert-scd.c, agent/findkey.c, agent/genkey.c: Ditto.
* agent/gpg-agent.c, agent/pksign.c, agent/preset-passphrase.c: Ditto.
* agent/protect-tool.c, agent/protect.c, agent/trustlist.c: Ditto.
* agent/w32main.c: Ditto.

--

For openpty function, we need to include util.h on some OS.
We also have util.h in common/, so this change is needed.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

agent/Makefile.am

@@ -28,7 +28,7 @@ noinst_PROGRAMS = $(TESTS)
 EXTRA_DIST = ChangeLog-2011 gpg-agent-w32info.rc
 
 
-AM_CPPFLAGS = -I$(top_srcdir)/common
+AM_CPPFLAGS =
 
 include $(top_srcdir)/am/cmacros.am
 

agent/call-pinentry.c

@@ -37,8 +37,8 @@
 
 #include "agent.h"
 #include <assuan.h>
-#include "sysutils.h"
+#include "../common/sysutils.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 #ifdef _POSIX_OPEN_MAX
 #define MAX_OPEN_FDS _POSIX_OPEN_MAX

agent/call-scd.c

@@ -39,7 +39,7 @@
 
 #include "agent.h"
 #include <assuan.h>
-#include "strlist.h"
+#include "../common/strlist.h"
 
 #ifdef _POSIX_OPEN_MAX
 #define MAX_OPEN_FDS _POSIX_OPEN_MAX

agent/command-ssh.c

@@ -50,9 +50,9 @@
 
 #include "agent.h"
 
-#include "i18n.h"
+#include "../common/i18n.h"
-#include "util.h"
+#include "../common/util.h"
-#include "ssh-utils.h"
+#include "../common/ssh-utils.h"
 
 
 

agent/command.c

@@ -37,7 +37,7 @@
 
 #include "agent.h"
 #include <assuan.h>
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "cvt-openpgp.h"
 #include "../common/ssh-utils.h"
 #include "../common/asshelp.h"

agent/cvt-openpgp.c

@@ -25,9 +25,9 @@
 #include <assert.h>
 
 #include "agent.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "cvt-openpgp.h"
-#include "host2net.h"
+#include "../common/host2net.h"
 
 
 /* Helper to pass data via the callback to do_unprotect. */

agent/divert-scd.c

@@ -28,8 +28,8 @@
 #include <sys/stat.h>
 
 #include "agent.h"
-#include "i18n.h"
+#include "../common/i18n.h"
-#include "sexp-parse.h"
+#include "../common/sexp-parse.h"
 
 
 static int

agent/findkey.c

@@ -33,7 +33,7 @@
 #include <npth.h> /* (we use pth_sleep) */
 
 #include "agent.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 #include "../common/ssh-utils.h"
 #include "../common/name-value.h"
 

agent/genkey.c

@@ -27,9 +27,9 @@
 #include <assert.h>
 
 #include "agent.h"
-#include "i18n.h"
+#include "../common/i18n.h"
-#include "exechelp.h"
+#include "../common/exechelp.h"
-#include "sysutils.h"
+#include "../common/sysutils.h"
 
 static int
 store_key (gcry_sexp_t private, const char *passphrase, int force,

agent/gpg-agent.c

@@ -53,11 +53,11 @@
 #include "agent.h"
 #include <assuan.h> /* Malloc hooks  and socket wrappers. */
 
-#include "i18n.h"
+#include "../common/i18n.h"
-#include "sysutils.h"
+#include "../common/sysutils.h"
-#include "gc-opt-flags.h"
+#include "../common/gc-opt-flags.h"
-#include "exechelp.h"
+#include "../common/exechelp.h"
-#include "asshelp.h"
+#include "../common/asshelp.h"
 #include "../common/init.h"
 
 

agent/pksign.c

@@ -29,7 +29,7 @@
 #include <sys/stat.h>
 
 #include "agent.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 
 static int

agent/preset-passphrase.c

@@ -45,9 +45,9 @@
 #endif
 
 #include "agent.h"
-#include "simple-pwquery.h"
+#include "../common/simple-pwquery.h"
-#include "i18n.h"
+#include "../common/i18n.h"
-#include "sysutils.h"
+#include "../common/sysutils.h"
 #include "../common/init.h"
 
 

agent/protect-tool.c

@@ -39,9 +39,9 @@
 #endif
 
 #include "agent.h"
-#include "i18n.h"
+#include "../common/i18n.h"
-#include "get-passphrase.h"
+#include "../common/get-passphrase.h"
-#include "sysutils.h"
+#include "../common/sysutils.h"
 #include "../common/init.h"
 
 

agent/protect.c

@@ -39,7 +39,7 @@
 #include "agent.h"
 
 #include "cvt-openpgp.h"
-#include "sexp-parse.h"
+#include "../common/sexp-parse.h"
 
 
 /* To use the openpgp-s2k3-ocb-aes scheme by default set the value of

agent/trustlist.c

@@ -31,7 +31,7 @@
 
 #include "agent.h"
 #include <assuan.h> /* fixme: need a way to avoid assuan calls here */
-#include "i18n.h"
+#include "../common/i18n.h"
 
 
 /* A structure to store the information from the trust file. */

agent/w32main.c

@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <windows.h>
 
-#include "util.h"
+#include "../common/util.h"
 #include "w32main.h"
 
 /* The instance handle has received by WinMain.  */