--- configure.ac	2009-11-05 13:58:12.000000000 -0800
+++ /home/dbyron/src/curl/curl/configure.ac	2009-11-05 13:49:58.000000000 -0800
@@ -1141,7 +1141,6 @@
   CLEANLDFLAGS="$LDFLAGS"
   CLEANCPPFLAGS="$CPPFLAGS"
   CLEANLIBS="$LIBS"
-  SAVE_PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR"
 
   case "$OPT_SSL" in
   yes)
@@ -1163,25 +1162,14 @@
     ;;
   *)
     dnl check the given --with-ssl spot
+    PKGTEST="no"
     PREFIX_OPENSSL=$OPT_SSL
-    if test x$cross_compiling != xyes; then
-      dnl only do pkg-config magic when not cross-compiling
-      PKGTEST="yes"
-
-      dnl but be careful and only look where we've been told
-      dnl to look
-      export PKG_CONFIG_LIBDIR=$OPT_SSL/lib/pkgconfig
-      AC_MSG_NOTICE([set PKG_CONFIG_LIBDIR to "$PKG_CONFIG_LIBDIR"])
-    fi
-
-    dnl in case pkg-config comes up empty, use what we got
-    dnl via --with-ssl
     LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
     if test "$PREFIX_OPENSSL" != "/usr" ; then
-      SSL_LDFLAGS="-L$LIB_OPENSSL"
-      SSL_CPPFLAGS="-I$PREFIX_OPENSSL/include"
+      LDFLAGS="$LDFLAGS -L$LIB_OPENSSL"
+      CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include"
     fi
-    SSL_CPPFLAGS="$SSL_CPPFLAGS -I$PREFIX_OPENSSL/include/openssl"
+    CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include/openssl"
     ;;
   esac
 
@@ -1194,29 +1182,15 @@
       SSL_LDFLAGS=`$PKGCONFIG --libs-only-L openssl 2>/dev/null`
       SSL_CPPFLAGS=`$PKGCONFIG --cflags-only-I openssl 2>/dev/null`
 
-      AC_MSG_NOTICE([pkg-config: SSL_LIBS: "$SSL_LIBS"])
-      AC_MSG_NOTICE([pkg-config: SSL_LDFLAGS: "$SSL_LDFLAGS"])
-      AC_MSG_NOTICE([pkg-config: SSL_CPPFLAGS: "$SSL_CPPFLAGS"])
-
       LIB_OPENSSL=`echo $SSL_LDFLAGS | sed -e 's/-L//g'`
 
-      dnl use the values pkg-config reported.  This is here
-      dnl instead of below with CPPFLAGS and LDFLAGS because we only
-      dnl learn about this via pkg-config.  If we only have
-      dnl the argument to --with-ssl we don't know what
-      dnl additional libs may be necessary.  Hope that we
-      dnl don't need any.
+      dnl use the values pkg-config reported
       LIBS="$LIBS $SSL_LIBS"
-
-      dnl we're done using pkg-config for openssl
-      export PKG_CONFIG_LIBDIR="$SAVE_PKG_CONFIG_LIBDIR"
+      CPPFLAGS="$CPPFLAGS $SSL_CPPFLAGS"
+      LDFLAGS="$LDFLAGS $SSL_LDFLAGS"
     fi
   fi
 
-  dnl finally, set flags to use SSL
-  CPPFLAGS="$CPPFLAGS $SSL_CPPFLAGS"
-  LDFLAGS="$LDFLAGS $SSL_LDFLAGS"
-
   dnl This is for Msys/Mingw
   case $host in
     *-*-msys* | *-*-mingw*)