All pastes #1466161 Raw Edit

Untitled

public diff v1 · immutable
#1466161 ·published 2009-06-19 10:51 UTC
rendered paste body
diff --git configure.ac configure.acindex f9d110e..dc9fd8b 100644--- configure.ac+++ configure.ac@@ -1131,7 +1131,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then 				nsprlibs="$DL_LIB -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 $MANUAL_NSPR_CFLAGS"@@ -1144,12 +1144,12 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then 		       			LDFLAGS="$LDFLAGS" 				fi 				-				AC_TRY_LINK_FUNC(PR_Init, moz_nspr_libs="yes", moz_nspr_libs="no")+				AC_TRY_LINK_FUNC(PR_Init, 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" 				MANUAL_NSPR_LIBS="-L$with_nspr_libs $nsprlibs" 			else@@ -1210,21 +1210,21 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then 		 		nsslibs="-lssl3 -lsmime3 -lnss3" 	 		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 $nsprlibs -L$with_nss_libs $nsslibs" 		      		LIBS="$nsslibs $nsprlibs"-				AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no")-				if test "$moz_nss_libs" = no; then+				AC_TRY_LINK_FUNC(NSS_Init, ac_cv_moz_nss_libs="yes", ac_cv_moz_nss_libs="no")+				if test "$ac_cv_moz_nss_libs" = no; then 					nsslibs="-lssl3 -lsmime3 -lnss3" 					LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"-					AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no")	+					AC_TRY_LINK_FUNC(NSS_Init, ac_cv_moz_nss_libs="yes", ac_cv_moz_nss_libs="no")	 				fi 				LDFLAGS="$LDFLAGS_save" 	 			LIBS="$LIBS_save" 			])-			if test "$moz_nss_libs" != no; then+			if test "$ac_cv_moz_nss_libs" != no; then 				AC_DEFINE(HAVE_NSS) 				AC_DEFINE(HAVE_SSL) 				AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"$with_nss_libs", [Define to the full path of mozilla nss library])