summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@live.com>2013-03-26 09:22:51 -0500
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-26 21:44:15 +0100
commitbb4e2e4faf76d4b2992231891a9d640cfdac5196 (patch)
tree820330fe053cda54437332c86eb59b2c3c740187 /configure
parentbafd3fdf1c72040abbf7ddf354f6b1c15c9985a4 (diff)
Allow tslib to be specified at configure time.
Change-Id: I0ebf0eeea7e6a0b8136fb805f34f04082bc58c5e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure20
1 files changed, 20 insertions, 0 deletions
diff --git a/configure b/configure
index 92f326e93b..a1ad4d7292 100755
--- a/configure
+++ b/configure
@@ -885,6 +885,7 @@ CFG_KMS=auto
CFG_LIBUDEV=auto
CFG_OBSOLETE_WAYLAND=no
CFG_EVDEV=auto
+CFG_TSLIB=no
CFG_NIS=auto
CFG_CUPS=auto
CFG_ICONV=auto
@@ -1867,6 +1868,13 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
+ tslib)
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+ CFG_TSLIB="$VAL"
+ else
+ UNKNOWN_OPT=yes
+ fi
+ ;;
cups)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_CUPS="$VAL"
@@ -5071,6 +5079,18 @@ if [ "$CFG_EVDEV" = "no" ]; then
QMakeVar add DEFINES QT_NO_EVDEV
fi
+if [ "$CFG_TSLIB" != "no" ]; then
+ if compileTest unix/tslib "tslib"; then
+ CFG_TSLIB=yes
+ QT_CONFIG="$QT_CONFIG tslib"
+ elif [ "$CFG_TSLIB" = "yes" ]; then
+ echo "The tslib functionality test failed!"
+ exit 1
+ else
+ CFG_TSLIB=no
+ fi
+fi
+
# Check we actually have X11 :-)
if compileTest x11/xlib "XLib"; then
QT_CONFIG="$QT_CONFIG xlib"