From bc509d32eb741e5d3876eaaf0abd270cf68cd3b4 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Thu, 6 Jan 2011 10:24:58 +0000
Subject: Fix STR #2504 (first part). Replaced HAVE _CAIRO by FLTK_HAVE_CAIRO
 and USE_CAIRO by FLTK_USE_CAIRO everywhere.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8198 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 test/CMakeLists.txt | 8 ++++----
 test/cairo_test.cxx | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 969b3d642..a2cba8840 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -33,9 +33,9 @@ macro(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
 	target_link_libraries(${NAME} ${LIBRARIES})
 
    # link in optional libraries
-   if(HAVE_CAIRO)
+   if(FLTK_HAVE_CAIRO)
       target_link_libraries(${NAME} fltk_cairo)
-   endif(HAVE_CAIRO)
+   endif(FLTK_HAVE_CAIRO)
 
    if(USE_XFT)
       target_link_libraries(${NAME} ${X11_Xft_LIB})
@@ -133,6 +133,6 @@ CREATE_EXAMPLE(shape shape.cxx "fltk;fltk_gl;${OPENGL_LIBRARIES}")
 endif(OPENGL_FOUND)
 
 # Cairo demo
-if(HAVE_CAIRO)
+if(FLTK_HAVE_CAIRO)
    CREATE_EXAMPLE(cairo_test cairo_test.cxx fltk)
-endif(HAVE_CAIRO)
+endif(FLTK_HAVE_CAIRO)
diff --git a/test/cairo_test.cxx b/test/cairo_test.cxx
index 918bb35ff..261cc512c 100644
--- a/test/cairo_test.cxx
+++ b/test/cairo_test.cxx
@@ -27,7 +27,7 @@
 
 #include <config.h>
 
-#ifdef HAVE_CAIRO
+#ifdef FLTK_HAVE_CAIRO
 
 #include <FL/Fl_Cairo_Window.H>
 #include <FL/Fl_Box.H>
-- 
cgit v1.2.3