nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

configure: Add --enable-gpl option

Browse Source 
This change on its own doesn't use the option for anything, but
it includes support for configure and a message in 'tor --version'

Signed-off-by: Micah Elizabeth Scott <beth@torproject.org>
This commit is contained in:
Micah Elizabeth Scott 2023-03-08 09:08:23 -08:00
parent 557eb81486
commit 9d1a573977
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -53,6 +53,19 @@ if test "x$PKG_CONFIG_PATH" = "x" && test "x$prefix" != "xNONE" && test "$host"
AC_MSG_NOTICE([set PKG_CONFIG_PATH=$PKG_CONFIG_PATH to support cross-compiling]) AC_MSG_NOTICE([set PKG_CONFIG_PATH=$PKG_CONFIG_PATH to support cross-compiling])
fi fi
# License options
AC_ARG_ENABLE(gpl,
AS_HELP_STRING(--enable-gpl, [allow the inclusion of GPL-licensed code, building a version of tor and libtor covered by the GPL rather than its usual 3-clause BSD license]))
license_option=BSD
AS_IF([test "x$enable_gpl" = xyes],
[
AC_DEFINE(ENABLE_GPL, 1, [Defined if tor is building in GPL-licensed mode.])
license_option=GPL
])
# Optional features
AC_ARG_ENABLE(openbsd-malloc, AC_ARG_ENABLE(openbsd-malloc,
AS_HELP_STRING(--enable-openbsd-malloc, [use malloc code from OpenBSD. Linux only. Deprecated: see --with-malloc])) AS_HELP_STRING(--enable-openbsd-malloc, [use malloc code from OpenBSD. Linux only. Deprecated: see --with-malloc]))
AC_ARG_ENABLE(static-openssl, AC_ARG_ENABLE(static-openssl,
@ -2651,6 +2664,7 @@ PPRINT_SUBTITLE([Build Features])
PPRINT_PROP_STRING([Compiler], [$CC]) PPRINT_PROP_STRING([Compiler], [$CC])
PPRINT_PROP_STRING([Host OS], [$host_os]) PPRINT_PROP_STRING([Host OS], [$host_os])
PPRINT_PROP_STRING([License Option], [$license_option])
AS_ECHO AS_ECHO
test "x$enable_fatal_warnings" = "xyes" && value=1 || value=0 test "x$enable_fatal_warnings" = "xyes" && value=1 || value=0

4
src/app/config/config.c
View File

@ -4476,6 +4476,10 @@ options_init_from_torrc(int argc, char **argv)
if (config_line_find(cmdline_only_options, "--version")) { if (config_line_find(cmdline_only_options, "--version")) {
printf("Tor version %s.\n",get_version()); printf("Tor version %s.\n",get_version());
#ifdef ENABLE_GPL
printf("This build of Tor is covered by the GNU General Public License "
"(https://www.gnu.org/licenses/gpl-3.0.en.html)\n");
#endif
printf("Tor is running on %s with Libevent %s, " printf("Tor is running on %s with Libevent %s, "
"%s %s, Zlib %s, Liblzma %s, Libzstd %s and %s %s as libc.\n", "%s %s, Zlib %s, Liblzma %s, Libzstd %s and %s %s as libc.\n",
get_uname(), get_uname(),