From bb4e2e4faf76d4b2992231891a9d640cfdac5196 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Tue, 26 Mar 2013 09:22:51 -0500 Subject: Allow tslib to be specified at configure time. Change-Id: I0ebf0eeea7e6a0b8136fb805f34f04082bc58c5e Reviewed-by: Oswald Buddenhagen --- configure | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'configure') 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" -- cgit v1.2.3