diff mbox series

[22/24] configure: accept "internal" for --enable-capstone/slirp/fdt

Message ID 20211007130829.632254-17-pbonzini@redhat.com
State New
Headers show
Series configure->meson queue for 6.2 | expand

Commit Message

Paolo Bonzini Oct. 7, 2021, 1:08 p.m. UTC 
Options such as "--enable-capstone=git" do not make much sense when building
from a tarball.  Accept "internal" for consistency with the meson options.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Marc-André Lureau Oct. 7, 2021, 8:41 p.m. UTC | #1 
On Thu, Oct 7, 2021 at 5:25 PM Paolo Bonzini <pbonzini@redhat.com> wrote:

> Options such as "--enable-capstone=git" do not make much sense when
> building
> from a tarball.  Accept "internal" for consistency with the meson options.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


> ---
>  configure | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/configure b/configure
> index d00ba0cbd2..d2f754d5d1 100755
> --- a/configure
> +++ b/configure
> @@ -1019,7 +1019,7 @@ for opt do
>    ;;
>    --enable-slirp=git) slirp="internal"
>    ;;
> -  --enable-slirp=system) slirp="system"
> +  --enable-slirp=*) slirp="$optarg"
>    ;;
>    --disable-vde) vde="disabled"
>    ;;
> @@ -1193,7 +1193,7 @@ for opt do
>    ;;
>    --enable-fdt=git) fdt="internal"
>    ;;
> -  --enable-fdt=system) fdt="system"
> +  --enable-fdt=*) fdt="$optarg"
>    ;;
>    --disable-linux-aio) linux_aio="disabled"
>    ;;
> @@ -1479,7 +1479,7 @@ for opt do
>    ;;
>    --enable-capstone=git) capstone="internal"
>    ;;
> -  --enable-capstone=system) capstone="system"
> +  --enable-capstone=*) capstone="$optarg"
>    ;;
>    --with-git=*) git="$optarg"
>    ;;
> --
> 2.31.1
>
>
>
>
diff mbox series

Patch

diff --git a/configure b/configure
index d00ba0cbd2..d2f754d5d1 100755
--- a/configure
+++ b/configure
@@ -1019,7 +1019,7 @@  for opt do
   ;;
   --enable-slirp=git) slirp="internal"
   ;;
-  --enable-slirp=system) slirp="system"
+  --enable-slirp=*) slirp="$optarg"
   ;;
   --disable-vde) vde="disabled"
   ;;
@@ -1193,7 +1193,7 @@  for opt do
   ;;
   --enable-fdt=git) fdt="internal"
   ;;
-  --enable-fdt=system) fdt="system"
+  --enable-fdt=*) fdt="$optarg"
   ;;
   --disable-linux-aio) linux_aio="disabled"
   ;;
@@ -1479,7 +1479,7 @@  for opt do
   ;;
   --enable-capstone=git) capstone="internal"
   ;;
-  --enable-capstone=system) capstone="system"
+  --enable-capstone=*) capstone="$optarg"
   ;;
   --with-git=*) git="$optarg"
   ;;