From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 29 Aug 2020 19:43:25 +0000 (-0700)
Subject: disambiguate plugin/poppler #includes
X-Git-Tag: 2.46.0~20^2^2~69^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9eac45ba13d74fdb749b0b997838ae7faffc3218;p=graphviz

disambiguate plugin/poppler #includes

Related to #1785.
---

diff --git a/plugin/poppler/Makefile.am b/plugin/poppler/Makefile.am
index 9c4022da9..16d07d296 100644
--- a/plugin/poppler/Makefile.am
+++ b/plugin/poppler/Makefile.am
@@ -2,6 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/common \
 	-I$(top_srcdir)/lib/pathplan \
 	-I$(top_srcdir)/lib/gvc \
diff --git a/plugin/poppler/gvloadimage_poppler.c b/plugin/poppler/gvloadimage_poppler.c
index 955c48dfc..a72782319 100644
--- a/plugin/poppler/gvloadimage_poppler.c
+++ b/plugin/poppler/gvloadimage_poppler.c
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#include "gvplugin_loadimage.h"
+#include <gvc/gvplugin_loadimage.h>
 
 #ifdef HAVE_PANGOCAIRO
 #ifdef HAVE_POPPLER
diff --git a/plugin/poppler/gvplugin_poppler.c b/plugin/poppler/gvplugin_poppler.c
index b6f305490..411bcec41 100644
--- a/plugin/poppler/gvplugin_poppler.c
+++ b/plugin/poppler/gvplugin_poppler.c
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "gvplugin.h"
+#include <gvc/gvplugin.h>
 
 extern gvplugin_installed_t gvloadimage_poppler_types[];