[tor-commits] [obfsproxy/master] Revert "Produce an error if pkg-config's version is old."

asn at torproject.org asn at torproject.org
Wed May 2 01:36:53 UTC 2012


commit 9e9573bdf6c4220d3c0180143ed00594cd7e8bf4
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue May 1 20:46:19 2012 +0300

    Revert "Produce an error if pkg-config's version is old."
    
    This reverts commit e0e53de4f5ea91762fd810f2c5755f0c22e578ef,
    since it seems that adding pkg-config as a hard dependency is
    a bad idea (it's quite hard to install correctly in Windows).
    
    (ticket #5718)
---
 m4/pkg.m4 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/m4/pkg.m4 b/m4/pkg.m4
index cb5292d..c9d0dd0 100644
--- a/m4/pkg.m4
+++ b/m4/pkg.m4
@@ -41,10 +41,10 @@ if test -n "$PKG_CONFIG"; then
 		AC_MSG_RESULT([yes])
 	else
 		AC_MSG_RESULT([no])
-		AC_MSG_ERROR([pkg-config must be at least version $_pkg_min_version.])
+		PKG_CONFIG=""
 	fi
 else
-	AC_MSG_ERROR([pkg-config not found!])
+    AC_MSG_ERROR([pkg-config not found!])
 fi[]dnl
 ])# PKG_PROG_PKG_CONFIG
 





More information about the tor-commits mailing list