1From 9ed3b4e628f9254d5c86006fe63c33a1eb02aee5 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Tue, 4 Feb 2020 23:39:49 -0800
4Subject: [PATCH] nss/nspr: fix for multilib
5
6Upstream-Status: Pending
7
8Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
9---
10 configure.ac | 16 ++++++++--------
11 1 file changed, 8 insertions(+), 8 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index b46d97d..39f4318 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -920,24 +920,24 @@ fi
18 dnl Priority 1: User specifies the path to installation
19 if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then
20     AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder)
21-    if test -f "$with_nspr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/lib/$NSPR_LIB_MARKER" ; then
22-        NSPR_INCLUDE_PATH="$with_nspr/include"
23-        NSPR_LIB_PATH="$with_nspr/lib"
24+    if test -f "$with_nspr/${includedir}/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/${libdir}/$NSPR_LIB_MARKER" ; then
25+        NSPR_INCLUDE_PATH="$with_nspr/${includedir}"
26+        NSPR_LIB_PATH="$with_nspr/${libdir}"
27         NSPR_FOUND="yes"
28         AC_MSG_RESULT([yes])
29     else
30-        AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER" files don't exist), typo?])
31+        AC_MSG_ERROR([not found: "$with_nspr/${includedir}/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/${libdir}/$NSPR_LIB_MARKER" files don't exist), typo?])
32     fi
33 fi
34 if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then
35     AC_MSG_CHECKING(for nss library installation in "$with_nss" folder)
36-    if test -f "$with_nss/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/lib/$NSS_LIB_MARKER" ; then
37-        NSS_INCLUDE_PATH="$with_nss/include"
38-        NSS_LIB_PATH="$with_nss/lib"
39+    if test -f "$with_nss/${includedir}/$NSS_INCLUDE_MARKER" -a -f "$with_nss/${libdir}/$NSS_LIB_MARKER" ; then
40+        NSS_INCLUDE_PATH="$with_nss/${includedir}"
41+        NSS_LIB_PATH="$with_nss/${libdir}"
42         NSS_FOUND="yes"
43         AC_MSG_RESULT([yes])
44     else
45-        AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER" files don't exist), typo?])
46+        AC_MSG_ERROR([not found: "$with_nss/${includedir}/$NSS_INCLUDE_MARKER" and/or "$with_nss/${libdir}/$NSS_LIB_MARKER" files don't exist), typo?])
47     fi
48 fi
49
50--
512.21.0
52
53