fixing use of VERSION and PACKAGE_VERSION

diff --git a/cmd/lefty/lefty.c b/cmd/lefty/lefty.c
index 21b6129326069d6eb1e02052ded1ebe53f28fcf1..9560010185459db146023d17557fdc0a6472999d 100644 (file)
--- 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 9af1bd7597a0e5ae631708058e545c5470186566..c81caee34737047debca528844baa409a717f5a8 100644 (file)
--- 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 60fd0eac8c6b92cd84389d660e0db2124f784d48..66eee9c146b0fe0ceff64a675df097bcf75225c6 100644 (file)
--- 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 f003b032cff11a2ce62556c689c8c51e438dc2d5..d0cfd4c8a01ee20dc7c59c08b0aebcf2a6a3c750 100644 (file)
--- 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 0e5327c7982761c7f91ca739aa792d680829fdee..fce00b22882fb7de63fb6fec44de299a5538d783 100644 (file)
--- 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 ac2407b66b683b92cb3f4c8fbe2e40510ef36d6c..33696bb53669447096e3c53d77f98304826a1701 100644 (file)
--- 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 da39bef3a3bdc4d64bb83c104879758f1fed19f1..5d991d0d868c02ed6dd14f3ac7342681ebf4adca 100644 (file)
--- 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 32420c9aa9787fa71dfd5e69ff76a5dce77fd69a..0a7bf42e8e45a0b18a91abe47099c4af996362e1 100644 (file)
--- 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)