Mercurial > pidgin
changeset 23191:20654db25ff8
A patch from compnerd (Saleem Abdulrasool) to properly name the variables
we use with AC_CACHE_CHECK when checking for GnuTLS and NSS. These
variables MUST include _cv_ in their name. (See the Cache Variable Names
section in the autoconf info pages.)
Fixes #5645
committer: Richard Laager <rlaager@wiktel.com>
| author | Saleem Abdulrasool <compnerd@compnerd.org> |
|---|---|
| date | Mon, 26 May 2008 06:37:52 +0000 |
| parents | ead0e6aa9c46 |
| children | 00350a318b30 |
| files | configure.ac |
| diffstat | 1 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Mon May 26 06:31:12 2008 +0000 +++ b/configure.ac Mon May 26 06:37:52 2008 +0000 @@ -1622,14 +1622,14 @@ *) with_gnutls_libs="-L$with_gnutls_libs" ;; esac - AC_CACHE_CHECK([for GnuTLS libraries], gnutls_libs, + AC_CACHE_CHECK([for GnuTLS libraries], ac_cv_gnutls_libs, [ LIBS="$LIBS $with_gnutls_libs -lgnutls -lgcrypt" - AC_TRY_LINK_FUNC(gnutls_init, gnutls_libs="yes", gnutls_libs="no") + AC_TRY_LINK_FUNC(gnutls_init, ac_cv_gnutls_libs="yes", ac_cv_gnutls_libs="no") LIBS="$LIBS_save" ]) - if test "x$gnutls_libs" != "xno"; then + if test "x$ac_cv_gnutls_libs" != "xno"; then AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have GnuTLS]) AC_DEFINE(HAVE_SSL) msg_gnutls="GnuTLS" @@ -1782,7 +1782,7 @@ nsprlibs="$LIBDL -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" fi - AC_CACHE_CHECK([for Mozilla nspr libraries], moz_nspr_libs, + AC_CACHE_CHECK([for Mozilla nspr libraries], ac_cv_moz_nspr_libs, [ LIBS_save=$LIBS CFLAGS="$CFLAGS $NSPR_CFLAGS" @@ -1796,15 +1796,15 @@ fi AC_TRY_LINK_FUNC(PR_Init, - [moz_nspr_libs="yes"], - [moz_nspr_libs="no"]) + [ac_cv_moz_nspr_libs="yes"], + [ac_cv_moz_nspr_libs="no"]) CFLAGS=$CFLAGS_save LDFLAGS=$LDFLAGS_save LIBS=$LIBS_save ]) - if test "x$moz_nspr_libs" != "xno"; then + if test "x$ac_cv_moz_nspr_libs" != "xno"; then have_nspr_libs="yes" NSPR_LIBS="-L$with_nspr_libs $nsprlibs" else @@ -1877,30 +1877,30 @@ nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3" fi - AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs, + AC_CACHE_CHECK([for Mozilla nss libraries], ac_cv_moz_nss_libs, [ LIBS_save=$LIBS LDFLAGS="$LDFLAGS -L$with_nspr_libs -L$with_nss_libs" LIBS="$nsslibs $nsprlibs" AC_TRY_LINK_FUNC(NSS_Init, - [moz_nss_libs="yes"], - [moz_nss_libs="no"]) + [ac_cv_moz_nss_libs="yes"], + [ac_cv_moz_nss_libs="no"]) - if test "x$moz_nss_libs" = "xno"; then + if test "x$ac_cv_moz_nss_libs" = "xno"; then nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3" LDFLAGS="$LDFLAGS -L$with_nspr_libs -L$with_nss_libs" LIBS="$LIBS $nsslibs" AC_TRY_LINK_FUNC(NSS_Init, - [moz_nss_libs="yes"], - [moz_nss_libs="no"]) + [ac_cv_moz_nss_libs="yes"], + [ac_cv_moz_nss_libs="no"]) fi LDFLAGS=$LDFLAGS_save LIBS=$LIBS_save ]) - if test "x$moz_nss_libs" != "xno"; then + if test "x$ac_cv_moz_nss_libs" != "xno"; then AC_DEFINE(HAVE_NSS) AC_DEFINE(HAVE_SSL)