[pacman-dev] [PATCH 2/6] Remove use of gpgme

[Denis A. Altoé Falqueto]

gpgme is very good when the keyring is the default, or if the requirements
are simple. But for a specialized keyring, like pacman's, it is not
flexible enough. This patch removes the checking of configure.ac.

Signed-off-by: Denis A. Altoé Falqueto <denisfalqueto at gmail.com>
---
 configure.ac        |    4 ----
 lib/libalpm/alpm.h  |    1 -
 lib/libalpm/error.c |    2 --
 3 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index b6ce68b..008975b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -154,10 +154,6 @@ else
 fi
 AM_CONDITIONAL(INTERNAL_DOWNLOAD, test "x$internaldownload" = "xyes")

-# Check for gpgme
-AC_CHECK_LIB([gpgme], [gpgme_check_version], ,
-	AC_MSG_ERROR([gpgme is needed to compile pacman!]))
-
 # Checks for header files.
 AC_CHECK_HEADERS([fcntl.h glob.h libintl.h limits.h locale.h string.h
strings.h sys/ioctl.h sys/param.h sys/statvfs.h sys/syslimits.h
sys/time.h syslog.h wchar.h])

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 2ce049d..d72cb8e 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -550,7 +550,6 @@ enum _pmerrno_t {
 	/* External library errors */
 	PM_ERR_LIBARCHIVE,
 	PM_ERR_LIBFETCH,
-	PM_ERR_GPGME,
 	PM_ERR_EXTERNAL_DOWNLOAD
 };

diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c
index 907a9f2..1fccc46 100644
--- a/lib/libalpm/error.c
+++ b/lib/libalpm/error.c
@@ -158,8 +158,6 @@ const char SYMEXPORT *alpm_strerror(int err)
 			/* obviously shouldn't get here... */
 			return _("download library error");
 #endif
-		case PM_ERR_GPGME:
-			return _("gpgme error");
 		case PM_ERR_EXTERNAL_DOWNLOAD:
 			return _("error invoking external downloader");
 		/* Unknown error! */
-- 
1.7.1