aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-11-06 08:57:21 -0500
committerNick Mathewson <nickm@torproject.org>2019-11-06 08:57:21 -0500
commit059a5795d32cae9f5801cdc980a7abbd22996ba3 (patch)
treeefd6184a52df539753715ae403dcdeea1adb6f56 /configure.ac
parent22482fd45472525c5ebaf2e68880b61b7703cad3 (diff)
parent8f6dc54e3c7299a6f224ccb474d3398d42542086 (diff)
downloadtor-059a5795d32cae9f5801cdc980a7abbd22996ba3.tar.gz
tor-059a5795d32cae9f5801cdc980a7abbd22996ba3.zip
Merge branch 'maint-0.4.2'
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index e949aca9db..3a98a4a32c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,11 @@ else
pkg_config_user_action="check the PKG_CONFIG_PATH environment variable"
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,
AS_HELP_STRING(--enable-openbsd-malloc, [use malloc code from OpenBSD. Linux only. Deprecated: see --with-malloc]))
AC_ARG_ENABLE(static-openssl,