From: Christian H. <ch...@us...> - 2003-09-30 23:17:53
|
Update of /cvsroot/gaim/gaim In directory sc8-pr-cvs1:/tmp/cvs-serv25477 Modified Files: configure.ac Log Message: This should hopefully fix the problem where gaim tries to use NSS if GNUTLS fails, even if NSS also fails. Index: configure.ac =================================================================== RCS file: /cvsroot/gaim/gaim/configure.ac,v retrieving revision 1.188 retrieving revision 1.189 diff -u -d -p -r1.188 -r1.189 --- configure.ac 29 Sep 2003 16:23:24 -0000 1.188 +++ configure.ac 30 Sep 2003 23:17:49 -0000 1.189 @@ -524,6 +524,8 @@ if test "x$enable_nss" != "xno" -a "x$en else AC_MSG_CHECKING(for Mozilla nspr4 includes) AC_MSG_RESULT(no) + + enable_nss="no" fi have_nspr_libs="no" @@ -540,6 +542,8 @@ if test "x$enable_nss" != "xno" -a "x$en [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 @@ if test "x$enable_nss" != "xno" -a "x$en 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 @@ if test "x$enable_nss" != "xno" -a "x$en 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 @@ if test "x$enable_nss" != "xno" -a "x$en [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 @@ if test "x$enable_nss" != "xno" -a "x$en NSS_CFLAGS="" NSPR_CFLAGS="" NSPR_LIBS="" + enable_nss="no" fi else AC_MSG_CHECKING(for Mozilla nss libraries) |