Browse Source

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

Nick Mathewson 4 years ago
parent
commit
8f6dc54e3c
2 changed files with 8 additions and 0 deletions
  1. 3 0
      changes/ticket32191
  2. 5 0
      configure.ac

+ 3 - 0
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.

+ 5 - 0
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,