Patchwork [6/7] Sort boolean options

login
register
mail settings
Submitter Juan Quintela
Date Jan. 20, 2010, 5:41 p.m.
Message ID <282e5b26855ec307ecf034b6b0c85758613a999f.1264008700.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/43338/
State New
Headers show

Comments

Juan Quintela - Jan. 20, 2010, 5:41 p.m.
No code changes

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 configure |  285 +++++++++++++++++++++++++++++++------------------------------
 1 files changed, 144 insertions(+), 141 deletions(-)

Patch

diff --git a/configure b/configure
index f86fef3..046b0fb 100755
--- a/configure
+++ b/configure
@@ -477,164 +477,166 @@  for opt do
   ;;
   --with-pkgversion=*) pkgversion=" ($optarg)"
   ;;
-  --disable-static)
-    static="no"
+# Boolean options
+  --disable-blobs) blobs="no"
   ;;
-  --enable-static|--static) #--static was the old name
-    static="yes"
-    LDFLAGS="-static $LDFLAGS"
+  --enable-blobs) blobs="yes"
   ;;
-  --enable-gprof) gprof="yes"
+  --disable-bluez) bluez="no"
   ;;
-  --disable-gprof) gprof="no"
+  --enable-bluez) bluez="yes"
   ;;
-  --disable-sdl) sdl="no"
+  --disable-brlapi) brlapi="no"
   ;;
-  --enable-sdl) sdl="yes"
+  --enable-brlapi) brlapi="yes"
   ;;
-  --enable-debug-tcg) debug_tcg="yes"
+  --disable-bsd-user) bsd_user="no"
   ;;
-  --disable-debug-tcg) debug_tcg="no"
+  --enable-bsd-user) bsd_user="yes"
   ;;
-  --disable-debug)
-      debug_tcg="no"
-      debug="no"
+  --disable-check-utests) check_utests="no"
   ;;
-  --enable-debug)
-      # Enable debugging options that aren't excessively noisy
-      debug_tcg="yes"
-      debug="yes"
-      strip_opt="no"
+  --enable-check-utests) check_utests="yes"
   ;;
-  --enable-sparse) sparse="yes"
+  --disable-cocoa)
+      cocoa="no"
   ;;
-  --disable-sparse) sparse="no"
+  --enable-cocoa)
+    cocoa="yes" ;
+    sdl="no" ;
+    audio_drv_list="coreaudio `echo $audio_drv_list | sed s,coreaudio,,g`"
   ;;
-  --disable-strip) strip_opt="no"
+  --disable-curl) curl="no"
   ;;
-  --enable-strip) strip_opt="yes"
+  --enable-curl) curl="yes"
   ;;
-  --disable-vnc-tls) vnc_tls="no"
+  --disable-curses) curses="no"
   ;;
-  --enable-vnc-tls) vnc_tls="yes"
+  --enable-curses) curses="yes"
   ;;
-  --disable-vnc-sasl) vnc_sasl="no"
+  --disable-darwin-user) darwin_user="no"
   ;;
-  --enable-vnc-sasl) vnc_sasl="yes"
+  --enable-darwin-user) darwin_user="yes"
   ;;
-  --disable-slirp) slirp="no"
+  --disable-debug)
+    debug_tcg="no"
+    debug="no"
   ;;
-  --enable-slirp) slirp="yes"
+  --enable-debug)
+    # Enable debugging options that aren't excessively noisy
+    debug_tcg="yes"
+    debug="yes"
+    strip_opt="no"
   ;;
-  --disable-uuid) uuid="no"
+  --disable-debug-tcg) debug_tcg="no"
   ;;
-  --enable-uuid) uuid="yes"
+  --enable-debug-tcg) debug_tcg="yes"
   ;;
-  --disable-vde) vde="no"
+  --disable-docs) docs="no"
   ;;
-  --enable-vde) vde="yes"
+  --enable-docs) docs="yes"
   ;;
-  --disable-xen) xen="no"
+  --disable-fdt) fdt="no"
   ;;
-  --enable-xen) xen="yes"
+  --enable-fdt) fdt="yes"
   ;;
-  --disable-brlapi) brlapi="no"
+  --enable-gprof) gprof="yes"
   ;;
-  --enable-brlapi) brlapi="yes"
+  --disable-gprof) gprof="no"
   ;;
-  --disable-bluez) bluez="no"
+  --disable-guest-base) guest_base="no"
   ;;
-  --enable-bluez) bluez="yes"
+  --enable-guest-base) guest_base="yes"
+  ;;
+  --disable-io-thread) io_thread="no"
+  ;;
+  --enable-io-thread) io_thread="yes"
   ;;
   --disable-kvm) kvm="no"
   ;;
   --enable-kvm) kvm="yes"
   ;;
-  --disable-profiler) profiler="no"
-  ;;
-  --enable-profiler) profiler="yes"
+  --disable-linux-aio) linux_aio="no"
   ;;
-  --enable-cocoa)
-      cocoa="yes" ;
-      sdl="no" ;
-      audio_drv_list="coreaudio `echo $audio_drv_list | sed s,coreaudio,,g`"
+  --enable-linux-aio) linux_aio="yes"
   ;;
-  --disable-cocoa)
-      cocoa="no"
+  --disable-linux-user) linux_user="no"
   ;;
-  --disable-system) softmmu="no"
+  --enable-linux-user) linux_user="yes"
   ;;
-  --enable-system) softmmu="yes"
+  --disable-mixemu) mixemu="no"
   ;;
-  --disable-user)
-      linux_user="no" ;
-      bsd_user="no" ;
-      darwin_user="no"
+  --enable-mixemu) mixemu="yes"
   ;;
-  --enable-user) ;;
-  --disable-linux-user) linux_user="no"
+  --disable-nptl) nptl="no"
   ;;
-  --enable-linux-user) linux_user="yes"
+  --enable-nptl) nptl="yes"
   ;;
-  --disable-darwin-user) darwin_user="no"
+  --disable-profiler) profiler="no"
   ;;
-  --enable-darwin-user) darwin_user="yes"
+  --enable-profiler) profiler="yes"
   ;;
-  --disable-bsd-user) bsd_user="no"
+  --disable-sdl) sdl="no"
   ;;
-  --enable-bsd-user) bsd_user="yes"
+  --enable-sdl) sdl="yes"
   ;;
-  --enable-guest-base) guest_base="yes"
+  --disable-slirp) slirp="no"
   ;;
-  --disable-guest-base) guest_base="no"
+  --enable-slirp) slirp="yes"
   ;;
-  --enable-user-pie) user_pie="yes"
+  --enable-sparse) sparse="yes"
   ;;
-  --disable-user-pie) user_pie="no"
+  --disable-sparse) sparse="no"
   ;;
-  --enable-werror) werror="yes"
+  --disable-static)
+    static="no"
   ;;
-  --disable-werror) werror="no"
+  --enable-static|--static) #--static was the old name
+    static="yes"
+    LDFLAGS="-static $LDFLAGS"
   ;;
-  --disable-curses) curses="no"
+  --disable-strip) strip_opt="no"
   ;;
-  --enable-curses) curses="yes"
+  --enable-strip) strip_opt="yes"
   ;;
-  --disable-curl) curl="no"
+  --disable-system) softmmu="no"
   ;;
-  --enable-curl) curl="yes"
+  --enable-system) softmmu="yes"
   ;;
-  --disable-fdt) fdt="no"
+  --disable-user)
+    linux_user="no" ;
+    bsd_user="no" ;
+    darwin_user="no"
   ;;
-  --enable-fdt) fdt="yes"
+  --enable-user)
   ;;
-  --disable-check-utests) check_utests="no"
+  --disable-user-pie) user_pie="no"
   ;;
-  --enable-check-utests) check_utests="yes"
+  --enable-user-pie) user_pie="yes"
   ;;
-  --disable-nptl) nptl="no"
+  --disable-uuid) uuid="no"
   ;;
-  --enable-nptl) nptl="yes"
+  --enable-uuid) uuid="yes"
   ;;
-  --disable-mixemu) mixemu="no"
+  --disable-vde) vde="no"
   ;;
-  --enable-mixemu) mixemu="yes"
+  --enable-vde) vde="yes"
   ;;
-  --disable-linux-aio) linux_aio="no"
+  --disable-vnc-sasl) vnc_sasl="no"
   ;;
-  --enable-linux-aio) linux_aio="yes"
+  --enable-vnc-sasl) vnc_sasl="yes"
   ;;
-  --disable-io-thread) io_thread="no"
+  --disable-vnc-tls) vnc_tls="no"
   ;;
-  --enable-io-thread) io_thread="yes"
+  --enable-vnc-tls) vnc_tls="yes"
   ;;
