[cairo-commit] cairo ChangeLog, 1.1001, 1.1002 INSTALL, 1.2, 1.3 configure.in, 1.137, 1.138

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv30538

Modified Files:
	ChangeLog INSTALL configure.in 
Log Message:

2005-08-24  Carl Worth  <cworth at cworth.org>

        * INSTALL: Put glitz in the experimental section.

        * configure.in: Give glitz the experimental treatment, (disable it
        by default.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.1001
retrieving revision 1.1002
diff -u -d -r1.1001 -r1.1002
--- ChangeLog	24 Aug 2005 13:17:39 -0000	1.1001
+++ ChangeLog	24 Aug 2005 13:48:02 -0000	1.1002
@@ -1,5 +1,12 @@
 2005-08-24  Carl Worth  <cworth at 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 at cworth.org>
+
 	* INSTALL: Add some more detailed build instructions.
 
 2005-08-24  Billy Biggs  <vektor at dumbterm.net>

Index: INSTALL
===================================================================
RCS file: /cvs/cairo/cairo/INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- INSTALL	24 Aug 2005 13:17:39 -0000	1.2
+++ INSTALL	24 Aug 2005 13:48:02 -0000	1.3
@@ -61,6 +61,7 @@
     --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 @@
     --disable-xlib
     --disable-win32
     --disable-png
-    --disable-glitz
     --disable-freetype
 
 	Cairo's configure script detects the libraries needed to build

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- configure.in	24 Aug 2005 13:07:58 -0000	1.137
+++ configure.in	24 Aug 2005 13:48:02 -0000	1.138
@@ -229,8 +229,8 @@
 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 @@
 *** to @BACKEND at -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