Mercurial > MadButterfly

changeset 1074:ed9ca123d8db openvg

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix configure.ac to make X and OpenVG working together
author Thinker K.F. Li <thinker@codemud.net>
date Wed, 01 Dec 2010 21:12:36 +0800
parents d09f603438d8
children a7f16c967a0b
files configure.ac
diffstat 1 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Wed Dec 01 20:01:49 2010 +0800
+++ b/configure.ac	Wed Dec 01 21:12:36 2010 +0800
@@ -121,6 +121,15 @@
 	esac], [xshm=true])
 [fi]
 
+# Validate options
+[case "${backend}-${graphic_engine}-${image_loader}" in
+    (X-cairo-*|X-openvg-imlib2)
+    (dfb-cairo-*)
+    (none-*-*)
+	;;
+    (*)] AC_MSG_ERROR([The combination of --with-backend=${backend}, --with-graphic-engine=${graphic_engine} and --with-image-loader=${image_loader} is invalid]) [;;
+esac]
+
 [if [ x"${graphic_engine}" = x"skia" ]; then ]
     AC_DEFINE([SKIA_GRAPH_ENGINE])
 [elif [ x"${graphic_engine}" = x"openvg" ]; then ]
@@ -164,9 +173,9 @@
 # Define AM and AC variable for display backend
 
 AM_CONDITIONAL([X_BACKEND],
-	[test x$backend = x'X' -a x"${graphic_engine}" = x"cairo"])
+	[test x$backend = x'X'])
 
-[if [ x"${backend}" = x'X' -a x"${graphic_engine}" = x"cairo" ]; then]
+[if [ x"${backend}" = x'X' ]; then]
     AC_DEFINE([X_BACKEND])
 [fi]