httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Philip M. Gollucci" <pgollu...@p6m7g8.com>
Subject Re: svn commit: r730914 - /httpd/httpd/trunk/acinclude.m4
Date Sat, 03 Jan 2009 05:35:37 GMT
test reply

jerenkrantz@apache.org wrote:
> 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])
> 


-- 
------------------------------------------------------------------------
1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70  3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354
Consultant          - P6M7G8 Inc.                http://p6m7g8.net
Director IT         - RideCharge, Inc.           http://ridecharge.com
Contractor          - PositiveEnergyUSA          http://positiveenergyusa.com
ASF Member          - Apache Software Foundation http://apache.org
FreeBSD Committer   - FreeBSD Foundation         http://freebsd.org

Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.

Mime
View raw message