From e3b9880cd61bbfe7049ccb7fada757408b176816 Mon Sep 17 00:00:00 2001
From: John Ellson <ellson@research.att.com>
Date: Mon, 7 Oct 2013 17:16:12 -0400
Subject: [PATCH] fixing use of VERSION and PACKAGE_VERSION

---
 cmd/lefty/lefty.c                | 2 +-
 configure.ac                     | 4 ++--
 lib/gvc/gvcontext.c              | 2 +-
 lib/gvpr/gvpr.c                  | 2 +-
 tclpkg/gdtclft/gdtclft.c         | 2 +-
 tclpkg/tcldot/tcldot.c           | 2 +-
 tclpkg/tclpathplan/tclpathplan.c | 2 +-
 tclpkg/tkspline/tkspline.c       | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmd/lefty/lefty.c b/cmd/lefty/lefty.c
index 21b612932..956001018 100644
--- a/cmd/lefty/lefty.c
+++ b/cmd/lefty/lefty.c
@@ -458,7 +458,7 @@ static void processargs (int argc, char *argv[]) {
             Gpscanvasname = argv[1], argv++, argc--;
         else if (strcmp (argv[0], "-V") == 0) {
             fprintf (stderr, "lefty version %s\n", LEFTYVERSION);
-            fprintf (stderr, "graphviz version %s (%s)\n", VERSION, BUILDDATE);
+            fprintf (stderr, "graphviz version %s (%s)\n", PACKAGE_VERSION, BUILDDATE);
 	}
         else if (strcmp (argv[0], "-?") == 0)
             usage(0);
diff --git a/configure.ac b/configure.ac
index 9af1bd759..c81caee34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ AC_PREREQ(2.61)
 #	graphviz_version_commit
 m4_include(./version.m4)
 
-AC_INIT([graphviz],[graphviz_version_major.graphviz_version_minor.graphviz_version_micro],[http://www.graphviz.org/])
+AC_INIT([graphviz],[graphviz_version_major().graphviz_version_minor().graphviz_version_micro()],[http://www.graphviz.org/])
 
 GRAPHVIZ_VERSION_MAJOR=graphviz_version_major()
 GRAPHVIZ_VERSION_MINOR=graphviz_version_minor()
@@ -205,7 +205,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS([config.h lib/common/types.h])
 
 # put BUILDDATE in its own file so that only targets that use it get rebuilt
-echo "#define BUILDDATE \"$VERSION_DATE\"" > builddate.h
+echo "#define BUILDDATE \"$GRAPHVIZ_VERSION_DATE\"" > builddate.h
 
 # only update ast_common.h (for GNU builds) from master if changed
 if ! `cmp -s $srcdir/ast_common.h.in ast_common.h`; then
diff --git a/lib/gvc/gvcontext.c b/lib/gvc/gvcontext.c
index 60fd0eac8..66eee9c14 100644
--- a/lib/gvc/gvcontext.c
+++ b/lib/gvc/gvcontext.c
@@ -44,7 +44,7 @@ extern int graphviz_errors;
 
 static char *LibInfo[] = {
     "graphviz",         /* Program */
-    VERSION,            /* Version */
+    PACKAGE_VERSION,   /* Version */
     BUILDDATE           /* Build Date */
 };
 
diff --git a/lib/gvpr/gvpr.c b/lib/gvpr/gvpr.c
index f003b032c..d0cfd4c8a 100644
--- a/lib/gvpr/gvpr.c
+++ b/lib/gvpr/gvpr.c
@@ -51,7 +51,7 @@
 
 static char *Info[] = {
     "gvpr",                     /* Program */
-    VERSION,                    /* Version */
+    PACKAGE_VERSION,            /* Version */
     BUILDDATE                   /* Build Date */
 };
 
diff --git a/tclpkg/gdtclft/gdtclft.c b/tclpkg/gdtclft/gdtclft.c
index 0e5327c79..fce00b228 100644
--- a/tclpkg/gdtclft/gdtclft.c
+++ b/tclpkg/gdtclft/gdtclft.c
@@ -1386,7 +1386,7 @@ int Gdtclft_Init(Tcl_Interp * interp)
 	return TCL_ERROR;
     }
 #endif
-    if (Tcl_PkgProvide(interp, "Gdtclft", VERSION) != TCL_OK) {
+    if (Tcl_PkgProvide(interp, "Gdtclft", PACKAGE_VERSION) != TCL_OK) {
 	return TCL_ERROR;
     }
 
diff --git a/tclpkg/tcldot/tcldot.c b/tclpkg/tcldot/tcldot.c
index ac2407b66..33696bb53 100644
--- a/tclpkg/tcldot/tcldot.c
+++ b/tclpkg/tcldot/tcldot.c
@@ -340,7 +340,7 @@ int Tcldot_Init(Tcl_Interp * interp)
 	return TCL_ERROR;
     }
 #endif
-    if (Tcl_PkgProvide(interp, "Tcldot", VERSION) != TCL_OK) {
+    if (Tcl_PkgProvide(interp, "Tcldot", PACKAGE_VERSION) != TCL_OK) {
 	return TCL_ERROR;
     }
 
diff --git a/tclpkg/tclpathplan/tclpathplan.c b/tclpkg/tclpathplan/tclpathplan.c
index da39bef3a..5d991d0d8 100644
--- a/tclpkg/tclpathplan/tclpathplan.c
+++ b/tclpkg/tclpathplan/tclpathplan.c
@@ -922,7 +922,7 @@ int Tclpathplan_Init(Tcl_Interp * interp)
 	return TCL_ERROR;
     }
 #endif
-    if (Tcl_PkgProvide(interp, "Tclpathplan", VERSION) != TCL_OK) {
+    if (Tcl_PkgProvide(interp, "Tclpathplan", PACKAGE_VERSION) != TCL_OK) {
 	return TCL_ERROR;
     }
 
diff --git a/tclpkg/tkspline/tkspline.c b/tclpkg/tkspline/tkspline.c
index 32420c9aa..0a7bf42e8 100644
--- a/tclpkg/tkspline/tkspline.c
+++ b/tclpkg/tkspline/tkspline.c
@@ -242,7 +242,7 @@ Tcl_Interp *interp;
 
     Tk_CreateSmoothMethod(interp, &splineSmoothMethod);
 
-    return Tcl_PkgProvide(interp, "Tkspline", VERSION);
+    return Tcl_PkgProvide(interp, "Tkspline", PACKAGE_VERSION);
 }
 
 int Tkspline_SafeInit(Tcl_Interp * interp)
-- 
2.40.0