Changeset: c98342e39931 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c98342e39931
Modified Files:
tools/mserver/monet_version.c.in
Branch: Oct2020
Log Message:
Backed out changeset dc3fa54c644b: it wasn't such a good idea after all.
diffs (26 lines):
diff --git a/tools/mserver/monet_version.c.in b/tools/mserver/monet_version.c.in
--- a/tools/mserver/monet_version.c.in
+++ b/tools/mserver/monet_version.c.in
@@ -77,10 +77,19 @@ monet_version(void)
GDKnr_threads, GDKnr_threads != 1 ? "s" : ""); */
printf("Libraries:\n");
#ifdef HAVE_LIBPCRE
+ /* PCRE_PRERELEASE may be defined as an empty value. In order
+ * to get the proper amount of white space between various
+ * parts of the version string on different compilers (none
+ * between minor and prerelease, a single one between that
+ * combination and the date), we need to resort to some
+ * run-time trickery since we can't do it with the
+ * preprocessor */
print_libversion("libpcre",
- pcre_version(),
- XSTRING(PCRE_MAJOR.PCRE_MINOR)
XSTRING(PCRE_PRERELEASE)
- " " XSTRING(PCRE_DATE));
+ pcre_version(),
+ XSTRING(Z PCRE_PRERELEASE)[1] == 0
+ ? XSTRING(PCRE_MAJOR.PCRE_MINOR PCRE_DATE)
+ : XSTRING(PCRE_MAJOR.PCRE_MINOR)
+ XSTRING(PCRE_PRERELEASE PCRE_DATE));
#endif
#ifdef HAVE_OPENSSL
print_libversion("openssl",
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
