tools: fix display of package version information (thanks to Ludovic Courtès for the patch)

tools/starpu_calibrate_bus.c

@@ -57,8 +57,7 @@ static void parse_args(int argc, char **argv)
 	else if (strcmp(argv[1], "-v") == 0 ||
 		 strcmp(argv[1], "--version") == 0)
 	{
-		(void) fprintf(stdout, "%s %d.%d\n",
-			PROGNAME, STARPU_MAJOR_VERSION, STARPU_MINOR_VERSION);
+	        fputs(PROGNAME " (" PACKAGE_NAME ") " PACKAGE_VERSION "\n", stderr);
 		exit(EXIT_SUCCESS);
 	}
 	else

tools/starpu_machine_display.c

@@ -104,8 +104,7 @@ PROGNAME);
 		}
 		else if (strncmp(argv[i], "--version", 9) == 0 || strncmp(argv[i], "-v", 2) == 0)
 		{
-			(void) fprintf(stderr, "%s %d.%d\n",
-				       PROGNAME, STARPU_MAJOR_VERSION, STARPU_MINOR_VERSION);
+			fputs(PROGNAME " (" PACKAGE_NAME ") " PACKAGE_VERSION "\n", stderr);
 			exit(EXIT_FAILURE);
 		}
 		else

tools/starpu_perfmodel_display.c

@@ -113,9 +113,7 @@ static void parse_args(int argc, char **argv)
 			exit(EXIT_SUCCESS);
 
 		case 'v':
-			(void) fprintf(stdout, "%s %d.%d\n",
-				PROGNAME, STARPU_MAJOR_VERSION,
-				STARPU_MINOR_VERSION);
+		        fputs(PROGNAME " (" PACKAGE_NAME ") " PACKAGE_VERSION "\n", stderr);
 			exit(EXIT_SUCCESS);
 
 		case '?':

tools/starpu_perfmodel_plot.c

@@ -127,11 +127,9 @@ static void parse_args(int argc, char **argv)
 		}
 
 		if (strcmp(argv[i], "-v") == 0 ||
-		    strcmp(argv[i], "--version") == 0) {
-
-			(void) fprintf(stdout, "%s %d.%d\n",
-					PROGNAME, STARPU_MAJOR_VERSION,
-					STARPU_MINOR_VERSION);
+		    strcmp(argv[i], "--version") == 0)
+                {
+		        fputs(PROGNAME " (" PACKAGE_NAME ") " PACKAGE_VERSION "\n", stderr);
 			exit(EXIT_SUCCESS);
 		}
 

tools/starpu_workers_activity.in

@@ -38,7 +38,7 @@ usage()
 }
 
 if [ "$1" == "-v" ] || [ "$1" == "--version" ] ; then
-    echo "$PROGNAME @STARPU_MAJOR_VERSION@.@STARPU_MINOR_VERSION@"
+    echo "$PROGNAME (@PACKAGE_NAME@) @PACKAGE_VERSION@"
     exit 0
 fi