| Index: zlib/configure
|
| diff --git a/zlib/configure b/zlib/configure
|
| index 284449a5fcfb4277c4aebf6ec6aa4370c63e77d7..98899fa910fd91306d05500c4f615230f48b19e1 100755
|
| --- a/zlib/configure
|
| +++ b/zlib/configure
|
| @@ -4123,7 +4123,7 @@ freebsd* | dragonfly*)
|
| fi
|
| ;;
|
|
|
| -gnu*)
|
| +gnu* | nacl*)
|
| lt_cv_deplibs_check_method=pass_all
|
| ;;
|
|
|
| @@ -8949,6 +8949,21 @@ linux*oldld* | linux*aout* | linux*coff*)
|
| dynamic_linker=no
|
| ;;
|
|
|
| +nacl*)
|
| + version_type=linux
|
| + need_lib_prefix=no
|
| + need_version=no
|
| + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
| + soname_spec='${libname}${release}${shared_ext}$major'
|
| + shlibpath_var=LD_LIBRARY_PATH
|
| + shlibpath_overrides_runpath=no
|
| +
|
| + # This implies no fast_install, which is unacceptable.
|
| + # Some rework will be needed to allow for fast_install
|
| + # before this can be enabled.
|
| + hardcode_into_libs=yes
|
| + ;;
|
| +
|
| # This must be Linux ELF.
|
| linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
| version_type=linux
|
| @@ -10022,7 +10037,7 @@ else
|
| lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
| lt_status=$lt_dlunknown
|
| cat > conftest.$ac_ext <<_LT_EOF
|
| -#line 10025 "configure"
|
| +#line 10040 "configure"
|
| #include "confdefs.h"
|
|
|
| #if HAVE_DLFCN_H
|
| @@ -10118,7 +10133,7 @@ else
|
| lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
| lt_status=$lt_dlunknown
|
| cat > conftest.$ac_ext <<_LT_EOF
|
| -#line 10121 "configure"
|
| +#line 10136 "configure"
|
| #include "confdefs.h"
|
|
|
| #if HAVE_DLFCN_H
|
|
|