svn merge fix

starpu-top/config.h.in

@@ -20,10 +20,10 @@
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
-/* Major version number of StarPU. */
-#undef STARPU_MAJOR_VERSION
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
 
-/* Minor version number of StarPU. */
-#undef STARPU_MINOR_VERSION
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
 
 #endif /* __STARPU_TOP_CONFIG_H__ */

starpu-top/main.cpp

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