Commit 9b68d7bc authored by Matteo Quintiliani's avatar Matteo Quintiliani

Removed PACKAGE_BUILD and substituted with m4_define([build_version], xxxx)


git-svn-id: file:///home/quintiliani/svncopy/nmxptool/trunk@915 3cd66e75-5955-46cb-a940-c26e5fc5497d
parent 5ad3a52f
......@@ -10,9 +10,20 @@ dnl These three define the plug-in version number
m4_define([major_version], [1])
m4_define([minor_version], [2])
m4_define([micro_version], [1])
# Comment build_version for stable release
m4_define([build_version], [beta1])
m4_ifdef([build_version], [
m4_define([version],
[major_version.minor_version.micro_version-build_version])
],
[
m4_define([version],
[major_version.minor_version.micro_version])
]
)
m4_define([version],
[major_version.minor_version.micro_version])
m4_define([bug_report_address], [quintiliani@ingv.it])
......
......@@ -72,8 +72,8 @@ time_t timeLastBeat = 0;
void nmxptool_ew_attach() {
/* Attach to Output transport ring */
tport_attach (&regionOut, ringKey);
logit ("t", "%s version %s%s\n",
NMXP_LOG_STR(PACKAGE_NAME), NMXP_LOG_STR(PACKAGE_VERSION), NMXP_LOG_STR(PACKAGE_BUILD));
logit ("t", "%s version %s\n",
NMXP_LOG_STR(PACKAGE_NAME), NMXP_LOG_STR(PACKAGE_VERSION));
}
void nmxptool_ew_detach() {
......
......@@ -7,7 +7,7 @@
* Istituto Nazionale di Geofisica e Vulcanologia - Italy
* quintiliani@ingv.it
*
* $Id: nmxptool_getoptlong.c,v 1.81 2008-03-11 10:45:01 mtheo Exp $
* $Id: nmxptool_getoptlong.c,v 1.82 2008-03-11 13:36:26 mtheo Exp $
*
*/
......@@ -68,13 +68,13 @@ Mail bug reports and suggestions to <%s>.\n",
void nmxptool_version() {
nmxp_log(NMXP_LOG_NORM_NO, NMXP_LOG_D_ANY, "\
%s %s%s, Nanometrics tool\n\
%s %s, Nanometrics tool\n\
(Private Data Stream 1.4, Data Access Protocol 1.0)\n",
NMXP_LOG_STR(PACKAGE_NAME), NMXP_LOG_STR(PACKAGE_VERSION), NMXP_LOG_STR(PACKAGE_BUILD)
NMXP_LOG_STR(PACKAGE_NAME), NMXP_LOG_STR(PACKAGE_VERSION)
/*
, nmxp_log_version()
nmxp_log_version()
*/
);
);
nmxptool_supports();
}
......
......@@ -7,7 +7,7 @@
* Istituto Nazionale di Geofisica e Vulcanologia - Italy
* quintiliani@ingv.it
*
* $Id: nmxptool_getoptlong.h,v 1.91 2008-03-05 07:29:43 mtheo Exp $
* $Id: nmxptool_getoptlong.h,v 1.92 2008-03-11 13:36:26 mtheo Exp $
*
*/
......@@ -17,9 +17,6 @@
#include <getopt.h>
#include <stdint.h>
/* For stable release set to "" */
#define PACKAGE_BUILD ""
#define NMXP_STR_STATE_EXT ".nmxpstate"
#define DEFAULT_NETWORK "XX"
......
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