svn commit: r730883 - /httpd/httpd/trunk/acinclude.m4

[rj...@apache.org]

Author: rjung
Date: Fri Jan  2 17:14:33 2009
New Revision: 730883

URL: http://svn.apache.org/viewvc?rev=730883&view=rev
Log:
SSL libs are needed in linking only for ab and mod_ssl.

In both cases we already include SSL_LIBS, so lets add
the necessary link flags only to SSL_LIBS and not to
EXTRA_LDFLAGS.

The last of a series of changes of type
"restrict link dependencies where possible".

Modified:
    httpd/httpd/trunk/acinclude.m4

Modified: httpd/httpd/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?rev=730883&r1=730882&r2=730883&view=diff
==============================================================================
--- httpd/httpd/trunk/acinclude.m4 (original)
+++ httpd/httpd/trunk/acinclude.m4 Fri Jan  2 17:14:33 2009
@@ -369,12 +369,16 @@
   dnl Run header and version checks
   saved_CPPFLAGS="$CPPFLAGS"
   saved_LIBS="$LIBS"
+  saved_LDFLAGS="$LDFLAGS"
+  SSL_LIBS=""
   if test "x$ap_ssltk_base" != "x"; then
     APR_ADDTO(CPPFLAGS, [-I$ap_ssltk_base/include])
     APR_ADDTO(INCLUDES, [-I$ap_ssltk_base/include])
     APR_ADDTO(LDFLAGS, [-L$ap_ssltk_base/lib])
+    APR_ADDTO(SSL_LIBS, [-L$ap_ssltk_base/lib])
     if test "x$ap_platform_runtime_link_flag" != "x"; then
       APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag$ap_ssltk_base/lib])
+      APR_ADDTO(SSL_LIBS, [$ap_platform_runtime_link_flag$ap_ssltk_base/lib])
     fi
   fi
   if test "x$ap_ssltk_type" = "x"; then
@@ -446,6 +450,7 @@
         APR_ADDTO(INCLUDES, [$pkglookup])
         pkglookup="`$PKGCONFIG --libs-only-L --libs-only-other openssl`"
         APR_ADDTO(LDFLAGS, [$pkglookup])
+        APR_ADDTO(SSL_LIBS, [$pkglookup])
       else
         ap_ssltk_libs="-lssl -lcrypto `$apr_config --libs`"
       fi
@@ -453,7 +458,7 @@
       ap_ssltk_libs="-lssl -lcrypto `$apr_config --libs`"
     fi
   fi
-  APR_SETVAR(SSL_LIBS, [$ap_ssltk_libs])
+  APR_ADDTO(SSL_LIBS, [$ap_ssltk_libs])
   APR_ADDTO(LIBS, [$ap_ssltk_libs])
   APACHE_SUBST(SSL_LIBS)
 
@@ -471,6 +476,7 @@
   dnl restore
   CPPFLAGS="$saved_CPPFLAGS"
   LIBS="$saved_LIBS"
+  LDFLAGS="$saved_LDFLAGS"
   if test "x$liberrors" != "x"; then
     AC_MSG_ERROR([... Error, SSL/TLS libraries were missing or unusable])
   fi