Mercurial > pidgin
diff configure.ac @ 7087:bbf7f4604140
[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 |
line wrap: on
line diff
--- a/configure.ac Tue Sep 30 23:10:26 2003 +0000 +++ b/configure.ac Tue Sep 30 23:17:49 2003 +0000 @@ -524,6 +524,8 @@ else AC_MSG_CHECKING(for Mozilla nspr4 includes) AC_MSG_RESULT(no) + + enable_nss="no" fi have_nspr_libs="no" @@ -540,6 +542,8 @@ [Static linkage requested, but path to nspr libraries not set.] [Please specify the path to libnspr4.a] [Example: --with-nspr-libs=/usr/lib]) + + enable_nss="no" else nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" fi @@ -574,6 +578,7 @@ NSPR_LIBS="-L$with_nspr_libs $nsprlibs" else NSPR_CFLAGS="" + enable_nss="no" fi else AC_MSG_CHECKING(for Mozilla nspr4 libraries) @@ -612,6 +617,7 @@ else AC_MSG_CHECKING(for Mozilla nss3 includes) AC_MSG_RESULT(no) + enable_nss="no" fi if test "x$with_nss_libs" != "xno" -a \ @@ -625,6 +631,7 @@ [Static linkage requested, but path to nss libraries not set.] [Please specify the path to libnss3.a] [Example: --with-nspr-libs=/usr/lib/mozilla]) + enable_nss="no" else 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" @@ -677,6 +684,7 @@ NSS_CFLAGS="" NSPR_CFLAGS="" NSPR_LIBS="" + enable_nss="no" fi else AC_MSG_CHECKING(for Mozilla nss libraries)