| Richard Marian Thomaiyar | 14fddef | 2018-07-13 23:55:56 +0530 | [diff] [blame^] | 1 | From 47379747e34f952d31af028c672940ca7859ae3c Mon Sep 17 00:00:00 2001 |
| 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> |
| 10 | |
| 11 | --- |
| 12 | configure.ac | 12 ++++++------ |
| 13 | 1 file changed, 6 insertions(+), 6 deletions(-) |
| 14 | |
| 15 | diff --git a/configure.ac b/configure.ac |
| 16 | index 3278200..6edec7d 100644 |
| 17 | --- a/configure.ac |
| 18 | +++ b/configure.ac |
| 19 | @@ -644,7 +644,7 @@ if test "z$NSS_FOUND" = "zno" ; then |
| 20 | |
| 21 | if test "z$with_nspr" != "z" ; then |
| 22 | NSPR_PREFIX="$with_nspr" |
| 23 | - NSPR_CFLAGS="-I$with_nspr/include -I$with_nspr/include/nspr" |
| 24 | + NSPR_CFLAGS="-I$with_nspr/usr/include -I$with_nspr/usr/include/nspr4" |
| 25 | if test "z$with_gnu_ld" = "zyes" ; then |
| 26 | NSPR_LIBS="-Wl,-rpath-link -Wl,$with_nspr/lib -L$with_nspr/lib $NSPR_LIBS_LIST" |
| 27 | else |
| 28 | @@ -652,7 +652,7 @@ if test "z$NSS_FOUND" = "zno" ; then |
| 29 | fi |
| 30 | NSPR_INCLUDES_FOUND="yes" |
| 31 | NSPR_LIBS_FOUND="yes" |
| 32 | - NSPR_PRINIT_H="$with_nspr/include/prinit.h" |
| 33 | + NSPR_PRINIT_H="$with_nspr/usr/include/nspr4/prinit.h" |
| 34 | else |
| 35 | for dir in $ac_nss_inc_dir ; do |
| 36 | if test -f $dir/nspr/prinit.h ; then |
| 37 | @@ -690,7 +690,7 @@ if test "z$NSS_FOUND" = "zno" ; then |
| 38 | OLD_CPPFLAGS=$CPPFLAGS |
| 39 | CPPFLAGS="$NSPR_CFLAGS" |
| 40 | AC_EGREP_CPP(yes,[ |
| 41 | - #include <prinit.h> |
| 42 | + #include <nspr4/prinit.h> |
| 43 | #if PR_VMAJOR >= 4 |
| 44 | yes |
| 45 | #endif |
| 46 | @@ -715,7 +715,7 @@ if test "z$NSS_FOUND" = "zno" ; then |
| 47 | NSS_NSS_H="" |
| 48 | |
| 49 | if test "z$with_nss" != "z" ; then |
| 50 | - NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss" |
| 51 | + NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/usr/include -I$with_nss/usr/include/nss3 -I$with_nspr/usr/include/nspr4" |
| 52 | if test "z$with_gnu_ld" = "zyes" ; then |
| 53 | NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST" |
| 54 | else |
| 55 | @@ -723,7 +723,7 @@ if test "z$NSS_FOUND" = "zno" ; then |
| 56 | fi |
| 57 | NSS_INCLUDES_FOUND="yes" |
| 58 | NSS_LIBS_FOUND="yes" |
| 59 | - NSS_NSS_H="$with_nss/include/nss.h" |
| 60 | + NSS_NSS_H="$with_nss/usr/include/nss3/nss.h" |
| 61 | else |
| 62 | for dir in $ac_nss_inc_dir ; do |
| 63 | if test -f $dir/nss/nss.h ; then |
| 64 | @@ -761,7 +761,7 @@ if test "z$NSS_FOUND" = "zno" ; then |
| 65 | OLD_CPPFLAGS=$CPPFLAGS |
| 66 | CPPFLAGS="$NSPR_CFLAGS $NSS_CFLAGS" |
| 67 | AC_EGREP_CPP(yes,[ |
| 68 | - #include <nss.h> |
| 69 | + #include <nss3/nss.h> |
| 70 | #if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2 |
| 71 | yes |
| 72 | #endif |