summaryrefslogtreecommitdiffstats
path: root/m4/nss.m4
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2006-10-19 16:53:05 +0000
committerRich Megginson <rmeggins@redhat.com>2006-10-19 16:53:05 +0000
commita326dc36c37e93343980d0a4843951a702106849 (patch)
tree6a7415c286f65687b216b2329b41eaa9e230a317 /m4/nss.m4
parentb1f7e682b66787c658103f8b9dfb7e4a54859097 (diff)
downloadds-a326dc36c37e93343980d0a4843951a702106849.tar.gz
ds-a326dc36c37e93343980d0a4843951a702106849.tar.xz
ds-a326dc36c37e93343980d0a4843951a702106849.zip
Bug(s) fixed: 211426
Bug Description: autotools: support dirsec packages, mozldap6, svrcore Reviewed by: nkinder (Thanks!) Fix Description: Look for the dirsec-nspr and dirsec-nss if nspr and nss are not found in pkg-config. Look for mozldap6 then mozldap in pkg-config. Look for svrcore-devel in pkg-config, then look for it in the system directories. Nathan pointed out that we do not support mozldap v5.x anymore, so we should just look for mozldap6 with pkg-config. I also added an explicit check of the vendor version in the header file to make sure we are using 600 or greater. Platforms tested: RHEL4 Flag Day: no Doc impact: no
Diffstat (limited to 'm4/nss.m4')
-rw-r--r--m4/nss.m44
1 files changed, 4 insertions, 0 deletions
diff --git a/m4/nss.m4 b/m4/nss.m4
index 82712772..a1bf803d 100644
--- a/m4/nss.m4
+++ b/m4/nss.m4
@@ -78,6 +78,10 @@ if test -z "$nss_inc" -o -z "$nss_lib"; then
nss_inc=`$PKG_CONFIG --cflags-only-I nss`
nss_lib=`$PKG_CONFIG --libs-only-L nss`
AC_MSG_RESULT([using system NSS])
+ elif $PKG_CONFIG --exists dirsec-nss; then
+ nss_inc=`$PKG_CONFIG --cflags-only-I dirsec-nss`
+ nss_lib=`$PKG_CONFIG --libs-only-L dirsec-nss`
+ AC_MSG_RESULT([using system dirsec NSS])
else
AC_MSG_ERROR([NSS not found, specify with --with-nss.])
fi