summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2005-08-24 06:48:02 +0000
committerCarl Worth <cworth@cworth.org>2005-08-24 06:48:02 +0000
commit9fde3cc0e3eea213c0f0fdfd8ca571fe63f4ddc9 (patch)
tree6692cad0c8c8081fcdf9bb11fd5c3d180618846e
parent19c25d63c2c4dd7a178e90df81b711ba667cbdd1 (diff)
downloadcairo-9fde3cc0e3eea213c0f0fdfd8ca571fe63f4ddc9.tar.gz
Put glitz in the experimental section.
Give glitz the experimental treatment, (disable it by default.
-rw-r--r--ChangeLog7
-rw-r--r--INSTALL2
-rw-r--r--configure.in8
3 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f760920da..8eeccfd96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2005-08-24 Carl Worth <cworth@cworth.org>
+ * INSTALL: Put glitz in the experimental section.
+
+ * configure.in: Give glitz the experimental treatment, (disable it
+ by default.
+
+2005-08-24 Carl Worth <cworth@cworth.org>
+
* INSTALL: Add some more detailed build instructions.
2005-08-24 Billy Biggs <vektor@dumbterm.net>
diff --git a/INSTALL b/INSTALL
index 445bb83fb..0fe692056 100644
--- a/INSTALL
+++ b/INSTALL
@@ -61,6 +61,7 @@ More detailed build instructions
--enable-quartz
--enable-atsui
--enable-xcb
+ --enable-glitz
Some of cairo's backends are marked as experimental and will
not be built by default. If you would like to build and
@@ -72,7 +73,6 @@ More detailed build instructions
--disable-xlib
--disable-win32
--disable-png
- --disable-glitz
--disable-freetype
Cairo's configure script detects the libraries needed to build
diff --git a/configure.in b/configure.in
index cdee28c89..2ba64df02 100644
--- a/configure.in
+++ b/configure.in
@@ -229,8 +229,8 @@ AC_SUBST(PNG_REQUIRES)
dnl ===========================================================================
AC_ARG_ENABLE(glitz,
- [ --disable-glitz Disable cairo's glitz backend],
- [use_glitz=$enableval], [use_glitz=yes])
+ [ --enable-glitz Enable cairo's glitz backend],
+ [use_glitz=$enableval], [use_glitz=no])
if test "x$use_glitz" = "xyes"; then
PKG_CHECK_MODULES(GLITZ, glitz >= 0.4.4, [
@@ -557,6 +557,10 @@ WARNING_MESSAGE='
*** to @BACKEND@-backend specific API.
'
+if test x"$use_glitz" == "xyes" ; then
+ echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/Glitz/'
+fi
+
if test x"$use_xcb" == "xyes" ; then
echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/XCB/'
fi