From 736a40fec9a13fcad55e646189b3419a9280ab98 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 1 Nov 2004 22:50:59 +0000
Subject: When cross-compiling, the configure script no longer attempts to use
 pkg-config on the build host in order to detect OpenSSL compiler options.

---
 CHANGES      |  4 ++++
 configure.ac | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 28d96faff..195faa291 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel (1 November 2004)
+- When cross-compiling, the configure script no longer attempts to use
+  pkg-config on the build host in order to detect OpenSSL compiler options.
+
 Daniel (27 October 2004)
 - Dan Fandrich:
 
diff --git a/configure.ac b/configure.ac
index a9aa71529..82b733c8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -710,11 +710,17 @@ else
   case "$OPT_SSL" in
   yes)
     dnl --with-ssl (without path) used
-    PKGTEST="yes"
+    if test x$cross_compiling != xyes; then
+      dnl only do pkg-config magic when not cross-compiling
+      PKGTEST="yes"
+    fi
     EXTRA_SSL=/usr/local/ssl ;;
   off)
     dnl no --with-ssl option given, just check default places
-    PKGTEST="yes"
+    if test x$cross_compiling != xyes; then
+      dnl only do pkg-config magic when not cross-compiling
+      PKGTEST="yes"
+    fi
     EXTRA_SSL= ;;
   *)
     dnl check the given --with-ssl spot
-- 
cgit v1.2.3