Mercurial > MadButterfly

changeset 919:d2863fa9720b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from head.
author pingooo
date Tue, 26 Oct 2010 21:28:04 +0800
parents 92a97858c7e3 (diff) b8c3a8fc32d0 (current diff)
children f02f3f20ce95
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Tue Oct 26 20:37:19 2010 +0800
+++ b/configure.ac	Tue Oct 26 21:28:04 2010 +0800
@@ -147,8 +147,9 @@
 
 [if [ x"${cairo}" = xtrue ]; then]
     PKG_CHECK_MODULES([cairo], [cairo >= 1.6], , AC_MSG_ERROR([cairo >= 1.6 not found]))
+    #PKG_CHECK_MODULES([cairo2], [cairo2 >= 2.0], , AC_MSG_ERROR([cairo2 >= 2.0 not found]))
     [if [ x"${sh_text}" = xtrue ]; then]
-        PKG_CHECK_MODULES([pangocairo], [pangocairo >= 1.0], , AC_MSG_ERROR([pangocairo >= 1.0 not found]))
+        PKG_CHECK_MODULES([pangocairo], [pangocairo >= 1.0], , AC_MSG_ERROR([pangocairo >= 1.0 not found, use --disable_sh_text to configure without pangocairo.]))
     [fi]
 [fi]