10 files changed, 37 insertions, 3 deletions
diff --git a/tools/card-call-scd.c b/tools/card-call-scd.c
index 62c1d1b2f..bcf630a28 100644
--- a/tools/card-call-scd.c
+++ b/tools/card-call-scd.c
@@ -269,7 +269,7 @@ warn_version_mismatch (assuan_context_t ctx, const char *servername, int mode)
 {
   gpg_error_t err;
   char *serverversion;
-  const char *myversion = strusage (13);
+  const char *myversion = gpgrt_strusage (13);
 
   err = get_assuan_server_version (ctx, mode, &serverversion);
   if (err)
diff --git a/tools/gpg-card.c b/tools/gpg-card.c
index 84bbd7ec1..1967d4915 100644
--- a/tools/gpg-card.c
+++ b/tools/gpg-card.c
@@ -19,6 +19,9 @@
  */
 
 #include <config.h>
+/* We don't want to have the macros from gpgrt here until we have
+ * completely replaced this module by the one from gpgrt.  */
+#undef GPGRT_ENABLE_ARGPARSE_MACROS
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -41,6 +44,7 @@
 #include "../common/ttyio.h"
 #include "../common/server-help.h"
 #include "../common/openpgpdefs.h"
+#include "../common/argparse.h" /* temporary hack.  */
 
 #include "gpg-card.h"
 
diff --git a/tools/gpg-check-pattern.c b/tools/gpg-check-pattern.c
index 43cea1dd1..be1832217 100644
--- a/tools/gpg-check-pattern.c
+++ b/tools/gpg-check-pattern.c
@@ -18,6 +18,9 @@
  */
 
 #include <config.h>
+/* We don't want to have the macros from gpgrt here until we have
+ * completely replaced this module by the one from gpgrt.  */
+#undef GPGRT_ENABLE_ARGPARSE_MACROS
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -44,6 +47,7 @@
 #include "../common/i18n.h"
 #include "../common/sysutils.h"
 #include "../common/init.h"
+#include "../common/argparse.h" /* temporary hack.  */
 
 
 enum cmd_and_opt_values
@@ -491,4 +495,3 @@ process (FILE *fp, pattern_t *patarray)
   if (opt.verbose)
     log_info ("no input line matches the pattern - accepted\n");
 }
-
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 564b3007f..ae044dcc4 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -19,6 +19,9 @@
  */
 
 #include <config.h>
+/* We don't want to have the macros from gpgrt here until we have
+ * completely replaced this module by the one from gpgrt.  */
+#undef GPGRT_ENABLE_ARGPARSE_MACROS
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,6 +34,7 @@
 
 #include "../common/i18n.h"
 #include "../common/util.h"
+#include "../common/argparse.h" /* temporary hack.  */
 #include "../common/asshelp.h"
 #include "../common/sysutils.h"
 #include "../common/membuf.h"
diff --git a/tools/gpg-pair-tool.c b/tools/gpg-pair-tool.c
index 61877b171..a41d99031 100644
--- a/tools/gpg-pair-tool.c
+++ b/tools/gpg-pair-tool.c
@@ -119,8 +119,10 @@
  *
  */
 
-
 #include <config.h>
+/* We don't want to have the macros from gpgrt here until we have
+ * completely replaced this module by the one from gpgrt.  */
+#undef GPGRT_ENABLE_ARGPARSE_MACROS
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -136,6 +138,7 @@
 #include "../common/sysutils.h"
 #include "../common/init.h"
 #include "../common/name-value.h"
+#include "../common/argparse.h" /* temporary hack.  */
 
 
 /* Constants to identify the commands and options. */
diff --git a/tools/gpg-wks-client.c b/tools/gpg-wks-client.c
index 98ca2fb38..8c13be7e2 100644
--- a/tools/gpg-wks-client.c
+++ b/tools/gpg-wks-client.c
@@ -19,6 +19,9 @@
  */
 
 #include <config.h>
+/* We don't want to have the macros from gpgrt here until we have
+ * completely replaced this module by the one from gpgrt.  */
+#undef GPGRT_ENABLE_ARGPARSE_MACROS
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -41,6 +44,7 @@
 #include "mime-maker.h"
 #include "send-mail.h"
 #include "gpg-wks.h"
+#include "../common/argparse.h" /* temporary hack.  */
 
 
 /* Constants to identify the commands and options. */
diff --git a/tools/gpg-wks-server.c b/tools/gpg-wks-server.c
index 8cdbfaf36..bd0dfd641 100644
--- a/tools/gpg-wks-server.c
+++ b/tools/gpg-wks-server.c
@@ -24,6 +24,9 @@
  */
 
 #include <config.h>
+/* We don't want to have the macros from gpgrt here until we have
+ * completely replaced this module by the one from gpgrt.  */
+#undef GPGRT_ENABLE_ARGPARSE_MACROS
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -45,6 +48,7 @@
 #include "mime-maker.h"
 #include "send-mail.h"
 #include "gpg-wks.h"
+#include "../common/argparse.h" /* temporary hack.  */
 
 
 /* The time we wait for a confirmation response.  */
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index 44d916bc2..a6094400b 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -19,6 +19,9 @@
  */
 
 #include <config.h>
+/* We don't want to have the macros from gpgrt here until we have
+ * completely replaced this module by the one from gpgrt.  */
+#undef GPGRT_ENABLE_ARGPARSE_MACROS
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,6 +34,7 @@
 #include "../common/sysutils.h"
 #include "../common/init.h"
 #include "../common/status.h"
+#include "../common/argparse.h" /* temporary hack.  */
 
 
 /* Constants to identify the commands and options. */
diff --git a/tools/gpgsplit.c b/tools/gpgsplit.c
index 674be6271..8b65c89c5 100644
--- a/tools/gpgsplit.c
+++ b/tools/gpgsplit.c
@@ -18,6 +18,9 @@
  */
 
 #include <config.h>
+/* We don't want to have the macros from gpgrt here until we have
+ * completely replaced this module by the one from gpgrt.  */
+#undef GPGRT_ENABLE_ARGPARSE_MACROS
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,6 +42,7 @@
 #define INCLUDED_BY_MAIN_MODULE 1
 #include "../common/util.h"
 #include "../common/openpgpdefs.h"
+#include "../common/argparse.h" /* temporary hack.  */
 
 #ifdef HAVE_BZIP2
 # include <bzlib.h>
diff --git a/tools/gpgtar.c b/tools/gpgtar.c
index e5cbde4af..363510ecf 100644
--- a/tools/gpgtar.c
+++ b/tools/gpgtar.c
@@ -27,6 +27,9 @@
    gpg.  So here we go.  */
 
 #include <config.h>
+/* We don't want to have the macros from gpgrt here until we have
+ * completely replaced this module by the one from gpgrt.  */
+#undef GPGRT_ENABLE_ARGPARSE_MACROS
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
@@ -41,6 +44,7 @@
 #include "../common/openpgpdefs.h"
 #include "../common/init.h"
 #include "../common/strlist.h"
+#include "../common/argparse.h" /* temporary hack.  */
 
 #include "gpgtar.h"