Patchwork [v3] configure: avoid screening of --{en, dis}able-usb-redir options

login
register
mail settings
Submitter Max Filippov
Date Nov. 24, 2011, 11:53 a.m.
Message ID <1322135625-20707-1-git-send-email-jcmvbkbc@gmail.com>
Download mbox | patch
Permalink /patch/127481/
State New
Headers show

Comments

Max Filippov - Nov. 24, 2011, 11:53 a.m.
--*dir) option pattern precede --{en,dis}able-usb-redir) patterns in the
option analysis switch, making the latter options have no effect.

There were some --*dir that are supported by Autoconf and not by QEMU configure.
The aim was to let QEMU packagers use the rpm (or similar) macro that overrides
directories for their distribution.

Replace --*dir with exact option names.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
v2 -> v3 changes: add --htmldir
---
 configure |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)
Peter Maydell - Nov. 24, 2011, noon
On 24 November 2011 11:53, Max Filippov <jcmvbkbc@gmail.com> wrote:
> +  --sbindir=*)
> +  ;;
> +  --libexecdir=*)
> +  ;;
> +  --sharedstatedir=*)
> +  ;;

You can combine these all into one case, like this:

    --sbindir=*|--libexecdir=*|--sharedstatedir=*|--localstatedir=*|\
    --oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\
    --htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*)
    # These switches are silently ignored, for compatibility with
    # autoconf-generated configure scripts. This allows QEMU's
    # configure to be used by RPM and similar macros that set
    # lots of directory switches by default.
    ;;

(also please include the comment as rationale in the configure
script).

-- PMM

Patch

diff --git a/configure b/configure
index f033438..3a23795 100755
--- a/configure
+++ b/configure
@@ -569,6 +569,30 @@  for opt do
   ;;
   --sysconfdir=*) sysconfdir="$optarg"
   ;;
+  --sbindir=*)
+  ;;
+  --libexecdir=*)
+  ;;
+  --sharedstatedir=*)
+  ;;
+  --localstatedir=*)
+  ;;
+  --oldincludedir=*)
+  ;;
+  --datarootdir=*)
+  ;;
+  --infodir=*)
+  ;;
+  --localedir=*)
+  ;;
+  --htmldir=*)
+  ;;
+  --dvidir=*)
+  ;;
+  --pdfdir=*)
+  ;;
+  --psdir=*)
+  ;;
   --disable-sdl) sdl="no"
   ;;
   --enable-sdl) sdl="yes"
@@ -759,8 +783,6 @@  for opt do
   ;;
   --enable-opengl) opengl="yes"
   ;;
-  --*dir)
-  ;;
   --disable-rbd) rbd="no"
   ;;
   --enable-rbd) rbd="yes"