Mercurial > pidgin

comparison configure.ac @ 7155:6448e0163d7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 7722] Now we support building with both GNUTLS and NSS at the same time. Yay! committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Sun, 05 Oct 2003 05:03:38 +0000
parents bbf7f4604140
children 282887c9e3dc
comparison
equal deleted inserted replaced
7154:19cc14ea7599 7155:6448e0163d7b
426 ]) 426 ])
427 427
428 if test "x$gnutls_libs" != "xno"; then 428 if test "x$gnutls_libs" != "xno"; then
429 AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have GNUTLS]) 429 AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have GNUTLS])
430 AC_DEFINE(HAVE_SSL) 430 AC_DEFINE(HAVE_SSL)
431 msg_ssl="GNUTLS" 431 msg_gnutls="GNUTLS"
432 GNUTLS_LIBS="$with_gnutls_libs -lgnutls -lgcrypt" 432 GNUTLS_LIBS="$with_gnutls_libs -lgnutls -lgcrypt"
433 433
434 enable_gnutls="yes" 434 enable_gnutls="yes"
435 else 435 else
436 GNUTLS_CFLAGS="" 436 GNUTLS_CFLAGS=""
452 452
453 453
454 dnl # 454 dnl #
455 dnl # Check for NSS if it's specified, or if GNUTLS checks failed. 455 dnl # Check for NSS if it's specified, or if GNUTLS checks failed.
456 dnl # 456 dnl #
457 if test "x$enable_nss" != "xno" -a "x$enable_gnutls" = "xno"; then 457 if test "x$enable_nss" != "xno"; then
458 458
459 AC_ARG_WITH(nspr-includes, 459 AC_ARG_WITH(nspr-includes,
460 [ --with-nspr-includes=PREFIX Specify location of Mozilla nspr4 includes.], 460 [ --with-nspr-includes=PREFIX Specify location of Mozilla nspr4 includes.],
461 [with_nspr_includes="$withval"]) 461 [with_nspr_includes="$withval"])
462 462
492 mozilla_nss="mozilla-nss" 492 mozilla_nss="mozilla-nss"
493 493
494 AC_DEFINE(HAVE_NSS, 1, [Define if you have Mozilla NSS]) 494 AC_DEFINE(HAVE_NSS, 1, [Define if you have Mozilla NSS])
495 AC_DEFINE(HAVE_SSL, 1, [Define if you have SSL]) 495 AC_DEFINE(HAVE_SSL, 1, [Define if you have SSL])
496 496
497 msg_ssl="Mozilla NSS" 497 msg_nss="Mozilla NSS"
498 enable_nss="yes" 498 enable_nss="yes"
499 else 499 else
500 nss_manual_check="yes" 500 nss_manual_check="yes"
501 fi 501 fi
502 fi 502 fi
672 AC_DEFINE(HAVE_SSL) 672 AC_DEFINE(HAVE_SSL)
673 673
674 NSS_LIBS="-L$with_nss_libs $nsslibs" 674 NSS_LIBS="-L$with_nss_libs $nsslibs"
675 675
676 if test "$enable_nss" = "static"; then 676 if test "$enable_nss" = "static"; then
677 msg_ssl="Mozilla NSS (static)" 677 msg_nss="Mozilla NSS (static)"
678 else 678 else
679 msg_ssl="Mozilla NSS" 679 msg_nss="Mozilla NSS"
680 fi 680 fi
681 681
682 enable_nss="yes" 682 enable_nss="yes"
683 else 683 else
684 NSS_CFLAGS="" 684 NSS_CFLAGS=""
698 AC_SUBST(NSS_CFLAGS) 698 AC_SUBST(NSS_CFLAGS)
699 AC_SUBST(NSS_LIBS) 699 AC_SUBST(NSS_LIBS)
700 fi 700 fi
701 701
702 AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes") 702 AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")
703
704 if test "x$msg_nss" != "x" -a "x$msg_gnutls" != "x"; then
705 msg_ssl="$msg_nss and $msg_gnutls"
706 elif test "x$msg_nss" != "x"; then
707 msg_ssl=$msg_nss
708 elif test "x$msg_gnutls" != "x"; then
709 msg_ssl=$msg_gnutls
710 fi
703 711
704 dnl Check for Tcl 712 dnl Check for Tcl
705 if test "$enable_tcl" = yes; then 713 if test "$enable_tcl" = yes; then
706 AC_MSG_CHECKING([for tclConfig.sh]) 714 AC_MSG_CHECKING([for tclConfig.sh])
707 TCLCONFIG=no 715 TCLCONFIG=no
962 echo Allow Multiple Connections.... : $enable_multi 970 echo Allow Multiple Connections.... : $enable_multi
963 echo Build Protocol Plugins........ : $enable_prpls 971 echo Build Protocol Plugins........ : $enable_prpls
964 echo Protocols to link statically.. : $STATIC_PRPLS 972 echo Protocols to link statically.. : $STATIC_PRPLS
965 echo 973 echo
966 echo UI Library.................... : GTK 2.x 974 echo UI Library.................... : GTK 2.x
967 echo SSL Library................... : $msg_ssl 975 echo SSL Library/Libraries......... : $msg_ssl
968 echo 976 echo
969 echo Build with Plugin support..... : $enable_plugins 977 echo Build with Plugin support..... : $enable_plugins
970 echo Build with Perl support....... : $enable_perl 978 echo Build with Perl support....... : $enable_perl
971 echo Build with Tcl support........ : $enable_tcl 979 echo Build with Tcl support........ : $enable_tcl
972 echo Build with Tk support......... : $enable_tk 980 echo Build with Tk support......... : $enable_tk