summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-04-02 19:14:19 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-06-19 16:39:51 +0200
commit7de9d37099a009c5f29c71cba802822d92eb32cf (patch)
tree813bdb5c48099d3aea62511142bf31bf51376b2b
parentb2954378d6d3c881ad7e97fcfc66c220af3086f5 (diff)
remove the insane switch case for qt-style yes options
it only serves to create merge conflicts. the treatment is the same as for "unclassified" options anyway (they ignore the value, so it can be "yes" just as well). Change-Id: I9a75769338b4dc1f58493f1a1f1dd2c2e895290a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rwxr-xr-xconfigure8
1 files changed, 2 insertions, 6 deletions
diff --git a/configure b/configure
index a29589befa..58bdc5926d 100755
--- a/configure
+++ b/configure
@@ -919,11 +919,6 @@ while [ "$#" -gt 0 ]; do
VAR=`echo $1 | sed "s,^-no-\(.*\),\1,"`
VAL=no
;;
- #Qt style yes options
- -profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-eglfs|-directfb|-nis|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-debug-and-release|-harfbuzz|-prefix-install|-silent|-optimized-qmake|-reduce-relocations|-sse|-openssl|-openssl-linked|-phonon-backend|-audio-backend|-qml-debug|-javascript-jit|-rpath|-pkg-config|-force-pkg-config|-icu|-force-asserts|-testcocoon|-c++11)
- VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
- VAL=yes
- ;;
#Qt style options that pass an argument
-qconfig)
CFG_QCONFIG="$VAL"
@@ -1068,9 +1063,10 @@ while [ "$#" -gt 0 ]; do
VAR="add_warn"
VAL="$1"
;;
+ #General options, including Qt style yes options
-*)
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
- VAL="unknown"
+ VAL="yes"
;;
*)
UNKNOWN_ARG=yes