When cross-compiling, the configure script no longer attempts to use

pkg-config on the build host in order to detect OpenSSL compiler options.

diff --git a/CHANGES b/CHANGES
index 28d96faff4ec16cff38d0db0eebdb8f47d30ac27..195faa2917d690453ba4fddddc51e4393dd8bbb4 100644 (file)
--- 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 a9aa7152901b39bab0a34291db0afb36ae66bba7..82b733c8cdc898702f32f44c9ea73822bb6a748b 100644 (file)
--- 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