* Revert breakage to ssl detection; while ssl libs were only

  linked for ab, mod_ssl in 2.0.62, the choice of libs were broken.
  Patch to 2.0 (applicable to no other branch);

Reviewed by: wrowe, sctemme, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@609625 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 45f1783c116a0208c91ba52b0c8f16e975d2757b..e696df87cf012a2363927e43f0b0bdc3b29827e0 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -115,12 +115,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * configure: Revert breakage to ssl detection; while ssl libs were only
-    linked for ab, mod_ssl in 2.0.62, the choice of libs were broken.
-    Patch to 2.0 (applicable to no other branch);
-      http://people.apache.org/~wrowe/fix-no-sslc-2.0.patch
-    +1; wrowe, sctemme, rpluem
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
     identify exactly what the proposed changes are!  Add all new

diff --git a/acinclude.m4 b/acinclude.m4
index 6819440599d02fdbda3821e406c754c18465e758..993b8a812de43b65a7d5f2319814547f9f7f7d69 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -492,21 +492,13 @@ if test "x$ap_ssltk_base" = "x"; then
     fi
   fi
   # Put SSL libraries in SSL_LIBS.
-  if test "$ap_ssltk_type" = "openssl"; then
-    APR_SETVAR(SSL_LIBS, [-lssl -lcrypto])
-  else
-    APR_SETVAR(SSL_LIBS, [-lsslc])
-  fi
+  APR_SETVAR(SSL_LIBS, [-lssl -lcrypto])
   pkg-config openssl 2> /dev/null
   if test $? -eq 0; then
     ap_ssltk_incdep=`pkg-config --cflags-only-I openssl`
     APR_ADDTO(INCLUDES, $ap_ssltk_incdep)
     ap_ssltk_libdep=`pkg-config --libs openssl`
-    if test "$ap_ssltk_type" = "openssl"; then
-      APR_SETVAR(SSL_LIBS, $ap_ssltk_libdep)
-    else
-      APR_SETVAR(SSL_LIBS, $ap_ssltk_libdep)
-    fi
+    APR_SETVAR(SSL_LIBS, $ap_ssltk_libdep)
   fi
   APACHE_SUBST(SSL_LIBS)
   ap_cv_ssltk="$ap_ssltk_base"