fix includes for cgraph in non-default plugins

diff --git a/plugin/gdiplus/Makefile.am b/plugin/gdiplus/Makefile.am
index 8892a7ee4b42dcbd6e0e5bd101b7eb1ca6e2ba94..84dc7bc771def3e6a67bb70bd55e8ffd66c440f0 100644 (file)
--- a/plugin/gdiplus/Makefile.am
+++ b/plugin/gdiplus/Makefile.am
@@ -1,12 +1,18 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+if WITH_CGRAPH
+GRAPH = cgraph
+else
+GRAPH = graph
+endif
+
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/pathplan \
        -I$(top_srcdir)/lib/gvc \
-       -I$(top_srcdir)/lib/graph \
+       -I$(top_srcdir)/lib/$(GRAPH) \
        -I$(top_srcdir)/lib/cdt
        
 PATCHES = GdiPlusEnums.h.patch GdiPlusHeaders.h.patch GdiPlusimageAttributes.h.patch GdiPlusImaging.h.patch

diff --git a/plugin/glitz/Makefile.am b/plugin/glitz/Makefile.am
index 9fb46f18d95e015b5a3f951625bdd5b321396d0c..96228b33198c4b60d3c6cfbb9197e8746a42b296 100644 (file)
--- a/plugin/glitz/Makefile.am
+++ b/plugin/glitz/Makefile.am
@@ -1,12 +1,18 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+if WITH_CGRAPH
+GRAPH = cgraph
+else
+GRAPH = graph
+endif
+
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/pathplan \
        -I$(top_srcdir)/lib/gvc \
-       -I$(top_srcdir)/lib/graph \
+       -I$(top_srcdir)/lib/$(GRAPH) \
        -I$(top_srcdir)/lib/cdt \
        $(PANGOCAIRO_CFLAGS) $(GLITZ_CFLAGS)
 

diff --git a/plugin/ming/Makefile.am b/plugin/ming/Makefile.am
index ce9212ef3045f5b13c633208685ac4ad7e7bfa22..85405d761d8ea4d213994960162cd3d4ba40bbe5 100644 (file)
--- a/plugin/ming/Makefile.am
+++ b/plugin/ming/Makefile.am
@@ -1,6 +1,12 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+if WITH_CGRAPH
+GRAPH = cgraph
+else
+GRAPH = graph
+endif
+
 pkgfontdir = ${pkgdatadir}/font
 
 AM_CPPFLAGS = \
@@ -8,7 +14,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/pathplan \
        -I$(top_srcdir)/lib/gvc \
-       -I$(top_srcdir)/lib/graph \
+       -I$(top_srcdir)/lib/$(GRAPH) \
        -I$(top_srcdir)/lib/cdt \
        $(MING_CFLAGS)