Attempt to get Cairo to build nicely when glitz is not present.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@24267 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,10 @@
+2006-12-27 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/cairo/CairoContext.m: declare XWindowBuffer class
+	* configure.ac: disable glitz (if it cannot be found) in such a
+	way that Cairo backend still builds/runs.
+	* configure: regenerate
+
 2006-12-26 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/x11/XGGeneric.h: Added XGWMNetStates.

Source/cairo/CairoContext.m

@@ -16,7 +16,8 @@
 
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111 USA.
  */
 #include "cairo/CairoContext.h"
 #include "cairo/CairoGState.h"
@@ -35,6 +36,7 @@
 
 #define CGSTATE ((CairoGState *)gstate)
 
+@class XWindowBuffer;
 
 @implementation CairoContext
 

configure.ac

@@ -311,16 +311,16 @@ AC_ARG_ENABLE(glitz,
   enable_glitz=yes)
 
 if test "x$enable_glitz" = "xyes"; then
-  WITH_GLITZ=yes
   PKG_CHECK_MODULES(GLITZ, glitz-glx, have_glitz_glx=yes, have_glitz_glx=no)
   AC_CHECK_HEADER(glitz-glx.h,have_glitz_glx_h=yes, have_glitz_glx_h=no)
   if test "$have_glitz_glx" = yes -a "$have_glitz_glx_h" = yes; then
+    WITH_GLITZ=yes
     LIBS="$GLITZ_LIBS $LIBS"
     GRAPHIC_CFLAGS="$GLITZ_CFLAGS $GRAPHIC_CFLAGS"
     AC_DEFINE(HAVE_GLITZ_GLX,1,[Define if you have glitz])
+    AC_DEFINE(USE_GLITZ,1,[Define to enable glitz support])
   fi
   AC_SUBST(WITH_GLITZ)
-  AC_DEFINE(USE_GLITZ,1,[Define to enable glitz support])
 fi
 
 #--------------------------------------------------------------------