Merge pull request #900 from SaberUK/insp20+build-system-fixes

[2.0] Fix various problems with the build system.

2 files changed, 2 insertions, 0 deletions

diff --git a/configure b/configure
index 27f7e6f1e..33e9b4c50 100755
--- a/configure
+++ b/configure
@@ -209,6 +209,7 @@ else
 	{
 		chomp($config{HAS_OPENSSL}  = `pkg-config --modversion openssl 2>/dev/null`);		# Openssl version, others
 		$config{HAS_OPENSSL_PORT} = "";
+		$config{USE_FREEBSD_BASE_SSL} = "n";
 	}
 }
 
diff --git a/make/utilities.pm b/make/utilities.pm
index 8c8ac0d49..42dd6b547 100644
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -95,6 +95,7 @@ sub make_rpath($;$)
 
 sub extend_pkg_path()
 {
+	return if defined $ENV{DISABLE_EXTEND_PKG_PATH};
 	if (!exists $ENV{PKG_CONFIG_PATH})
 	{
 		$ENV{PKG_CONFIG_PATH} = "/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/libdata/pkgconfig:/usr/X11R6/libdata/pkgconfig";