im.pidgin.pidgin: 6ca0d176c7935aaf3fc44452a072f25e0673213c

[resiak at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 6ca0d176c7935aaf3fc44452a072f25e0673213c
Ancestor: e05eec5600476b95f0b6c2876bb92323027643f7
Author: resiak at soc.pidgin.im
Date: 2007-12-03T14:40:46
Branch: im.pidgin.pidgin

Modified files:
        configure.ac

ChangeLog: 

NSS is in the pkg-config package 'microb-engine-nss' on maemo, not 'nss' or
'mozilla-nss'.  (microb-engine-nss will only be tried if the other two names
are not found.)

-------------- next part --------------
============================================================
--- configure.ac	fc47f894d8f1c37c1cbdb0aea94274510438fb00
+++ configure.ac	e75f2424d58fbc520d93796f6059aa70d2d6e08c
@@ -1659,16 +1659,24 @@ if test "x$enable_nss" != "xno"; then
 			])
 			mozilla_nspr="mozilla-nspr"
 			mozilla_nss="mozilla-nss"
-		else
-			if `$PKG_CONFIG --exists nss`; then
-				PKG_CHECK_MODULES(NSS, nss, [
-					have_nss="yes"
-				], [
-					AC_MSG_RESULT(no)
-				])
-				mozilla_nspr="nspr"
-				mozilla_nss="nss"
-			fi
+		elif `$PKG_CONFIG --exists nss`; then
+			PKG_CHECK_MODULES(NSS, nss, [
+				have_nss="yes"
+			], [
+				AC_MSG_RESULT(no)
+				have_nss="no"
+			])
+			mozilla_nspr="nspr"
+			mozilla_nss="nss"
+		elif `$PKG_CONFIG --exists microb-engine-nss`; then
+			PKG_CHECK_MODULES(NSS, microb-engine-nss, [
+				have_nss="yes"
+			], [
+				AC_MSG_RESULT(no)
+				have_nss="no"
+			])
+			mozilla_nspr="mozilla-nspr"
+			mozilla_nss="microb-engine-nss"
 		fi
 
 		if test "x$have_nss" = "xyes"; then