Commit e3b9880c authored by John Ellson's avatar John Ellson

fixing use of VERSION and PACKAGE_VERSION

parent a0320da2
......@@ -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);
......
......@@ -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
......
......@@ -44,7 +44,7 @@ extern int graphviz_errors;
static char *LibInfo[] = {
"graphviz", /* Program */
VERSION, /* Version */
PACKAGE_VERSION, /* Version */
BUILDDATE /* Build Date */
};
......
......@@ -51,7 +51,7 @@
static char *Info[] = {
"gvpr", /* Program */
VERSION, /* Version */
PACKAGE_VERSION, /* Version */
BUILDDATE /* Build Date */
};
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment