summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Filippov2011-11-24 13:11:31 +0100
committerAnthony Liguori2011-11-28 23:20:53 +0100
commit023ddd743136d2b1f7a2e6b3772736f96bfca1ff (patch)
treed13ff7091b8868f265417f3cb4efbb63e5c4e5e7
parentcutils: Make strtosz & friends leave follow set to callers (diff)
downloadqemu-023ddd743136d2b1f7a2e6b3772736f96bfca1ff.tar.gz
qemu-023ddd743136d2b1f7a2e6b3772736f96bfca1ff.tar.xz
qemu-023ddd743136d2b1f7a2e6b3772736f96bfca1ff.zip
configure: avoid screening of --{en, dis}able-usb-redir options
--*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. Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rwxr-xr-xconfigure10
1 files changed, 8 insertions, 2 deletions
diff --git a/configure b/configure
index a7caf1e190..ac4840d45b 100755
--- a/configure
+++ b/configure
@@ -569,6 +569,14 @@ for opt do
;;
--sysconfdir=*) sysconfdir="$optarg"
;;
+ --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.
+ ;;
--disable-sdl) sdl="no"
;;
--enable-sdl) sdl="yes"
@@ -759,8 +767,6 @@ for opt do
;;
--enable-opengl) opengl="yes"
;;
- --*dir)
- ;;
--disable-rbd) rbd="no"
;;
--enable-rbd) rbd="yes"