diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-03-29 10:02:17 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-04-15 20:11:03 +0000 |
| commit | dd22889ed63599d44baa3bcb0fff6f75f328ff50 (patch) | |
| tree | cadf48b87611e203f3b4bf85f40078f6f0e5ed15 /configure | |
| parent | a4a83f52f9ee862d703c21dcd9915ebfd7c72ac5 (diff) | |
Change the way we handle features that have sub-features
Make sure we always set the base feature as a flag in qtconfig, and
set the sub-feature in addition if it's being used.
Change-Id: Icfeb0ec1ac9e1a615b5b22eb5fcce47e0e7fc153
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 14 |
1 files changed, 5 insertions, 9 deletions
@@ -6207,26 +6207,22 @@ fi if [ "$CFG_GIF" = "yes" ]; then QT_CONFIG="$QT_CONFIG gif" fi -if [ "$CFG_DOUBLECONVERSION" = "no" ]; then - QT_CONFIG="$QT_CONFIG no-doubleconversion" -elif [ "$CFG_DOUBLECONVERSION" = "system" ]; then - QT_CONFIG="$QT_CONFIG system-doubleconversion" +if [ "$CFG_DOUBLECONVERSION" = "system" ]; then + QT_CONFIG="$QT_CONFIG doubleconversion system-doubleconversion" else QT_CONFIG="$QT_CONFIG doubleconversion" fi if [ "$CFG_FREETYPE" = "no" ]; then - QT_CONFIG="$QT_CONFIG no-freetype" QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_FREETYPE" elif [ "$CFG_FREETYPE" = "system" ]; then - QT_CONFIG="$QT_CONFIG system-freetype" + QT_CONFIG="$QT_CONFIG freetype system-freetype" else QT_CONFIG="$QT_CONFIG freetype" fi if [ "$CFG_HARFBUZZ" = "no" ]; then - QT_CONFIG="$QT_CONFIG no-harfbuzz" QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_HARFBUZZ" elif [ "$CFG_HARFBUZZ" = "system" ]; then - QT_CONFIG="$QT_CONFIG system-harfbuzz" + QT_CONFIG="$QT_CONFIG harfbuzz system-harfbuzz" else QT_CONFIG="$QT_CONFIG harfbuzz" fi @@ -6254,7 +6250,7 @@ fi [ "$CFG_MTDEV" = "yes" ] && QT_CONFIG="$QT_CONFIG mtdev" [ "$CFG_NIS" = "yes" ] && QT_CONFIG="$QT_CONFIG nis" [ "$CFG_CUPS" = "yes" ] && QT_CONFIG="$QT_CONFIG cups" -[ "$CFG_ICONV" = "yes" ] && QT_CONFIG="$QT_CONFIG iconv" +[ "$CFG_ICONV" != "no" ] && QT_CONFIG="$QT_CONFIG iconv" [ "$CFG_ICONV" = "sun" ] && QT_CONFIG="$QT_CONFIG sun-libiconv" [ "$CFG_ICONV" = "gnu" ] && QT_CONFIG="$QT_CONFIG gnu-libiconv" [ "$CFG_GLIB" = "yes" ] && QT_CONFIG="$QT_CONFIG glib" |