diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2012-10-22 20:54:19 +0000 |
---|---|---|
committer | Vincent Torri <vincent.torri@gmail.com> | 2012-10-22 20:54:19 +0000 |
commit | e3c997843c23a7b2b7c27e69462251981aaaeff2 (patch) | |
tree | c293dc5f712cb21e120dcc9953abe24cc42f662c | |
parent | 850af91e7ceb5620c6d2edca2699e2a0100aa7a8 (diff) |
merge: more cosmetic changes
SVN revision: 78342
-rw-r--r-- | configure.ac | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 3ae42a46de..5e22fa4aa5 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -544,11 +544,11 @@ AC_ARG_WITH([crypto], | |||
544 | [build_crypto=${withval}], | 544 | [build_crypto=${withval}], |
545 | [build_crypto=openssl]) | 545 | [build_crypto=openssl]) |
546 | 546 | ||
547 | case "$build_crypto" in | 547 | case "${build_crypto}" in |
548 | openssl|gnutls|none) | 548 | openssl|gnutls|none) |
549 | ;; | 549 | ;; |
550 | *) | 550 | *) |
551 | AC_MSG_ERROR([Unknown build crypto --with-crypto=${build_crypto}]) | 551 | AC_MSG_ERROR([Unknown build crypto option: --with-crypto=${build_crypto}]) |
552 | ;; | 552 | ;; |
553 | esac | 553 | esac |
554 | 554 | ||
@@ -594,9 +594,8 @@ case "$build_crypto" in | |||
594 | CFLAGS="${GNUTLS_CFLAGS}" | 594 | CFLAGS="${GNUTLS_CFLAGS}" |
595 | LIBS="${GNUTLS_LIBS}" | 595 | LIBS="${GNUTLS_LIBS}" |
596 | AC_CHECK_LIB([gnutls], [gnutls_x509_crt_verify_hash], | 596 | AC_CHECK_LIB([gnutls], [gnutls_x509_crt_verify_hash], |
597 | [ | 597 | [AC_DEFINE([EET_USE_NEW_GNUTLS_API], [1], [use gnutls_x509_crt_verify_hash])], |
598 | AC_DEFINE([EET_USE_NEW_GNUTLS_API], [1], [use gnutls_x509_crt_verify_hash]) | 598 | [AC_MSG_NOTICE([Optional gnutls_x509_crt_verify_hash not present.])]) |
599 | ], [AC_MSG_NOTICE([Optional gnutls_x509_crt_verify_hash not present.])]) | ||
600 | CFLAGS="${CFLAGS_save}" | 599 | CFLAGS="${CFLAGS_save}" |
601 | LIBS="${LIBS_save}" | 600 | LIBS="${LIBS_save}" |
602 | 601 | ||
@@ -606,9 +605,8 @@ case "$build_crypto" in | |||
606 | CFLAGS="${GNUTLS_CFLAGS}" | 605 | CFLAGS="${GNUTLS_CFLAGS}" |
607 | LIBS="${GNUTLS_LIBS}" | 606 | LIBS="${GNUTLS_LIBS}" |
608 | AC_CHECK_LIB([gnutls], [gnutls_privkey_sign_data], | 607 | AC_CHECK_LIB([gnutls], [gnutls_privkey_sign_data], |
609 | [ | 608 | [AC_DEFINE([EET_USE_NEW_PRIVKEY_SIGN_DATA], [1], [use gnutls_privkey_sign_data])], |
610 | AC_DEFINE([EET_USE_NEW_PRIVKEY_SIGN_DATA], [1], [use gnutls_privkey_sign_data]) | 609 | [AC_MSG_NOTICE([Optional gnutls_privkey_sign_data not present.])]) |
611 | ], [AC_MSG_NOTICE([Optional gnutls_privkey_sign_data not present.])]) | ||
612 | CFLAGS="${CFLAGS_save}" | 610 | CFLAGS="${CFLAGS_save}" |
613 | LIBS="${LIBS_save}" | 611 | LIBS="${LIBS_save}" |
614 | 612 | ||
@@ -618,9 +616,7 @@ case "$build_crypto" in | |||
618 | CFLAGS="${GNUTLS_CFLAGS}" | 616 | CFLAGS="${GNUTLS_CFLAGS}" |
619 | LIBS="${GNUTLS_LIBS}" | 617 | LIBS="${GNUTLS_LIBS}" |
620 | AC_CHECK_LIB([gnutls], [gnutls_pubkey_verify_hash], | 618 | AC_CHECK_LIB([gnutls], [gnutls_pubkey_verify_hash], |
621 | [ | 619 | [AC_DEFINE([EET_USE_NEW_PUBKEY_VERIFY_HASH], [1], [use gnutls_pubkey_verify_hash])]) |
622 | AC_DEFINE([EET_USE_NEW_PUBKEY_VERIFY_HASH], [1], [use gnutls_pubkey_verify_hash]) | ||
623 | ]) | ||
624 | CFLAGS="${CFLAGS_save}" | 620 | CFLAGS="${CFLAGS_save}" |
625 | LIBS="${LIBS_save}" | 621 | LIBS="${LIBS_save}" |
626 | ;; | 622 | ;; |