- rel 6; update fixes from upstream

[packages/glibc.git] / glibc-nss_include_dirs.patch

--- glibc-2.26/configure.ac~	2017-12-04 08:35:08.000000000 +0100
+++ glibc-2.26/configure.ac	2017-12-04 08:40:44.267900240 +0100
@@ -326,14 +326,7 @@ AC_ARG_ENABLE([nss-crypt],
 	      [nss_crypt=$enableval],
 	      [nss_crypt=no])
 if test x$nss_crypt = xyes; then
-  nss_includes=-I$(nss-config --includedir 2>/dev/null)
-  if test $? -ne 0; then
-    AC_MSG_ERROR([cannot find include directory with nss-config])
-  fi
-  nspr_includes=-I$(nspr-config --includedir 2>/dev/null)
-  if test $? -ne 0; then
-    AC_MSG_ERROR([cannot find include directory with nspr-config])
-  fi
+  nss_includes='-I/usr/include/nss -I/usr/include/nspr'
   old_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $nss_includes $nspr_includes"
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([typedef int PRBool;
--- glibc-2.26/crypt/Makefile~	2017-12-04 08:35:09.000000000 +0100
+++ glibc-2.26/crypt/Makefile	2017-12-04 08:41:17.325468766 +0100
@@ -38,7 +38,7 @@ endif
 
 ifeq ($(nss-crypt),yes)
 nss-cpp-flags := -DUSE_NSS \
-  -I$(shell nss-config --includedir) -I$(shell nspr-config --includedir)
+  -I/usr/include/nss -I/usr/include/nspr
 CPPFLAGS-sha256-crypt.c += $(nss-cpp-flags)
 CPPFLAGS-sha512-crypt.c += $(nss-cpp-flags)
 CPPFLAGS-md5-crypt.c += $(nss-cpp-flags)