-  --disable-blobs) blobs="no"
+  --enable-werror) werror="yes"
   ;;
-  --enable-blobs) blobs="yes"
+  --disable-werror) werror="no"
   ;;
-  --disable-docs) docs="no"
+  --disable-xen) xen="no"
   ;;
-  --enable-docs) docs="yes"
+  --enable-xen) xen="yes"
   ;;
   *) echo "ERROR: unknown option $opt"; show_help="yes"
   ;;
@@ -733,77 +735,78 @@  echo "  --set-uname-release=R Return R for uname -r in usermode emulation"
 echo "  --source-path=PATH       path of source code [$source_path]"
 echo "  --sparc_cpu=V            Build qemu for Sparc architecture v7, v8, v8plus, v8plusa, v9"
 echo "  --with-pkgversion=PKG    Use PKG string as packageversion"
-echo "  --disable-static         disable static build"
-echo "  --enable-static          enable static build"
-echo "  --disable-gprof          disable gprof profiling"
-echo "  --enable-gprof           enable gprof profiling"
-echo "  --enable-debug-tcg       enable TCG debugging"
-echo "  --disable-debug-tcg      disable TCG debugging (default)"
-echo "  --disable-debug          disable common debug build options"
-echo "  --enable-debug           enable common debug build options"
-echo "  --enable-sparse          enable sparse checker"
-echo "  --disable-sparse         disable sparse checker (default)"
-echo "  --disable-strip          disable stripping binaries"
-echo "  --enable-strip           enable stripping binaries"
-echo "  --disable-slirp          disable slirp networking"
-echo "  --enable-slirp           enable slirp networking"
-echo "  --disable-profiler       disable tcg profiler"
-echo "  --enable-profiler        enable tcg profiler"
-echo "  --disable-werror         disable compilation abort on warning"
-echo "  --enable-werror          enable compilation abort on warning"
-echo "  --disable-sdl            disable SDL"
-echo "  --enable-sdl             enable SDL"
-echo "  --disable-cocoa          disable COCOA (Mac OS X only)"
-echo "  --enable-cocoa           enable COCOA (Mac OS X only)"
-echo "  --disable-mixemu         disable mixer emulation"
-echo "  --enable-mixemu          enable mixer emulation"
-echo "  --disable-xen            disable xen backend driver support"
-echo "  --enable-xen             enable xen backend driver support"
+echo "Boolean options"
+echo "  --disable-blobs          disable installing provided firmware blobs"
+echo "  --enable-blobs           enable installing provided firmware blobs"
+echo "  --disable-bluez          disable bluez stack connectivity"
+echo "  --enable-bluez           enable bluez stack connectivity"
 echo "  --disable-brlapi         disable BrlAPI"
 echo "  --enable-brlapi          enable BrlAPI"
-echo "  --disable-vnc-tls        disable TLS encryption for VNC server"
-echo "  --enable-vnc-tls         enable TLS encryption for VNC server"
-echo "  --disable-vnc-sasl       disable SASL encryption for VNC server"
-echo "  --enable-vnc-sasl        enable SASL encryption for VNC server"
-echo "  --disable-curses         disable curses output"
-echo "  --enable-curses          enable curses output"
+echo "  --enable-bsd-user        enable all BSD usermode emulation targets"
+echo "  --disable-bsd-user       disable all BSD usermode emulation targets"
+echo "  --disable-check-utests   disable check unit-tests"
+echo "  --enable-check-utests    enable check unit-tests"
+echo "  --disable-cocoa          disable COCOA (Mac OS X only)"
+echo "  --enable-cocoa           enable COCOA (Mac OS X only)"
 echo "  --disable-curl           disable curl connectivity"
 echo "  --enable-curl            enable curl connectivity"
+echo "  --disable-curses         disable curses output"
+echo "  --enable-curses          enable curses output"
+echo "  --enable-darwin-user     enable all darwin usermode emulation targets"
+echo "  --disable-darwin-user    disable all darwin usermode emulation targets"
+echo "  --disable-debug          disable common debug build options"
+echo "  --enable-debug           enable common debug build options"
+echo "  --disable-debug-tcg      disable TCG debugging (default)"
+echo "  --enable-debug-tcg       enable TCG debugging"
 echo "  --disable-fdt            disable fdt device tree"
 echo "  --enable-fdt             enable fdt device tree"
-echo "  --disable-check-utests   disable check unit-tests"
-echo "  --enable-check-utests    enable check unit-tests"
-echo "  --disable-bluez          disable bluez stack connectivity"
-echo "  --enable-bluez           enable bluez stack connectivity"
+echo "  --disable-gprof          disable gprof profiling"
+echo "  --enable-gprof           enable gprof profiling"
+echo "  --enable-guest-base      enable GUEST_BASE support for usermode"
+echo "                           emulation targets"
+echo "  --disable-guest-base     disable GUEST_BASE support"
+echo "  --disable-io-thread      disable IO thread"
+echo "  --enable-io-thread       enable IO thread"
 echo "  --disable-kvm            disable KVM acceleration support"
 echo "  --enable-kvm             enable KVM acceleration support"
+echo "  --disable-linux-aio      disable Linux AIO support"
+echo "  --enable-linux-aio       enable Linux AIO support"
+echo "  --enable-linux-user      enable all linux usermode emulation targets"
+echo "  --disable-linux-user     disable all linux usermode emulation targets"
+echo "  --disable-mixemu         disable mixer emulation"
+echo "  --enable-mixemu          enable mixer emulation"
 echo "  --disable-nptl           disable usermode NPTL support"
 echo "  --enable-nptl            enable usermode NPTL support"
-echo "  --enable-system          enable all system emulation targets"
+echo "  --disable-profiler       disable tcg profiler"
+echo "  --enable-profiler        enable tcg profiler"
+echo "  --disable-sdl            disable SDL"
+echo "  --enable-sdl             enable SDL"
+echo "  --disable-slirp          disable slirp networking"
+echo "  --enable-slirp           enable slirp networking"
+echo "  --disable-sparse         disable sparse checker (default)"
+echo "  --enable-sparse          enable sparse checker"
+echo "  --disable-static         disable static build"
+echo "  --enable-static          enable static build"
+echo "  --disable-strip          disable stripping binaries"
+echo "  --enable-strip           enable stripping binaries"
 echo "  --disable-system         disable all system emulation targets"
-echo "  --enable-user            enable supported user emulation targets"
+echo "  --enable-system          enable all system emulation targets"
 echo "  --disable-user           disable all user emulation targets"
-echo "  --enable-linux-user      enable all linux usermode emulation targets"
-echo "  --disable-linux-user     disable all linux usermode emulation targets"
-echo "  --enable-darwin-user     enable all darwin usermode emulation targets"
-echo "  --disable-darwin-user    disable all darwin usermode emulation targets"
-echo "  --enable-bsd-user        enable all BSD usermode emulation targets"
-echo "  --disable-bsd-user       disable all BSD usermode emulation targets"
-echo "  --enable-guest-base      enable GUEST_BASE support for usermode"
-echo "                           emulation targets"
-echo "  --disable-guest-base     disable GUEST_BASE support"
-echo "  --enable-user-pie        build usermode emulation targets as PIE"
+echo "  --enable-user            enable supported user emulation targets"
 echo "  --disable-user-pie       do not build usermode emulation targets as PIE"
+echo "  --enable-user-pie        build usermode emulation targets as PIE"
 echo "  --disable-uuid           disable uuid support"
 echo "  --enable-uuid            enable uuid support"
 echo "  --disable-vde            disable support for vde network"
 echo "  --enable-vde             enable support for vde network"
-echo "  --disable-linux-aio      disable Linux AIO support"
-echo "  --enable-linux-aio       enable Linux AIO support"
-echo "  --disable-io-thread      disable IO thread"
-echo "  --enable-io-thread       enable IO thread"
-echo "  --disable-blobs          disable installing provided firmware blobs"
-echo "  --enable-blobs           enable installing provided firmware blobs"
+echo "  --disable-vnc-sasl       disable SASL encryption for VNC server"
+echo "  --enable-vnc-sasl        enable SASL encryption for VNC server"
+echo "  --disable-vnc-tls        disable TLS encryption for VNC server"
+echo "  --enable-vnc-tls         enable TLS encryption for VNC server"
+echo "  --disable-werror         disable compilation abort on warning"
+echo "  --enable-werror          enable compilation abort on warning"
+echo "  --disable-xen            disable xen backend driver support"
+echo "  --enable-xen             enable xen backend driver support"
 echo ""
 echo "NOTE: The object files are built at the place where configure is launched"
 exit 1