Automatic Compiler Version Settings (#100)

Closes #80 Signed-off-by: Mike Detwiler <[email protected]>
detwiler · Jan 6, 2021 · c251dba · c251dba
1 parent bf986be
commit c251dba
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/.gnulib b/.gnulib
diff --git a/.quickhatch b/.quickhatch
diff --git a/bootstrap b/bootstrap
@@ -4,7 +4,7 @@ scriptversion=2020-11-18.17; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/build-aux/.gitignore b/build-aux/.gitignore
@@ -1,3 +1,4 @@
+/compile
 /config.guess
 /config.sub
 /depcomp

diff --git a/configure.ac b/configure.ac
@@ -123,14 +123,10 @@ AM_COND_IF([HAVE_WIN_PY3],
 ## conan ##
 
 QH_REQUIRE_PROG([CLANG], [clang], [path to clang])
+QH_CLANG_VERSION_MAJOR([CONAN_CLANG_VERSIONS], [clang version for conan])
 QH_REQUIRE_PROG([GCC], [gcc], [path to gcc])
+QH_GCC_VERSION_MAJOR([CONAN_GCC_VERSIONS], [gcc version for conan])
 
-QH_VAR_ENSURE([CONAN_CLANG_VERSIONS],
-              [colon-separated list of Clang major versions for conan-package-tools],
-              [9])
-QH_VAR_ENSURE([CONAN_GCC_VERSIONS],
-              [colon-separated list of GCC major versions for conan-package-tools],
-              [9])
 QH_VAR_ENSURE([CONAN_USERNAME],
               [User name required by conan-package-tools],
               [$USER])