Commit 8f6dc54e authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

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

parents c3a1e15a 804d7c9b

changes/ticket32191

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor features (build system):

    - Make pkg-config use --prefix when cross-compiling, if PKG_CONFIG_PATH

      is not set. Closes ticket 32191.

configure.ac

+5 −0
Original line number Diff line number Diff line
@@ -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,