Add gbs.conf

[platform/upstream/gummiboot.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index dc45add..38b3fb2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 AC_INIT([gummiboot],
-        [35],
+        [43],
         [systemd-devel@lists.freedesktop.org],
         [gummiboot],
         [http://freedesktop.org/wiki/Software/gummiboot])
@@ -66,7 +66,7 @@ AC_SUBST([MACHINE_TYPE_NAME])
 
 # QEMU and OVMF UEFI firmware
 AS_IF([test x"$cross_compiling" = "xyes"], [], [
-        AC_PATH_PROG([QEMU], [qemu-kvm])
+        AC_PATH_PROG([QEMU], [qemu-system-x86_64])
         AC_CHECK_FILE([/usr/share/qemu/bios-ovmf.bin], [QEMU_BIOS=/usr/share/qemu/bios-ovmf.bin])
         AC_CHECK_FILE([/usr/share/qemu-ovmf/bios],     [QEMU_BIOS=/usr/share/qemu-ovmf/bios/bios.bin])
         AC_SUBST([QEMU_BIOS])
@@ -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 2
+                    done
+                done
+        ]
 )
 AC_SUBST([EFI_LDS_DIR])