about summary refs log tree commit diff
path: root/configure
diff options
context:
space:
mode:
authorGuido Trentalancia <guido@trentalancia.net>2017-10-04 15:02:35 +0200
committerFlorian Weimer <fweimer@redhat.com>2017-10-04 15:02:35 +0200
commit57b4af1955e28c1623c98397b8597847d16bdd8c (patch)
treed98771f87977a7f297d4947cc8d0cdbc03bcd9be /configure
parent64d1e08ea822bf47cb2796ad0f727136227f983c (diff)
downloadglibc-57b4af1955e28c1623c98397b8597847d16bdd8c.tar.gz
glibc-57b4af1955e28c1623c98397b8597847d16bdd8c.tar.xz
glibc-57b4af1955e28c1623c98397b8597847d16bdd8c.zip
crypt: Use NSPR header files in addition to NSS header files [BZ #17956]
When configuring and building GNU libc using the Mozilla NSS library
for cryptography (--enable-nss-crypt option), also include the
NSPR header files along with the Mozilla NSS library header files.

Finally, when running the check-local-headers test, ignore the
Mozilla NSPR library header files (used by the Mozilla NSS library).
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 5 insertions, 1 deletions
diff --git a/configure b/configure
index 067d92d2ba..a7c72eaaa6 100755
--- a/configure
+++ b/configure
@@ -3549,8 +3549,12 @@ if test x$nss_crypt = xyes; then
   if test $? -ne 0; then
     as_fn_error $? "cannot find include directory with nss-config" "$LINENO" 5
   fi
+  nspr_includes=-I$(nspr-config --includedir 2>/dev/null)
+  if test $? -ne 0; then
+    as_fn_error $? "cannot find include directory with nspr-config" "$LINENO" 5
+  fi
   old_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $nss_includes"
+  CFLAGS="$CFLAGS $nss_includes $nspr_includes"
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */