Mercurial > pidgin.yaz
comparison configure.ac @ 6738:6c95f01aaf49
[gaim-migrate @ 7270]
Added optional GNUTLS support, which will also be used as a fallback if
Mozilla NSS is not installed.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Thu, 04 Sep 2003 06:19:25 +0000 |
parents | bf77a7db61c2 |
children | cdb4acfe777f |
comparison
equal
deleted
inserted
replaced
6737:05098da416bb | 6738:6c95f01aaf49 |
---|---|
386 nss_manual_check="yes" | 386 nss_manual_check="yes" |
387 else | 387 else |
388 nss_manual_check="no" | 388 nss_manual_check="no" |
389 fi | 389 fi |
390 | 390 |
391 enable_nss="no" | |
392 | |
391 if test "x$nss_manual_check" = "xno"; then | 393 if test "x$nss_manual_check" = "xno"; then |
392 PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes", []) | 394 PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes", []) |
393 | 395 |
394 if test "x$have_nss" = "xyes"; then | 396 if test "x$have_nss" = "xyes"; then |
395 mozilla_nspr="mozilla-nspr" | 397 mozilla_nspr="mozilla-nspr" |
397 | 399 |
398 AC_DEFINE(HAVE_NSS, 1, [Define if you have Mozilla NSS]) | 400 AC_DEFINE(HAVE_NSS, 1, [Define if you have Mozilla NSS]) |
399 AC_DEFINE(HAVE_SSL, 1, [Define if you have SSL]) | 401 AC_DEFINE(HAVE_SSL, 1, [Define if you have SSL]) |
400 | 402 |
401 msg_ssl="yes (Mozilla NSS)" | 403 msg_ssl="yes (Mozilla NSS)" |
404 enable_nss="yes" | |
402 else | 405 else |
403 nss_manual_check="yes" | 406 nss_manual_check="yes" |
404 fi | 407 fi |
405 fi | 408 fi |
406 | 409 |
570 if test "$enable_nss" = "static"; then | 573 if test "$enable_nss" = "static"; then |
571 msg_ssl="yes (Mozilla NSS, static)" | 574 msg_ssl="yes (Mozilla NSS, static)" |
572 else | 575 else |
573 msg_ssl="yes (Mozilla NSS)" | 576 msg_ssl="yes (Mozilla NSS)" |
574 fi | 577 fi |
578 | |
579 enable_nss="yes" | |
575 else | 580 else |
576 NSS_CFLAGS="" | 581 NSS_CFLAGS="" |
577 NSPR_CFLAGS="" | 582 NSPR_CFLAGS="" |
578 NSPR_LIBS="" | 583 NSPR_LIBS="" |
579 fi | 584 fi |
588 | 593 |
589 AC_SUBST(NSS_CFLAGS) | 594 AC_SUBST(NSS_CFLAGS) |
590 AC_SUBST(NSS_LIBS) | 595 AC_SUBST(NSS_LIBS) |
591 fi | 596 fi |
592 | 597 |
598 AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes") | |
599 | |
593 dnl # | 600 dnl # |
594 dnl # Check for GNUTLS if it's specified or if NSS failed. | 601 dnl # Check for GNUTLS if it's specified or if NSS failed. |
595 dnl # | 602 dnl # |
596 if test "x$msg_ssl" = "xno" -o "x$enable_gnutls" != "xno"; then | 603 if test "x$msg_ssl" = "xno" -o "x$enable_gnutls" != "xno"; then |
604 | |
605 enable_gnutls="no" | |
597 prefix=`eval echo $prefix` | 606 prefix=`eval echo $prefix` |
607 | |
598 AC_ARG_WITH(gnutls-includes, | 608 AC_ARG_WITH(gnutls-includes, |
599 [ --with-gnutls-includes=PREFIX Location of GNUTLS includes.], | 609 [ --with-gnutls-includes=PREFIX Location of GNUTLS includes.], |
600 [ with_gnutls_includes="$withval" ], | 610 [ with_gnutls_includes="$withval" ], |
601 [ with_gnutls_includes="$prefix/include" ]) | 611 [ with_gnutls_includes="$prefix/include" ]) |
602 | 612 |
649 if test "x$gnutls_libs" != "xno"; then | 659 if test "x$gnutls_libs" != "xno"; then |
650 AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have GNUTLS]) | 660 AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have GNUTLS]) |
651 AC_DEFINE(HAVE_SSL) | 661 AC_DEFINE(HAVE_SSL) |
652 msg_ssl="yes (GNUTLS)" | 662 msg_ssl="yes (GNUTLS)" |
653 GNUTLS_LIBS="$with_gnutls_libs -lgnutls -lgcrypt" | 663 GNUTLS_LIBS="$with_gnutls_libs -lgnutls -lgcrypt" |
664 | |
665 enable_gnutls="yes" | |
654 else | 666 else |
655 GNUTLS_CFLAGS="" | 667 GNUTLS_CFLAGS="" |
656 GNUTLS_LIBS="" | 668 GNUTLS_LIBS="" |
657 fi | 669 fi |
658 else | 670 else |
664 GNUTLS_LIBS="" | 676 GNUTLS_LIBS="" |
665 fi | 677 fi |
666 | 678 |
667 AC_SUBST(GNUTLS_CFLAGS) | 679 AC_SUBST(GNUTLS_CFLAGS) |
668 AC_SUBST(GNUTLS_LIBS) | 680 AC_SUBST(GNUTLS_LIBS) |
681 | |
682 AM_CONDITIONAL(USE_GNUTLS, test "x$enable_gnutls" = "xyes") | |
669 | 683 |
670 dnl Check for Tcl | 684 dnl Check for Tcl |
671 if test "$enable_tcl" = yes; then | 685 if test "$enable_tcl" = yes; then |
672 AC_MSG_CHECKING([for tclConfig.sh]) | 686 AC_MSG_CHECKING([for tclConfig.sh]) |
673 TCLCONFIG=no | 687 TCLCONFIG=no |