diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-11-19 10:42:04 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-11-19 10:42:04 -0500 |
| commit | c4e0b28ecb90657eba1aaee8a590b408aaaad19a (patch) | |
| tree | bb14c4cae6358e3b37debeb36bcf7e45cadcae49 /configure.ac | |
| parent | 6fcb94beadfa4523271abc83e82dc523deda8be7 (diff) | |
| parent | 4382e977f74e41f65170b4d9292678859c9e521f (diff) | |
| download | tor-c4e0b28ecb90657eba1aaee8a590b408aaaad19a.tar.gz tor-c4e0b28ecb90657eba1aaee8a590b408aaaad19a.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/214' into master
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index e4ce2c4508..4c7471761e 100644 --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,8 @@ AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) configure_flags="$*" +AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to configure]) + # DO NOT EDIT THIS DEFINITION BY HAND UNLESS YOU KNOW WHAT YOU'RE DOING. # @@ -421,6 +423,17 @@ AC_PROG_MAKE_SET AC_PROG_RANLIB AC_PROG_SED +AX_COMPILER_VERSION +AX_COMPILER_VENDOR + +AC_DEFINE_UNQUOTED([COMPILER_VERSION],["$ax_cv_c_compiler_version"], [Compiler version]) +AC_DEFINE_UNQUOTED([COMPILER_VENDOR],["$ax_cv_c_compiler_vendor"], [Compiler vendor]) + +AS_CASE($ax_cv_c_compiler_vendor, + [gnu], AC_DEFINE([COMPILER],["GCC"],[Compiler name]), + AC_DEFINE([COMPILER],[],[Compiler name]) +) + AC_ARG_VAR([PERL], [path to Perl binary]) AC_CHECK_PROGS([PERL], [perl]) AM_CONDITIONAL(USE_PERL, [test "x$ac_cv_prog_PERL" != "x"]) |