Mercurial > pidgin
comparison configure.ac @ 29792:8b452039c329
propagate from branch 'im.pidgin.pidgin' (head 53abc38e3dfd2e9f8ae8c3e6532379d4b0dc333b)
to branch 'im.pidgin.cpw.malu.ft_thumbnails' (head 4d135ac4918d2e985a66786a6c07473911498c4f)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sun, 12 Jul 2009 20:47:45 +0000 |
parents | a7d2bc001b6b |
children | 35cb9aa9eb2f |
comparison
equal
deleted
inserted
replaced
29791:8781cfb550bb | 29792:8b452039c329 |
---|---|
1729 AC_MSG_CHECKING(for gnutls_priority_set_direct) | 1729 AC_MSG_CHECKING(for gnutls_priority_set_direct) |
1730 LIBS_save="$LIBS" | 1730 LIBS_save="$LIBS" |
1731 LIBS="$LIBS $GNUTLS_LIBS" | 1731 LIBS="$LIBS $GNUTLS_LIBS" |
1732 CPPFLAGS_save="$CPPFLAGS" | 1732 CPPFLAGS_save="$CPPFLAGS" |
1733 CPPFLAGS="$CPPFLAGS $GNUTLS_CFLAGS" | 1733 CPPFLAGS="$CPPFLAGS $GNUTLS_CFLAGS" |
1734 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <gnutls/gnutls.h>], | 1734 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], |
1735 [gnutls_session s; gnutls_priority_set_direct(s, NULL, NULL);])], | 1735 [[gnutls_session s; gnutls_priority_set_direct(s, NULL, NULL);]])], |
1736 [AC_DEFINE([HAVE_GNUTLS_PRIORITY_FUNCS], 1, | 1736 [AC_DEFINE([HAVE_GNUTLS_PRIORITY_FUNCS], 1, |
1737 [Define if your gnutls has gnutls_priority_set_direct and friends]) | 1737 [Define if your gnutls has gnutls_priority_set_direct and friends]) |
1738 AC_MSG_RESULT(yes)], | 1738 AC_MSG_RESULT(yes)], |
1739 [AC_MSG_RESULT(no)]) | 1739 [AC_MSG_RESULT(no)]) |
1740 CPPFLAGS="$CPPFLAGS_save" | 1740 CPPFLAGS="$CPPFLAGS_save" |
2017 NSS_LIBS="$NSPR_LIBS $NSS_LIBS" | 2017 NSS_LIBS="$NSPR_LIBS $NSS_LIBS" |
2018 fi | 2018 fi |
2019 | 2019 |
2020 AC_SUBST(NSS_CFLAGS) | 2020 AC_SUBST(NSS_CFLAGS) |
2021 AC_SUBST(NSS_LIBS) | 2021 AC_SUBST(NSS_LIBS) |
2022 fi | |
2023 | |
2024 if test "x$enable_nss" = "xyes"; then | |
2025 AC_MSG_CHECKING(for NSS_SetAlgorithmPolicy) | |
2026 LIBS_save="$LIBS" | |
2027 LIBS="$LIBS $NSS_LIBS" | |
2028 CPPFLAGS_save="$CPPFLAGS" | |
2029 CPPFLAGS="$CPPFLAGS $NSS_CFLAGS" | |
2030 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <nss.h> | |
2031 #include <secmod.h>]], | |
2032 [[NSS_SetAlgorithmPolicy(SEC_OID_MD2, 0, 0);]])], | |
2033 [AC_DEFINE([NEED_NSS_WEAK_ALGORITHMS], 1, | |
2034 [Define if your NSS needs weak algorithms activated with NSS_SetAlgorithmPolicy]) | |
2035 AC_MSG_RESULT(yes)], | |
2036 [AC_MSG_RESULT(no)]) | |
2037 CPPFLAGS="$CPPFLAGS_save" | |
2038 LIBS="$LIBS_save" | |
2022 fi | 2039 fi |
2023 | 2040 |
2024 AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes") | 2041 AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes") |
2025 | 2042 |
2026 if test "x$msg_nss" != "x" -a "x$msg_gnutls" != "x"; then | 2043 if test "x$msg_nss" != "x" -a "x$msg_gnutls" != "x"; then |