On Thu, 2013-08-22 at 00:46 +0200, Kay Sievers wrote: > On Thu, Aug 22, 2013 at 12:38 AM, Darren Hart <[email protected]> wrote: > > When cross-compiling, AC_CHECK_FILE aborts configure. Skip it when > > cross compiling. > > > > Signed-off-by: Darren Hart <[email protected]> > > Cc: Colin Walters <[email protected]> > > --- > > configure.ac | 10 ++++++---- > > 1 file changed, 6 insertions(+), 4 deletions(-) > > > > diff --git a/configure.ac b/configure.ac > > index 137580a..a9534be 100644 > > --- a/configure.ac > > +++ b/configure.ac > > @@ -65,10 +65,12 @@ AM_COND_IF(ARCH_X86_64, [ > > AC_SUBST([ARCH]) > > AC_SUBST([MACHINE_TYPE_NAME]) > > > > -# test bios > > -AC_CHECK_FILE([/usr/lib/qemu-bios], [BIOS=/usr/lib/qemu-bios]) > > -AC_CHECK_FILE([/usr/share/qemu-ovmf/bios], > > [BIOS=/usr/share/qemu-ovmf/bios]) > > -AC_SUBST([BIOS]) > > +dnl Do not test for bios when cross compiling > > +AS_IF([test "x$cross_compiling" = xno], [ > > + AC_CHECK_FILE([/usr/lib/qemu-bios], > > [BIOS=/usr/lib/qemu-bios]) > > + AC_CHECK_FILE([/usr/share/qemu-ovmf/bios], > > [BIOS=/usr/share/qemu-ovmf/bios]) > > + AC_SUBST([BIOS]) > > +]) > > Oh, sorry, I just committed it already. I was expecting you were still > busy with the other thing. :) > > Kay
No problem. The check was the same as mine, but you changed the bios paths significantly, such that both appear to be for ovmf now.... was that intentional? -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel _______________________________________________ systemd-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/systemd-devel
