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

Merge branch 'maint-0.4.2'

Browse Source
This commit is contained in:
Nick Mathewson 2019-11-06 08:57:21 -05:00
commit 059a5795d3
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket32191 Normal file
View File

@ -0,0 +1,3 @@
o Minor features (build system):
- Make pkg-config use --prefix when cross-compiling, if PKG_CONFIG_PATH
is not set. Closes ticket 32191.

5
configure.ac
View File

@ -39,6 +39,11 @@ else
pkg_config_user_action="check the PKG_CONFIG_PATH environment variable" pkg_config_user_action="check the PKG_CONFIG_PATH environment variable"
fi fi
if test "x$PKG_CONFIG_PATH" = "x" && test "x$prefix" != "xNONE" && test "$host" != "$build"; then
export PKG_CONFIG_PATH=$prefix/lib/pkgconfig
AC_MSG_NOTICE([set PKG_CONFIG_PATH=$PKG_CONFIG_PATH to support cross-compiling])
fi
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,