disambiguate plugin/poppler #includes

Related to #1785.

diff --git a/plugin/poppler/Makefile.am b/plugin/poppler/Makefile.am
index 9c4022da9bba34da0f9f0e5e1c7b69626bef9e6d..16d07d2967193ea080a5734d1a363925b9cf8d3d 100644 (file)
--- 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 955c48dfc960ab62abc1aa7a19ab25cbb31df62e..a72782319866e5c043b7ee8b689913639bf6d807 100644 (file)
--- 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 b6f3054906c0b5d5932e3ab2a5413239802f01de..411bcec417ed32c4e45d25443581f4a0f4c1ee55 100644 (file)
--- 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[];