diff options
| author | Justin Erenkrantz <jerenkrantz@apache.org> | 2009-01-03 05:34:52 +0000 |
|---|---|---|
| committer | Justin Erenkrantz <jerenkrantz@apache.org> | 2009-01-03 05:34:52 +0000 |
| commit | 934553b954e85ccf00c7a21bc9539bbf68f3bc73 (patch) | |
| tree | 2e9fea749d5af543cabae0bfcded078aff6ed35b /acinclude.m4 | |
| parent | fb98aff06ac8e142c72097f8096bde741fbdc5fa (diff) | |
| download | httpd-934553b954e85ccf00c7a21bc9539bbf68f3bc73.tar.gz | |
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730914 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 59c791eeb5..2afe88960a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -382,11 +382,11 @@ if test "x$ap_ssltk_configured" = "x"; then 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 @@ if test "x$ap_ssltk_configured" = "x"; then [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 @@ if test "x$ap_ssltk_configured" = "x"; then 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 @@ if test "x$ap_ssltk_configured" = "x"; then 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]) |