tor

commit 8f6dc54e3c7299a6f224ccb474d3398d42542086
parent c3a1e15a5ec8cdb1d28e2d57a77ce5deb6da39bb
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed,  6 Nov 2019 08:57:14 -0500

Merge remote-tracking branch 'tor-github/pr/1495' into maint-0.4.2

Diffstat:
A
changes/ticket32191
 | 
3
+++
M
configure.ac
 | 
5
+++++

2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/changes/ticket32191 b/changes/ticket32191
@@ -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.
diff --git a/configure.ac b/configure.ac
@@ -37,6 +37,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,