[tor-commits] [tor/maint-0.4.2] configure: Remove a check that will always fail

[nickm@xxxxxxxxxxxxxx]

commit 804d7c9bfc916c430dfd353f742257e4ae7b9c38
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Tue Nov 5 15:48:01 2019 +1000

    configure: Remove a check that will always fail
    
    And update the changes file to be more specific.
    
    Part of 32191.
---
 changes/ticket32191 | 4 ++--
 configure.ac        | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/changes/ticket32191 b/changes/ticket32191
index 65e919fe0..698832811 100644
--- a/changes/ticket32191
+++ b/changes/ticket32191
@@ -1,3 +1,3 @@
   o Minor features (build system):
-    - force pkg-config to only use --prefix when cross-compiling.
-      Closes ticket 32191.
+    - 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 ece831d5b..caa2d2f7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,11 +40,6 @@ 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])
-   if test -f "$PKG_CONFIG_PATH/libevent.pc"; then
-       echo "checking for $PKG_CONFIG_PATH/libevent.pc... yes"
-   else
-       AC_MSG_ERROR([$PKG_CONFIG_PATH/libevent.pc not found!])
-   fi
 fi
 
 AC_ARG_ENABLE(openbsd-malloc,



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits