Locate engine names only at runtime and prefer GnuPG-2.

* configure.ac (NEED_GPG_VERSION, NEED_GPGSM_VERSION)
(NEED_G13_VERSION, NEED_GPGCONF_VERSION): Remove vars and all related
checks.  Do not check for any engine version.
(HAVE_ASSUAN): Remove AM conditional.
* src/Makefile.am: Remove separate component vars and always build all
engines but uiserver.
* src/dirinfo.c (WANT_GPGCONF_NAME): New.
(struct dirinfo): Add field gpgconf_name.
(_gpgme_get_default_gpgconf_name): Use WANT_GPGCONF_NAME.
(get_gpgconf_item): Set gpgconf name and adjust for _gpgme_get_*_path
now returning a malloced string.
* src/engine.c (engine_ops): Always init all engines except for
uiserver.
* src/posix-util.c (_gpgme_get_gpgsm_path, _gpgme_get_g13_path):
Remove unused functions.
(walk_path): New.
(_gpgme_get_gpg_path, _gpgme_get_gpgconf_path ): Re-implement using
walk_path.
* src/w32-util.c (_gpgme_get_gpgsm_path, _gpgme_get_g13_path): Remove
unused functions.
(_gpgme_get_gpg_path, _gpgme_get_gpgconf_path): Return a malloced
string.
* src/engine-g13.c (g13_get_req_version): Use a hardwired string with
the required version.  This info belongs into this file.
* src/engine-gpg.c (gpg_get_req_version): Ditto.
* src/engine-gpgconf.c (gpgconf_get_req_version): Ditto.
* src/engine-gpgsm.c (gpgsm_get_req_version): Ditto.
* tests/t-engine-info.c: Replace now useless test by an info output.
* tests/gpg/Makefile.am (GPG, GPG_AGENT): Hardwire gpg and gpg-agent.
* tests/gpgsm/Makefile.am (GPGSM): Hardwire gpgsm.

Signed-off-by: Werner Koch <[email protected]>

3 files changed, 13 insertions, 46 deletions

diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index c9000c93..e72bd492 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -19,8 +19,8 @@
 
 ## Process this file with automake to produce Makefile.in
 
-GPG = @GPG@
-GPG_AGENT = @GPG_AGENT@
+GPG = gpg
+GPG_AGENT = gpg-agent
 
 TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO=
 
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index 9086134b..45b3b50c 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -1,27 +1,27 @@
 # Copyright (C) 2000 Werner Koch (dd9jn)
 # Copyright (C) 2001 g10 Code GmbH
-# 
+#
 # This file is part of GPGME.
-# 
+#
 # GPGME is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2.1 of the
 # License, or (at your option) any later version.
-# 
+#
 # GPGME is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
 # Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 ## Process this file with automake to produce Makefile.in
 
-GPGSM = @GPGSM@
+GPGSM = gpgsm
 
-TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= 
+TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO=
 
 noinst_HEADERS = t-support.h
 TESTS = t-import t-keylist t-encrypt t-verify t-decrypt t-sign t-export
@@ -41,7 +41,7 @@ noinst_PROGRAMS = $(TESTS) t-genkey cms-keylist cms-decrypt
 key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
 
 CLEANFILES = pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
-	random_seed S.gpg-agent  
+	random_seed S.gpg-agent
 
 clean-local:
 	-gpg-connect-agent KILLAGENT /bye
@@ -51,7 +51,7 @@ all-local: ./pubring.kbx ./gpgsm.conf ./private-keys-v1.d/$(key_id).key ./trustl
 
 export GNUPGHOME := $(abs_builddir)
 
-export GPG_AGENT_INFO := 
+export GPG_AGENT_INFO :=
 
 ./pubring.kbx: $(srcdir)/cert_g10code_test1.der
 	$(GPGSM) --import $(srcdir)/cert_g10code_test1.der
diff --git a/tests/t-engine-info.c b/tests/t-engine-info.c
index ec2e1e84..43acd3d2 100644
--- a/tests/t-engine-info.c
+++ b/tests/t-engine-info.c
@@ -41,30 +41,6 @@
     }								\
   while (0)
 
-
-void
-check_engine_info (gpgme_engine_info_t info, gpgme_protocol_t protocol,
-		   const char *file_name, const char *req_version)
-{
-  if (info->protocol != protocol)
-    {
-      fprintf (stderr, "Unexpected protocol %i (expected %i instead)\n",
-	       info->protocol, protocol);
-      exit (1);
-    }
-  if (strcmp (info->file_name, file_name))
-    {
-      fprintf (stderr, "Unexpected file name to executable %s (expected %s instead)\n",
-	       info->file_name, file_name);
-      exit (1);
-    }
-  if (strcmp (info->req_version, req_version))
-    {
-      fprintf (stderr, "Unexpected required version %s (expected %s instead)\n",
-	       info->req_version, req_version);
-      exit (1);
-    }
-}
 
 
 int
@@ -77,18 +53,9 @@ main (int argc, char **argv )
   err = gpgme_get_engine_info (&info);
   fail_if_err (err);
 
-  check_engine_info (info, GPGME_PROTOCOL_OpenPGP, GPG_PATH, NEED_GPG_VERSION);
-
-  info = info->next;
-#ifdef GPGSM_PATH
-  check_engine_info (info, GPGME_PROTOCOL_CMS, GPGSM_PATH, NEED_GPGSM_VERSION);
-#else
-  if (info)
-    {
-      fprintf (stderr, "Unexpected engine info.\n");
-      exit (1);
-    }
-#endif
+  for (; info; info = info->next)
+    fprintf (stdout, "protocol=%d engine='%s' v='%s' (min='%s')\n",
+             info->protocol, info->file_name, info->version, info->req_version);
 
   return 0;
 }