From b29854528ab134dcad1fd1724d1a85b7a66b5689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Tue, 16 Oct 2018 10:31:54 +0200
Subject: [PATCH] * configure.ac: Fix build issue with libgpgme

---
 configure.ac | 61 +++++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4df941e9..9bdddeb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -493,35 +493,6 @@ else
   fi
 fi
 
-dnl
-dnl Check for libmetalink
-dnl
-AS_IF([test x"$with_metalink" != xno], [
-  PKG_CHECK_MODULES([METALINK], libmetalink, [
-      LIBS="$METALINK_LIBS $LIBS"
-      CFLAGS="$METALINK_CFLAGS $CFLAGS"
-      AC_DEFINE([HAVE_METALINK], [1], [Define if using metalink.])
-      with_metalink=yes
-    ], [
-      with_metalink=no
-    ])
-
-  have_gpg=no
-  AS_IF([test x"$with_metalink" = xyes], [
-    dnl
-    dnl Check for GPGME
-    dnl
-    m4_ifdef([AM_PATH_GPGME], [
-      AM_PATH_GPGME([], [
-        LIBS="$GPGME_LIBS $LIBS"
-        CFLAGS="$GPGME_CFLAGS $CFLAGS"
-        AC_DEFINE([HAVE_GPGME], [1], [Define if GPGME is available.])
-        have_gpg=yes
-      ])
-    ])
-  ])
-])
-
 dnl **********************************************************************
 dnl Checks for IPv6
 dnl **********************************************************************
@@ -786,6 +757,38 @@ AS_IF([test "X$with_cares" = "Xyes"],[
   RESOLVER_INFO="libc, --bind-dns-address and --dns-servers not available"
 ])
 
+dnl
+dnl Check for libmetalink
+dnl
+AS_IF([test x"$with_metalink" != xno], [
+  PKG_CHECK_MODULES([METALINK], libmetalink, [
+      LIBS="$METALINK_LIBS $LIBS"
+      CFLAGS="$METALINK_CFLAGS $CFLAGS"
+      AC_DEFINE([HAVE_METALINK], [1], [Define if using metalink.])
+      with_metalink=yes
+    ], [
+      with_metalink=no
+    ])
+
+  have_gpg=no
+  AS_IF([test x"$with_metalink" = xyes], [
+    dnl
+    dnl Check for GPGME
+    dnl
+    m4_ifdef([AM_PATH_GPGME], [
+      AM_PATH_GPGME([], [
+        # Put libgpgme to the end of the library list since it introduces a -L linker flags.
+        # That -L might break the build if there are two different version of
+        # a library (e.g. GnuTLS) in /usr/local and in the system directory.
+        LIBS="$LIBS $GPGME_LIBS"
+        CFLAGS="$GPGME_CFLAGS $CFLAGS"
+        AC_DEFINE([HAVE_GPGME], [1], [Define if GPGME is available.])
+        have_gpg=yes
+      ])
+    ])
+  ])
+])
+
 dnl
 dnl Extended Attribute support
 dnl