diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-27 15:57:18 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-27 15:57:18 +0200 |
| commit | d990d8ab2cade6c928e8bbe56ae038d020cef599 (patch) | |
| tree | c7561ae0f303cb0d4a7a7507178531b4852e4dea /nsprpub/configure | |
| parent | 0c36b27511c1fbca594f0426c493ef601fda3e4c (diff) | |
| parent | 8d5ec757ece850fb7ad5c712868f305636e41177 (diff) | |
| download | UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar.gz UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar.lz UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar.xz UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into js_array_values_1
Diffstat (limited to 'nsprpub/configure')
| -rwxr-xr-x | nsprpub/configure | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/nsprpub/configure b/nsprpub/configure index b8ad2b4eb..19e9fa60f 100755 --- a/nsprpub/configure +++ b/nsprpub/configure @@ -2488,7 +2488,7 @@ test -n "$target_alias" && program_prefix=${target_alias}- MOD_MAJOR_VERSION=4 -MOD_MINOR_VERSION=16 +MOD_MINOR_VERSION=18 MOD_PATCH_VERSION=0 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= @@ -6560,11 +6560,13 @@ fi $as_echo "#define HAVE_POINTER_LOCALTIME_R 1" >>confdefs.h + HOST_DARWIN_MAJOR=`echo "$build_os" | sed -E -e 's/^darwin([0-9]+).*$/\1/'` + if test "$HOST_DARWIN_MAJOR" -ge 15 ; then $as_echo "#define HAS_CONNECTX 1" >>confdefs.h - fi + fi AS='$(CC) -x assembler-with-cpp' CFLAGS="$CFLAGS -Wall -fno-common" case "${target_cpu}" in @@ -8472,19 +8474,12 @@ case "$target" in fi if test "$USE_PTHREADS"; then - if echo "$OS_RELEASE" | egrep '^(B.10.10|B.10.20)' >/dev/null; then - $as_echo "#define _REENTRANT 1" >>confdefs.h - - $as_echo "#define _PR_DCETHREADS 1" >>confdefs.h - - else - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <<_ACEOF #define _POSIX_C_SOURCE 199506L _ACEOF - $as_echo "#define _PR_HAVE_THREADSAFE_GETHOST 1" >>confdefs.h + $as_echo "#define _PR_HAVE_THREADSAFE_GETHOST 1" >>confdefs.h - fi fi if test "$USE_USER_PTHREADS"; then cat >>confdefs.h <<_ACEOF |