diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-11-06 08:57:21 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-11-06 08:57:21 -0500 |
| commit | 059a5795d32cae9f5801cdc980a7abbd22996ba3 (patch) | |
| tree | efd6184a52df539753715ae403dcdeea1adb6f56 | |
| parent | 22482fd45472525c5ebaf2e68880b61b7703cad3 (diff) | |
| parent | 8f6dc54e3c7299a6f224ccb474d3398d42542086 (diff) | |
| download | tor-059a5795d32cae9f5801cdc980a7abbd22996ba3.tar.gz tor-059a5795d32cae9f5801cdc980a7abbd22996ba3.zip | |
Merge branch 'maint-0.4.2'
| -rw-r--r-- | changes/ticket32191 | 3 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/ticket32191 b/changes/ticket32191 new file mode 100644 index 0000000000..6988328115 --- /dev/null +++ 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 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, |