From ea42356f3456458020b0669582dab4131dd38636 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Thu, 29 Aug 2013 12:39:55 +0200
Subject: [PATCH] configure.ac: search for efi-ldsdir in multiple places

---
 configure.ac | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 34c82ac..d85efba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,7 +91,14 @@ AC_SUBST([EFI_LIB_DIR])
 dnl extra objects and linker scripts
 AC_ARG_WITH(efi-ldsdir,
         AS_HELP_STRING([--with-efi-ldsdir=PATH], [Path to efi lds directory]),
-        [EFI_LDS_DIR="$withval"], [EFI_LDS_DIR="${efiroot}/gnuefi"]
+        [EFI_LDS_DIR="$withval"],
+        [
+                for EFI_LDS_DIR in "${efiroot}/gnuefi" "${efiroot}"; do
+                    for lds in ${EFI_LDS_DIR}/elf_${ARCH}_efi.lds; do
+                            test -f ${lds} && break
+                    done
+                done
+        ]
 )
 AC_SUBST([EFI_LDS_DIR])
 
-- 
2.7.4