diff options
author | cls%seawood.org <devnull@localhost> | 2001-01-27 06:24:27 +0000 |
---|---|---|
committer | cls%seawood.org <devnull@localhost> | 2001-01-27 06:24:27 +0000 |
commit | e6f27610f7d290de46f79337d1150f1818374e29 (patch) | |
tree | 1f1eecb681697d31cff6fe8703a922e115669047 | |
parent | 55419ac390f7e2aedf6abb328dba67fff827e27f (diff) | |
download | nspr-hg-e6f27610f7d290de46f79337d1150f1818374e29.tar.gz |
Bring hpux section inline with HPUX.mk
Bug 58804
-rwxr-xr-x | configure | 239 | ||||
-rw-r--r-- | configure.in | 118 |
2 files changed, 206 insertions, 151 deletions
@@ -2869,6 +2869,10 @@ EOF *-hpux*) cat >> confdefs.h <<\EOF +#define XP_UNIX 1 +EOF + + cat >> confdefs.h <<\EOF #define HPUX 1 EOF @@ -2876,7 +2880,10 @@ EOF #define _HPUX_SOURCE 1 EOF - DEFINES="$DEFINES -D${target_cpu}" + cat >> confdefs.h <<\EOF +#define hppa 1 +EOF + DLL_SUFFIX=sl DSO_LDOPTS='-b +h $(notdir $@)' PR_MD_CSRCS=hpux.c @@ -2895,46 +2902,64 @@ EOF DSO_CFLAGS=-fPIC fi if test -n "$MOZILLA_CLIENT"; then - USE_NSPR_THREADS=1 + DEFAULT_IMPL_STRATEGY=_EMU fi - case "${target_os}" in - hpuxA.09*) + + if echo "$OS_RELEASE" | grep ^A.09 >/dev/null; then + cat >> confdefs.h <<\EOF +#define _PR_NEED_H_ERRNO 1 +EOF + cat >> confdefs.h <<\EOF #define HPUX9 1 EOF + DEFAULT_IMPL_STRATEGY=_EMU + USE_NSPR_THREADS=1 + fi + + if echo "$OS_RELEASE" | egrep '^(B.10.10|B.10.20)' >/dev/null; then cat >> confdefs.h <<\EOF #define _PR_NEED_H_ERRNO 1 EOF + fi + + if echo "$OS_RELEASE" | egrep '^(B.10.10|B.10.20)' >/dev/null; then cat >> confdefs.h <<\EOF -#define _PR_NO_LARGE_FILES 1 +#define HAVE_INT_LOCALTIME_R 1 EOF - ;; - hpuxB.10.01*) + fi + + if echo "$OS_RELEASE" | egrep '^(B.10.30|B.11.00)' >/dev/null; then cat >> confdefs.h <<\EOF -#define HPUX10 1 +#define HAVE_POINTER_LOCALTIME_R 1 EOF - ;; - hpuxB.10.10*) + fi + + if test "$OS_RELEASE" = "B.10.01"; then cat >> confdefs.h <<\EOF #define HPUX10 1 EOF + DEFAULT_IMPL_STRATEGY=_EMU + fi + + if test "$OS_RELEASE" = "B.10.10"; then cat >> confdefs.h <<\EOF -#define HPUX10_10 1 +#define HPUX10 1 EOF cat >> confdefs.h <<\EOF -#define HAVE_INT_LOCALTIME_R 1 +#define HPUX10_10 1 EOF - USE_PTHREADS=1 - USE_NSPR_THREADS= - ;; - hpuxB.10.20*) + DEFAULT_IMPL_STRATEGY=_PTH + fi + + if test "$OS_RELEASE" = "B.10.20"; then cat >> confdefs.h <<\EOF #define HPUX10 1 EOF @@ -2943,30 +2968,31 @@ EOF #define HPUX10_20 1 EOF - cat >> confdefs.h <<\EOF -#define HAVE_INT_LOCALTIME_R 1 -EOF - if test -z "$GNU_CC"; then CFLAGS="$CFLAGS +DAportable +DS1.1" CXXFLAGS="$CXXFLAGS +DAportable +DS1.1" fi - USE_PTHREADS=1 - USE_NSPR_THREADS= - ;; - hpuxB.10.30*) + DEFAULT_IMPL_STRATEGY=_EMU + fi + + if test "$OS_RELEASE" = "B.10.30"; then cat >> confdefs.h <<\EOF -#define HAVE_POINTER_LOCALTIME_R 1 +#define HPUX10 1 +EOF + + cat >> confdefs.h <<\EOF +#define HPUX10_30 1 EOF + #CXX="/opt/aCC/bin/aCC -ext" if test -z "$GNU_CC"; then CFLAGS="$CFLAGS +DAportable +DS1.1" CXXFLAGS="$CXXFLAGS +DAportable +DS1.1" fi - USE_PTHREADS=1 - USE_NSPR_THREADS= - ;; - hpuxB.11.00*) + DEFAULT_IMPL_STRATEGY=_PTH + fi + + if test "$OS_RELEASE" = "B.11.00"; then cat >> confdefs.h <<\EOF #define HPUX10 1 EOF @@ -2996,23 +3022,21 @@ EOF CXXFLAGS="$CXXFLAGS +DA2.0W +DS2.0" fi fi - USE_PTHREADS=1 - USE_NSPR_THREADS= - ;; - esac - case "${target_os}" in - hpuxB.10*) - cat >> confdefs.h <<\EOF -#define _PR_NO_LARGE_FILES 1 -EOF - - ;; - esac - if test -n "$USE_NSPR_THREADS"; then - cat >> confdefs.h <<\EOF -#define _PR_LOCAL_THREADS_ONLY 1 -EOF + DEFAULT_IMPL_STRATEGY=_PTH + fi + if test "$DEFAULT_IMPL_STRATEGY" = "_EMU"; then + USE_NSPR_THREADS=1 + USE_PTHREADS= + USE_USER_THREADS= + elif test "$DEFAULT_IMPL_STRATEGY" = "_PTH"; then + USE_PTHREADS=1 + if test "$MOZILLA_CLIENT"; then + USE_PTHREADS= + fi + if test "$USE_USER_PTHREADS"; then + USE_PTHREADS= + fi fi ;; @@ -3503,7 +3527,7 @@ if test -z "$SKIP_LIBRARY_CHECKS"; then echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:3507: checking how to run the C preprocessor" >&5 +echo "configure:3531: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3518,13 +3542,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 3522 "configure" +#line 3546 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3535,13 +3559,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 3539 "configure" +#line 3563 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3552,13 +3576,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 3556 "configure" +#line 3580 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3584,13 +3608,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:3588: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:3612: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF -#line 3594 "configure" +#line 3618 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -3608,7 +3632,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 3612 "configure" +#line 3636 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -3632,12 +3656,12 @@ fi for ac_func in lchown strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3636: checking for $ac_func" >&5 +echo "configure:3660: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3641 "configure" +#line 3665 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3660,7 +3684,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3688,7 +3712,7 @@ done echo $ac_n "checking for pthread_attr_init in -lpthreads""... $ac_c" 1>&6 -echo "configure:3692: checking for pthread_attr_init in -lpthreads" >&5 +echo "configure:3716: checking for pthread_attr_init in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3696,7 +3720,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <<EOF -#line 3700 "configure" +#line 3724 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3707,7 +3731,7 @@ int main() { pthread_attr_init() ; return 0; } EOF -if { (eval echo configure:3711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3726,7 +3750,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 -echo "configure:3730: checking for pthread_attr_init in -lpthread" >&5 +echo "configure:3754: checking for pthread_attr_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3734,7 +3758,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 3738 "configure" +#line 3762 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3745,7 +3769,7 @@ int main() { pthread_attr_init() ; return 0; } EOF -if { (eval echo configure:3749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3764,7 +3788,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6 -echo "configure:3768: checking for pthread_attr_init in -lc_r" >&5 +echo "configure:3792: checking for pthread_attr_init in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3772,7 +3796,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <<EOF -#line 3776 "configure" +#line 3800 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3783,7 +3807,7 @@ int main() { pthread_attr_init() ; return 0; } EOF -if { (eval echo configure:3787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3802,7 +3826,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_attr_init in -lc""... $ac_c" 1>&6 -echo "configure:3806: checking for pthread_attr_init in -lc" >&5 +echo "configure:3830: checking for pthread_attr_init in -lc" >&5 ac_lib_var=`echo c'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3810,7 +3834,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <<EOF -#line 3814 "configure" +#line 3838 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3821,7 +3845,7 @@ int main() { pthread_attr_init() ; return 0; } EOF -if { (eval echo configure:3825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3968,7 +3992,7 @@ if test -n "$USE_PTHREADS"; then rm -f conftest* ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 -echo "configure:3972: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:3996: checking whether ${CC-cc} accepts -pthread" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -3984,7 +4008,7 @@ echo "configure:3972: checking whether ${CC-cc} accepts -pthread" >&5 ac_cv_have_dash_pthreads=no if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 -echo "configure:3988: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:4012: checking whether ${CC-cc} accepts -pthreads" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -4023,32 +4047,6 @@ EOF _PTHREAD_LDFLAGS= fi ;; - *-hpuxB.10.10*) - cat >> confdefs.h <<\EOF -#define _REENTRANT 1 -EOF - - cat >> confdefs.h <<\EOF -#define _PR_DCETHREADS 1 -EOF - - ;; - *-hpuxB.10.20*) - cat >> confdefs.h <<\EOF -#define _REENTRANT 1 -EOF - - cat >> confdefs.h <<\EOF -#define _PR_DCETHREADS 1 -EOF - - ;; - *-hpux*) - cat >> confdefs.h <<\EOF -#define _POSIX_C_SOURCE=199506L 1 -EOF - - ;; *) cat >> confdefs.h <<\EOF #define _REENTRANT 1 @@ -4099,7 +4097,38 @@ EOF ;; *-hpux*) - if test -n "$USE_USER_PTHREADS"; then + if test "$USE_NSPR_THREADS"; then + cat >> confdefs.h <<\EOF +#define _PR_LOCAL_THREADS_ONLY 1 +EOF + + fi + + if echo "$OS_RELEASE" | egrep '^(A.09|B.10)' >/dev/null; then + cat >> confdefs.h <<\EOF +#define _PR_NO_LARGE_FILES 1 +EOF + + fi + + if test "$USE_PTHREADS"; then + if echo "$OS_RELEASE" | egrep '^(B.10.10|B.10.20)' >/dev/null; then + cat >> confdefs.h <<\EOF +#define REENTRANT 1 +EOF + + cat >> confdefs.h <<\EOF +#define _PR_DCETHREADS 1 +EOF + + else + cat >> confdefs.h <<\EOF +#define _POSIX_C_SOURCE=199506L 1 +EOF + + fi + fi + if test "$USE_USER_PTHREADS"; then cat >> confdefs.h <<\EOF #define _POSIX_C_SOURCE=199506L 1 EOF @@ -4150,12 +4179,12 @@ OS_LIBS="$_PTHREAD_LDFLAGS $OS_LIBS" if test -z "$SKIP_LIBRARY_CHECKS"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:4154: checking for dlopen" >&5 +echo "configure:4183: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4159 "configure" +#line 4188 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen(); below. */ @@ -4178,7 +4207,7 @@ dlopen(); ; return 0; } EOF -if { (eval echo configure:4182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -4197,7 +4226,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4201: checking for dlopen in -ldl" >&5 +echo "configure:4230: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4205,7 +4234,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4209 "configure" +#line 4238 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4216,7 +4245,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:4220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff --git a/configure.in b/configure.in index e2bcd2c0..8ec711ea 100644 --- a/configure.in +++ b/configure.in @@ -635,9 +635,10 @@ case "$target" in ;; *-hpux*) + AC_DEFINE(XP_UNIX) AC_DEFINE(HPUX) AC_DEFINE(_HPUX_SOURCE) - DEFINES="$DEFINES -D${target_cpu}" + AC_DEFINE(hppa) DLL_SUFFIX=sl DSO_LDOPTS='-b +h $(notdir $@)' PR_MD_CSRCS=hpux.c @@ -656,45 +657,61 @@ case "$target" in DSO_CFLAGS=-fPIC fi if test -n "$MOZILLA_CLIENT"; then - USE_NSPR_THREADS=1 + DEFAULT_IMPL_STRATEGY=_EMU fi - case "${target_os}" in - hpuxA.09*) + + if echo "$OS_RELEASE" | grep ^A.09 >/dev/null; then + AC_DEFINE(_PR_NEED_H_ERRNO) AC_DEFINE(HPUX9) + DEFAULT_IMPL_STRATEGY=_EMU + USE_NSPR_THREADS=1 + fi + + if echo "$OS_RELEASE" | egrep '^(B.10.10|B.10.20)' >/dev/null; then AC_DEFINE(_PR_NEED_H_ERRNO) - AC_DEFINE(_PR_NO_LARGE_FILES) - ;; - hpuxB.10.01*) + fi + + if echo "$OS_RELEASE" | egrep '^(B.10.10|B.10.20)' >/dev/null; then + AC_DEFINE(HAVE_INT_LOCALTIME_R) + fi + + if echo "$OS_RELEASE" | egrep '^(B.10.30|B.11.00)' >/dev/null; then + AC_DEFINE(HAVE_POINTER_LOCALTIME_R) + fi + + if test "$OS_RELEASE" = "B.10.01"; then AC_DEFINE(HPUX10) - ;; - hpuxB.10.10*) + DEFAULT_IMPL_STRATEGY=_EMU + fi + + if test "$OS_RELEASE" = "B.10.10"; then AC_DEFINE(HPUX10) AC_DEFINE(HPUX10_10) - AC_DEFINE(HAVE_INT_LOCALTIME_R) - USE_PTHREADS=1 - USE_NSPR_THREADS= - ;; - hpuxB.10.20*) + DEFAULT_IMPL_STRATEGY=_PTH + fi + + if test "$OS_RELEASE" = "B.10.20"; then AC_DEFINE(HPUX10) AC_DEFINE(HPUX10_20) - AC_DEFINE(HAVE_INT_LOCALTIME_R) if test -z "$GNU_CC"; then CFLAGS="$CFLAGS +DAportable +DS1.1" CXXFLAGS="$CXXFLAGS +DAportable +DS1.1" fi - USE_PTHREADS=1 - USE_NSPR_THREADS= - ;; - hpuxB.10.30*) - AC_DEFINE(HAVE_POINTER_LOCALTIME_R) + DEFAULT_IMPL_STRATEGY=_EMU + fi + + if test "$OS_RELEASE" = "B.10.30"; then + AC_DEFINE(HPUX10) + AC_DEFINE(HPUX10_30) + #CXX="/opt/aCC/bin/aCC -ext" if test -z "$GNU_CC"; then CFLAGS="$CFLAGS +DAportable +DS1.1" CXXFLAGS="$CXXFLAGS +DAportable +DS1.1" fi - USE_PTHREADS=1 - USE_NSPR_THREADS= - ;; - hpuxB.11.00*) + DEFAULT_IMPL_STRATEGY=_PTH + fi + + if test "$OS_RELEASE" = "B.11.00"; then AC_DEFINE(HPUX10) AC_DEFINE(HPUX11) AC_DEFINE(_LARGEFILE64_SOURCE) @@ -709,17 +726,21 @@ case "$target" in CXXFLAGS="$CXXFLAGS +DA2.0W +DS2.0" fi fi + DEFAULT_IMPL_STRATEGY=_PTH + fi + + if test "$DEFAULT_IMPL_STRATEGY" = "_EMU"; then + USE_NSPR_THREADS=1 + USE_PTHREADS= + USE_USER_THREADS= + elif test "$DEFAULT_IMPL_STRATEGY" = "_PTH"; then USE_PTHREADS=1 - USE_NSPR_THREADS= - ;; - esac - case "${target_os}" in - hpuxB.10*) - AC_DEFINE(_PR_NO_LARGE_FILES) - ;; - esac - if test -n "$USE_NSPR_THREADS"; then - AC_DEFINE(_PR_LOCAL_THREADS_ONLY) + if test "$MOZILLA_CLIENT"; then + USE_PTHREADS= + fi + if test "$USE_USER_PTHREADS"; then + USE_PTHREADS= + fi fi ;; @@ -1297,17 +1318,6 @@ if test -n "$USE_PTHREADS"; then _PTHREAD_LDFLAGS= fi ;; - *-hpuxB.10.10*) - AC_DEFINE(_REENTRANT) - AC_DEFINE(_PR_DCETHREADS) - ;; - *-hpuxB.10.20*) - AC_DEFINE(_REENTRANT) - AC_DEFINE(_PR_DCETHREADS) - ;; - *-hpux*) - AC_DEFINE(_POSIX_C_SOURCE=199506L) - ;; *) AC_DEFINE(_REENTRANT) ;; @@ -1345,7 +1355,23 @@ case "$target" in ;; *-hpux*) - if test -n "$USE_USER_PTHREADS"; then + if test "$USE_NSPR_THREADS"; then + AC_DEFINE(_PR_LOCAL_THREADS_ONLY) + fi + + if echo "$OS_RELEASE" | egrep '^(A.09|B.10)' >/dev/null; then + AC_DEFINE(_PR_NO_LARGE_FILES) + fi + + if test "$USE_PTHREADS"; then + if echo "$OS_RELEASE" | egrep '^(B.10.10|B.10.20)' >/dev/null; then + AC_DEFINE(REENTRANT) + AC_DEFINE(_PR_DCETHREADS) + else + AC_DEFINE(_POSIX_C_SOURCE=199506L) + fi + fi + if test "$USE_USER_PTHREADS"; then AC_DEFINE(_POSIX_C_SOURCE=199506L) fi ;; |