28 lines
1014 B
Diff
28 lines
1014 B
Diff
|
diff --git i/old-configure.in w/old-configure.in
|
||
|
|
index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644
|
||
|
|
--- i/old-configure.in
|
||
|
|
+++ w/old-configure.in
|
||
|
|
@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
|
||
|
|
AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
|
||
|
|
fi
|
||
|
|
|
||
|
|
-if test -n "$MOZ_SYSTEM_NSS"; then
|
||
|
|
- NSS_LIBS="$NSS_LIBS -lcrmf"
|
||
|
|
-else
|
||
|
|
+if test -z "$MOZ_SYSTEM_NSS"; then
|
||
|
|
NSS_CFLAGS="-I${DIST}/include/nss"
|
||
|
|
case "${OS_ARCH}" in
|
||
|
|
# Only few platforms have been tested with GYP
|
||
|
|
diff --git a/config/external/nss/crmf/moz.build b/config/external/nss/crmf/moz.build
|
||
|
|
index 9b8005f..4bfcc81 100644
|
||
|
|
--- a/config/external/nss/crmf/moz.build
|
||
|
|
+++ b/config/external/nss/crmf/moz.build
|
||
|
|
@@ -8,7 +8,6 @@ Library('crmf')
|
||
|
|
|
||
|
|
if CONFIG['MOZ_NATIVE_NSS']:
|
||
|
|
OS_LIBS += [l for l in CONFIG['NSS_LIBS'] if l.startswith('-L')]
|
||
|
|
- OS_LIBS += ['-lcrmf']
|
||
|
|
else:
|
||
|
|
USE_LIBS += [
|
||
|
|
# The dependency on nss is not real, but is required to force the
|