Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From c1c980a95d85bcaf8802524d6148783522b300d7 Mon Sep 17 00:00:00 2001 |
Richard Marian Thomaiyar | 14fddef | 2018-07-13 23:55:56 +0530 | [diff] [blame] | 2 | From: Yulong Pei <Yulong.pei@windriver.com> |
| 3 | Date: Wed, 21 Jul 2010 22:33:43 +0800 |
| 4 | Subject: [PATCH] change finding path of nss and nspr |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> |
| 9 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 10 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
Richard Marian Thomaiyar | 14fddef | 2018-07-13 23:55:56 +0530 | [diff] [blame] | 11 | --- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 12 | configure.ac | 20 ++++++++++---------- |
| 13 | 1 file changed, 10 insertions(+), 10 deletions(-) |
Richard Marian Thomaiyar | 14fddef | 2018-07-13 23:55:56 +0530 | [diff] [blame] | 14 | |
| 15 | diff --git a/configure.ac b/configure.ac |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 16 | index 951b3eb..1fdeb0f 100644 |
Richard Marian Thomaiyar | 14fddef | 2018-07-13 23:55:56 +0530 | [diff] [blame] | 17 | --- a/configure.ac |
| 18 | +++ b/configure.ac |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 19 | @@ -866,10 +866,10 @@ MOZILLA_MIN_VERSION="1.4" |
| 20 | NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss" |
| 21 | NSPR_PACKAGE=mozilla-nspr |
| 22 | NSS_PACKAGE=mozilla-nss |
| 23 | -NSPR_INCLUDE_MARKER="nspr/nspr.h" |
| 24 | +NSPR_INCLUDE_MARKER="nspr.h" |
| 25 | NSPR_LIB_MARKER="libnspr4$shrext" |
| 26 | NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" |
| 27 | -NSS_INCLUDE_MARKER="nss/nss.h" |
| 28 | +NSS_INCLUDE_MARKER="nss3/nss.h" |
| 29 | NSS_LIB_MARKER="libnss3$shrext" |
| 30 | NSS_LIBS_LIST="-lnss3 -lsmime3" |
Richard Marian Thomaiyar | 14fddef | 2018-07-13 23:55:56 +0530 | [diff] [blame] | 31 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 32 | @@ -898,24 +898,24 @@ fi |
| 33 | dnl Priority 1: User specifies the path to installation |
| 34 | if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then |
| 35 | AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder) |
| 36 | - if test -f "$with_nspr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/lib/$NSPR_LIB_MARKER" ; then |
| 37 | - NSPR_INCLUDE_PATH="$with_nspr/include" |
| 38 | - NSPR_LIB_PATH="$with_nspr/lib" |
| 39 | + if test -f "$with_nspr/usr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/${libdir}/$NSPR_LIB_MARKER" ; then |
| 40 | + NSPR_INCLUDE_PATH="$with_nspr/usr/include" |
| 41 | + NSPR_LIB_PATH="$with_nspr/${libdir}" |
| 42 | NSPR_FOUND="yes" |
| 43 | AC_MSG_RESULT([yes]) |
Richard Marian Thomaiyar | 14fddef | 2018-07-13 23:55:56 +0530 | [diff] [blame] | 44 | else |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 45 | - AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER" files don't exist), typo?]) |
| 46 | + AC_MSG_ERROR([not found: "$with_nspr/usr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/${libdir}/$NSPR_LIB_MARKER" files don't exist), typo?]) |
| 47 | fi |
| 48 | fi |
| 49 | if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then |
| 50 | AC_MSG_CHECKING(for nss library installation in "$with_nss" folder) |
| 51 | - if test -f "$with_nss/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/lib/$NSS_LIB_MARKER" ; then |
| 52 | - NSS_INCLUDE_PATH="$with_nss/include" |
| 53 | - NSS_LIB_PATH="$with_nss/lib" |
| 54 | + if test -f "$with_nss/usr/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/${libdir}/$NSS_LIB_MARKER" ; then |
| 55 | + NSS_INCLUDE_PATH="$with_nss/usr/include/nss3" |
| 56 | + NSS_LIB_PATH="$with_nss/${libdir}" |
| 57 | NSS_FOUND="yes" |
| 58 | AC_MSG_RESULT([yes]) |
| 59 | else |
| 60 | - AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER" files don't exist), typo?]) |
| 61 | + AC_MSG_ERROR([not found: "$with_nss/usr/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/${libdir}/$NSS_LIB_MARKER" files don't exist), typo?]) |
| 62 | fi |
| 63 | fi |
Richard Marian Thomaiyar | 14fddef | 2018-07-13 23:55:56 +0530 | [diff] [blame] | 64 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 65 | -- |
| 66 | 2.7.4 |
| 67 | |