--- scp2/source/canvas/makefile.mk.orig	2006-07-20 11:53:02.000000000 +0200
+++ scp2/source/canvas/makefile.mk	2006-07-20 11:55:58.000000000 +0200
@@ -47,9 +47,12 @@
 
 SCP_PRODUCT_TYPE=osl
 
+.IF "$(ENABLE_AGG)" == "YES"
+SCPDEFS+=-DENABLE_AGG
 .IF "$(SYSTEM_AGG)" == "YES"
 SCPDEFS+=-DSYSTEM_AGG
 .ENDIF
+.ENDIF
 
 PARFILES= canvascommons.par		\
           directxcanvas.par     \
--- scp2/source/canvas/canvascommons.scp.orig	2006-07-20 11:54:34.000000000 +0200
+++ scp2/source/canvas/canvascommons.scp	2006-07-20 11:55:22.000000000 +0200
@@ -37,7 +37,9 @@
 
 STD_LIB_FILE_PATCH(gid_File_Lib_CppCanvas, cppcanvas)
 STD_LIB_FILE_PATCH(gid_File_Lib_CanvasTools, canvastools)
+#ifdef ENABLE_AGG
 #ifndef SYSTEM_AGG
 STD_LIB_FILE_PATCH(gid_File_Lib_Agg, agg)
 #endif
+#endif
 SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(gid_File_CanvasFactory, canvasfactory.uno)