From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 12 Jun 2019 18:17:55 +0000 (+0200)
Subject: Get full version of gcc
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a15f2db0ff19b80680212dd64f7bd630a13b8b7f;p=features.git

Get full version of gcc

Recent gcc versions return a short version with -dumpversion, e.g. 9.

In this case, use -dumpfullversion, which gives something like 9.1.0.

This makes the gcc 9 detection work properly.
---

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index f77e3480f6..9fe42e8847 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -381,6 +381,10 @@ if test x$GXX = xyes; then
   if test x$CLANG = xno; then
     dnl Useful for global version info
     gxx_version=`${CXX} -dumpversion`
+    case $gxx_version in
+	*.*) ;;
+	*) gxx_version=`${CXX} -dumpfullversion` ;;
+    esac
     CXX_VERSION="($gxx_version)"
   else
     gxx_version=clang-$clang_version