summaryrefslogtreecommitdiff
path: root/Makefile.decl
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2011-01-03 10:45:37 -0500
committerKristian Høgsberg <krh@bitplanet.net>2011-01-03 11:59:45 -0500
commitcacee7e7a380ac9009fc1339a860f563ebe4dc4d (patch)
tree17e127046551f6187434eba5e27f99307f376524 /Makefile.decl
parentae7e5fc2d19445ba55832888adcc7c24aeb17323 (diff)
downloadgtk+-cacee7e7a380ac9009fc1339a860f563ebe4dc4d.tar.gz
configure.ac: Support multiple GDK backends in one build
Diffstat (limited to 'Makefile.decl')
-rw-r--r--Makefile.decl10
1 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.decl b/Makefile.decl
index 2f6c579d2d..1ecbc61fe5 100644
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -17,9 +17,15 @@ XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \
9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \
9995 9996 9997 9998 9999
+
+if USE_X11
+SKIP_GDKTARGET = \
+ false
+else
SKIP_GDKTARGET = \
- test "$(gdktarget)" != "x11" \
- && echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
+ echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
+endif
+
XVFB_START = \
${XVFB} -help 2>/dev/null 1>&2 \
&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \