Mercurial > pidgin.yaz

comparison configure.ac @ 7087:bbf7f4604140

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 7652] This should hopefully fix the problem where gaim tries to use NSS if GNUTLS fails, even if NSS also fails. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Tue, 30 Sep 2003 23:17:49 +0000
parents a0b1e888661e
children 6448e0163d7b
comparison
equal deleted inserted replaced
7086:0cacce490486 7087:bbf7f4604140
522 NSPR_CFLAGS="-I$with_nspr_includes" 522 NSPR_CFLAGS="-I$with_nspr_includes"
523 fi 523 fi
524 else 524 else
525 AC_MSG_CHECKING(for Mozilla nspr4 includes) 525 AC_MSG_CHECKING(for Mozilla nspr4 includes)
526 AC_MSG_RESULT(no) 526 AC_MSG_RESULT(no)
527
528 enable_nss="no"
527 fi 529 fi
528 530
529 have_nspr_libs="no" 531 have_nspr_libs="no"
530 532
531 if test "x$with_nspr_libs" != "xno" -a \ 533 if test "x$with_nspr_libs" != "xno" -a \
538 if test -z "$with_nspr_libs"; then 540 if test -z "$with_nspr_libs"; then
539 AC_MSG_ERROR( 541 AC_MSG_ERROR(
540 [Static linkage requested, but path to nspr libraries not set.] 542 [Static linkage requested, but path to nspr libraries not set.]
541 [Please specify the path to libnspr4.a] 543 [Please specify the path to libnspr4.a]
542 [Example: --with-nspr-libs=/usr/lib]) 544 [Example: --with-nspr-libs=/usr/lib])
545
546 enable_nss="no"
543 else 547 else
544 nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" 548 nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
545 fi 549 fi
546 else 550 else
547 nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" 551 nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
572 if test "x$moz_nspr_libs" != "xno"; then 576 if test "x$moz_nspr_libs" != "xno"; then
573 have_nspr_libs="yes" 577 have_nspr_libs="yes"
574 NSPR_LIBS="-L$with_nspr_libs $nsprlibs" 578 NSPR_LIBS="-L$with_nspr_libs $nsprlibs"
575 else 579 else
576 NSPR_CFLAGS="" 580 NSPR_CFLAGS=""
581 enable_nss="no"
577 fi 582 fi
578 else 583 else
579 AC_MSG_CHECKING(for Mozilla nspr4 libraries) 584 AC_MSG_CHECKING(for Mozilla nspr4 libraries)
580 AC_MSG_RESULT(no) 585 AC_MSG_RESULT(no)
581 fi 586 fi
610 NSPR_LIBS="" 615 NSPR_LIBS=""
611 fi 616 fi
612 else 617 else
613 AC_MSG_CHECKING(for Mozilla nss3 includes) 618 AC_MSG_CHECKING(for Mozilla nss3 includes)
614 AC_MSG_RESULT(no) 619 AC_MSG_RESULT(no)
620 enable_nss="no"
615 fi 621 fi
616 622
617 if test "x$with_nss_libs" != "xno" -a \ 623 if test "x$with_nss_libs" != "xno" -a \
618 "x$have_nss_includes" != "xno"; then 624 "x$have_nss_includes" != "xno"; then
619 625
623 if test -z "$with_nss_libs"; then 629 if test -z "$with_nss_libs"; then
624 AC_MSG_ERROR( 630 AC_MSG_ERROR(
625 [Static linkage requested, but path to nss libraries not set.] 631 [Static linkage requested, but path to nss libraries not set.]
626 [Please specify the path to libnss3.a] 632 [Please specify the path to libnss3.a]
627 [Example: --with-nspr-libs=/usr/lib/mozilla]) 633 [Example: --with-nspr-libs=/usr/lib/mozilla])
634 enable_nss="no"
628 else 635 else
629 nsslibs="-ldb1 $with_nss_libs/libnssckfw.a $with_nss_libs/libasn1.a $with_nss_libs/libcrmf.a $with_nss_libs/libswfci.a $with_nss_libs/libjar.a $with_nss_libs/libpkcs12.a $with_nss_libs/libpkcs7.a $with_nss_libs/libpki1.a $with_nss_libs/libsmime.a $with_nss_libs/libssl.a $with_nss_libs/libnss.a $with_nss_libs/libpk11wrap.a $with_nss_libs/libsoftokn.a $with_nss_libs/libfreebl.a $with_nss_libs/libnsspki.a $with_nss_libs/libnssdev.a $with_nss_libs/libcryptohi.a $with_nss_libs/libcerthi.a $with_nss_libs/libcertdb.a $with_nss_libs/libsecutil.a $with_nss_libs/libnssb.a" 636 nsslibs="-ldb1 $with_nss_libs/libnssckfw.a $with_nss_libs/libasn1.a $with_nss_libs/libcrmf.a $with_nss_libs/libswfci.a $with_nss_libs/libjar.a $with_nss_libs/libpkcs12.a $with_nss_libs/libpkcs7.a $with_nss_libs/libpki1.a $with_nss_libs/libsmime.a $with_nss_libs/libssl.a $with_nss_libs/libnss.a $with_nss_libs/libpk11wrap.a $with_nss_libs/libsoftokn.a $with_nss_libs/libfreebl.a $with_nss_libs/libnsspki.a $with_nss_libs/libnssdev.a $with_nss_libs/libcryptohi.a $with_nss_libs/libcerthi.a $with_nss_libs/libcertdb.a $with_nss_libs/libsecutil.a $with_nss_libs/libnssb.a"
630 637
631 case "$host" in 638 case "$host" in
632 *solaris*) 639 *solaris*)
675 enable_nss="yes" 682 enable_nss="yes"
676 else 683 else
677 NSS_CFLAGS="" 684 NSS_CFLAGS=""
678 NSPR_CFLAGS="" 685 NSPR_CFLAGS=""
679 NSPR_LIBS="" 686 NSPR_LIBS=""
687 enable_nss="no"
680 fi 688 fi
681 else 689 else
682 AC_MSG_CHECKING(for Mozilla nss libraries) 690 AC_MSG_CHECKING(for Mozilla nss libraries)
683 AC_MSG_RESULT(no) 691 AC_MSG_RESULT(no)
684 fi 692 fi