| Message ID | 1474963997-24085-1-git-send-email-roger.pau@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Sep 27, 2016 at 10:13:17AM +0200, Roger Pau Monne wrote: > Current configure code doesn't define {SEABIOS/OVMF}_PATH when > --with-system-{ovmf/seabios} is used. Fix this by making sure those defines > are always set if the internal {ovmf/seabios}_path variables are also set. > > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> > Suggested-by: Wei Liu <wei.liu2@citrix.com> Acked-by: Wei Liu <wei.liu2@citrix.com> > Cc: Wei Liu <wei.liu2@citrix.com> > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > --- > Please re-run autogen.sh before committing. > --- > tools/configure.ac | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/configure.ac b/tools/configure.ac > index f010d72..5724ace 100644 > --- a/tools/configure.ac > +++ b/tools/configure.ac > @@ -222,7 +222,7 @@ AC_ARG_WITH([system-seabios], > *) seabios_path=$withval ;; > esac > ],[]) > -AS_IF([test "x$seabios" = "xy"], [ > +AS_IF([test "x$seabios" = "xy" -o -n "$seabios_path" ], [ > AC_DEFINE_UNQUOTED([SEABIOS_PATH], > ["${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"], > [SeaBIOS path]) > @@ -239,7 +239,7 @@ AC_ARG_WITH([system-ovmf], > *) ovmf_path=$withval ;; > esac > ],[]) > -AS_IF([test "x$ovmf" = "xy"], [ > +AS_IF([test "x$ovmf" = "xy" -o -n "$ovmf_path" ], [ > AC_DEFINE_UNQUOTED([OVMF_PATH], > ["${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"], > [OVMF path]) > -- > 2.7.4 (Apple Git-66) >
diff --git a/tools/configure.ac b/tools/configure.ac index f010d72..5724ace 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -222,7 +222,7 @@ AC_ARG_WITH([system-seabios], *) seabios_path=$withval ;; esac ],[]) -AS_IF([test "x$seabios" = "xy"], [ +AS_IF([test "x$seabios" = "xy" -o -n "$seabios_path" ], [ AC_DEFINE_UNQUOTED([SEABIOS_PATH], ["${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"], [SeaBIOS path]) @@ -239,7 +239,7 @@ AC_ARG_WITH([system-ovmf], *) ovmf_path=$withval ;; esac ],[]) -AS_IF([test "x$ovmf" = "xy"], [ +AS_IF([test "x$ovmf" = "xy" -o -n "$ovmf_path" ], [ AC_DEFINE_UNQUOTED([OVMF_PATH], ["${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"], [OVMF path])
Current configure code doesn't define {SEABIOS/OVMF}_PATH when --with-system-{ovmf/seabios} is used. Fix this by making sure those defines are always set if the internal {ovmf/seabios}_path variables are also set. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Suggested-by: Wei Liu <wei.liu2@citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> --- Please re-run autogen.sh before committing. --- tools/configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)