Mercurial > pidgin.yaz
changeset 12507:5bf6c0c908b2
[gaim-migrate @ 14819]
Some distributions *cough* fedora *cough* are starting to package NSS
completely separately from Mozilla, so this is necessary to pick up the
new pkg-config file
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Fri, 16 Dec 2005 21:41:46 +0000 |
| parents | 8e60dc361a66 |
| children | 5cfc53ead482 |
| files | configure.ac |
| diffstat | 1 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Fri Dec 16 19:50:11 2005 +0000 +++ b/configure.ac Fri Dec 16 21:41:46 2005 +0000 @@ -1007,11 +1007,19 @@ enable_nss="no" if test "x$nss_manual_check" = "xno"; then - PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes", have_nss="no") + if `$PKG_CONFIG --exists mozilla-nss`; then + PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes", have_nss="no") + mozilla_nspr="mozilla-nspr" + mozilla_nss="mozilla-nss" + else + if `$PKG_CONFIG --exists nss`; then + PKG_CHECK_MODULES(NSS, nss, have_nss="yes") + mozilla_nspr="nspr" + mozilla_nss="nss" + fi + fi if test "x$have_nss" = "xyes"; then - mozilla_nspr="mozilla-nspr" - mozilla_nss="mozilla-nss" AC_DEFINE(HAVE_NSS, 1, [Define if you have Mozilla NSS]) AC_DEFINE(HAVE_SSL, 1, [Define if you have SSL])