From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Thu, 3 Sep 2020 03:39:03 +0000 (-0700)
Subject: disambiguate tclpkg/tcldot #includes
X-Git-Tag: 2.46.0~20^2^2~63^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b64fe42c633cc81e38865e7ad984cb6c4d3321a;p=graphviz

disambiguate tclpkg/tcldot #includes

Related to #1242 and #1785.
---

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index dd1f1bc08..46eb8889e 100644
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -16,6 +16,7 @@ htmldir = $(pkgdatadir)/doc/html
 pkgtcldir = $(pkglibdir)/tcl
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/gvc \
 	-I$(top_srcdir)/lib/common \
 	-I$(top_srcdir)/lib/cgraph \
diff --git a/tclpkg/tcldot/no_builtins.c b/tclpkg/tcldot/no_builtins.c
index 205009345..eeb5110a2 100644
--- a/tclpkg/tcldot/no_builtins.c
+++ b/tclpkg/tcldot/no_builtins.c
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "gvplugin.h"
+#include <gvc/gvplugin.h>
 
 lt_symlist_t lt_preloaded_symbols[] = { { 0, 0 } };
 
diff --git a/tclpkg/tcldot/tcldot-util.c b/tclpkg/tcldot/tcldot-util.c
index 979823466..50db79e60 100644
--- a/tclpkg/tcldot/tcldot-util.c
+++ b/tclpkg/tcldot/tcldot-util.c
@@ -13,7 +13,7 @@
 
 
 #include "tcldot.h"
-#include "strcasecmp.h"
+#include <cgraph/strcasecmp.h>
 
 size_t Tcldot_string_writer(GVJ_t *job, const char *s, size_t len)
 {
diff --git a/tclpkg/tcldot/tcldot.h b/tclpkg/tcldot/tcldot.h
index c6a46dca6..a98f25a62 100644
--- a/tclpkg/tcldot/tcldot.h
+++ b/tclpkg/tcldot/tcldot.h
@@ -16,9 +16,9 @@
 /*    specifically just the change to Tcl_CmdProc */
 #define USE_NON_CONST
 #include <tcl.h>
-#include "render.h"
-#include "gvc.h"
-#include "gvio.h"
+#include <common/render.h>
+#include <gvc/gvc.h>
+#include <gvc/gvio.h>
 #include "tclhandle.h"
 
 #ifndef CONST84
diff --git a/tclpkg/tcldot/tcldot_builtins.c b/tclpkg/tcldot/tcldot_builtins.c
index 8250bd392..a0a80adff 100644
--- a/tclpkg/tcldot/tcldot_builtins.c
+++ b/tclpkg/tcldot/tcldot_builtins.c
@@ -13,7 +13,7 @@
 
 #include "config.h"
 
-#include "gvplugin.h"
+#include <gvc/gvplugin.h>
 
 #if defined(GVDLL) && !defined(ENABLE_LTDL)
 #define extern	__declspec(dllimport)