httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject svn commit: r730914 - /httpd/httpd/trunk/acinclude.m4
Date Sat, 03 Jan 2009 05:34:52 GMT
Author: jerenkrantz
Date: Fri Jan  2 21:34:52 2009
New Revision: 730914

URL: http://svn.apache.org/viewvc?rev=730914&view=rev
Log:
Fix up SSL autoconf-fu so as not to emit bogus lines.

* acinclude.m4
  (APACHE_CHECK_SSL_TOOLKIT): Move CHECKING line to match; convert a warning
  to AC_MSG_WARN; remove a spurious SSL-C checking; redirect stderr from the
  pkgconfig so as not to spew on errors.

Modified:
    httpd/httpd/trunk/acinclude.m4

Modified: httpd/httpd/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?rev=730914&r1=730913&r2=730914&view=diff
==============================================================================
--- httpd/httpd/trunk/acinclude.m4 (original)
+++ httpd/httpd/trunk/acinclude.m4 Fri Jan  2 21:34:52 2009
@@ -382,11 +382,11 @@
     fi
   fi
   if test "x$ap_ssltk_type" = "x"; then
-    AC_MSG_CHECKING([for OpenSSL version])
     dnl First check for manditory headers
     AC_CHECK_HEADERS([openssl/opensslv.h openssl/ssl.h], [ap_ssltk_type="openssl"], [])
     if test "$ap_ssltk_type" = "openssl"; then
       dnl so it's OpenSSL - test for a good version
+      AC_MSG_CHECKING([for OpenSSL version])
       AC_TRY_COMPILE([#include <openssl/opensslv.h>],[
 #if !defined(OPENSSL_VERSION_NUMBER)
 #error "Missing openssl version"
@@ -398,8 +398,8 @@
       [AC_MSG_RESULT(OK)],
       [dnl Replace this with OPENSSL_VERSION_TEXT from opensslv.h?
        AC_MSG_RESULT([not encouraging])
-       echo "WARNING: OpenSSL version may contain security vulnerabilities!"
-       echo "         Ensure the latest security patches have been applied!"
+       AC_MSG_WARN([OpenSSL version may contain security vulnerabilities!]
+                   [ Ensure the latest security patches have been applied!])
       ])
     else
       AC_MSG_RESULT([no OpenSSL headers found])
@@ -407,7 +407,6 @@
   fi
   if test "$ap_ssltk_type" != "openssl"; then
     dnl Might be SSL-C - report, then test anything relevant
-    AC_MSG_CHECKING([for SSL-C version])
     AC_CHECK_HEADERS([sslc.h], [ap_ssltk_type="sslc"], [ap_ssltk_type=""])
     if test "$ap_ssltk_type" = "sslc"; then
       ap_ssltk_libs="-lsslc"
@@ -443,7 +442,7 @@
       export PKG_CONFIG_PATH
     fi
     if test -n "$PKGCONFIG"; then
-      ap_ssltk_libs="`$PKGCONFIG --libs-only-l openssl`"
+      ap_ssltk_libs="`$PKGCONFIG --libs-only-l openssl 2>&1`"
       if test $? -eq 0; then
         pkglookup="`$PKGCONFIG --cflags-only-I openssl`"
         APR_ADDTO(CPPFLAGS, [$pkglookup])



Mime
View raw message