]>
Commit | Line | Data |
---|---|---|
96e6f3cb AM |
1 | --- glibc-2.26/configure.ac~ 2017-12-04 08:35:08.000000000 +0100 |
2 | +++ glibc-2.26/configure.ac 2017-12-04 08:40:44.267900240 +0100 | |
3 | @@ -326,14 +326,7 @@ AC_ARG_ENABLE([nss-crypt], | |
6eae7d17 JP |
4 | [nss_crypt=$enableval], |
5 | [nss_crypt=no]) | |
6 | if test x$nss_crypt = xyes; then | |
7 | - nss_includes=-I$(nss-config --includedir 2>/dev/null) | |
8 | - if test $? -ne 0; then | |
9 | - AC_MSG_ERROR([cannot find include directory with nss-config]) | |
10 | - fi | |
96e6f3cb AM |
11 | - nspr_includes=-I$(nspr-config --includedir 2>/dev/null) |
12 | - if test $? -ne 0; then | |
13 | - AC_MSG_ERROR([cannot find include directory with nspr-config]) | |
14 | - fi | |
6eae7d17 JP |
15 | + nss_includes='-I/usr/include/nss -I/usr/include/nspr' |
16 | old_CFLAGS="$CFLAGS" | |
96e6f3cb | 17 | CFLAGS="$CFLAGS $nss_includes $nspr_includes" |
6eae7d17 | 18 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([typedef int PRBool; |
96e6f3cb AM |
19 | --- glibc-2.26/crypt/Makefile~ 2017-12-04 08:35:09.000000000 +0100 |
20 | +++ glibc-2.26/crypt/Makefile 2017-12-04 08:41:17.325468766 +0100 | |
21 | @@ -38,7 +38,7 @@ endif | |
6eae7d17 JP |
22 | |
23 | ifeq ($(nss-crypt),yes) | |
96e6f3cb AM |
24 | nss-cpp-flags := -DUSE_NSS \ |
25 | - -I$(shell nss-config --includedir) -I$(shell nspr-config --includedir) | |
26 | + -I/usr/include/nss -I/usr/include/nspr | |
4928f174 AM |
27 | CPPFLAGS-sha256-crypt.c += $(nss-cpp-flags) |
28 | CPPFLAGS-sha512-crypt.c += $(nss-cpp-flags) | |
29 | CPPFLAGS-md5-crypt.c += $(nss-cpp-flags) | |
30 |