diff --git a/mozilla/nsprpub/config/Makefile.in b/mozilla/nsprpub/config/Makefile.in index 2234c79fb4b..6a6a3e395f2 100644 --- a/mozilla/nsprpub/config/Makefile.in +++ b/mozilla/nsprpub/config/Makefile.in @@ -94,14 +94,14 @@ ifeq ($(OS_ARCH), HP-UX) endif ifeq ($(MOZ_OS2_TOOLS),EMX) -XCFLAGS = $(OS_EXE_CFLAGS) +XCFLAGS = $(OS_CFLAGS) ifeq ($(MOZ_OS2_EMX_OBJECTFORMAT),OMF) XLDOPTS = -Zlinker /PM:VIO endif endif ifeq ($(MOZ_OS2_TOOLS),PGCC) -XCFLAGS = $(OS_EXE_CFLAGS) +XCFLAGS = $(OS_CFLAGS) XLDOPTS = -Zlinker /PM:VIO endif diff --git a/mozilla/nsprpub/configure b/mozilla/nsprpub/configure index 5a5fe8b8ed4..cecdd39aef3 100755 --- a/mozilla/nsprpub/configure +++ b/mozilla/nsprpub/configure @@ -4084,14 +4084,17 @@ EOF LD='$(CC)' IMPLIB='emximp -o' FILTER='emxexp' + OS_DLLFLAGS='$(DSO_LDOPTS) -o $@' _OPTIMIZE_FLAGS=-O3 _DEBUG_FLAGS=-g if test -n "$MOZ_DEBUG"; then DLLFLAGS='-g' EXEFLAGS='-g $(OMF_FLAG) -Zmtd -L$(DIST)/lib -o $@' + DSO_LDOPTS='-g -Zomf -Zdll -Zmt -Zcrtdll -Zlinker /NOO' else DLLFLAGS= EXEFLAGS='-Zmtd -o $@' + DSO_LDOPTS='-Zomf -Zdll -Zmt -Zcrtdll -Zlinker /NOO' fi ;; *-os2_vacpp) @@ -4154,12 +4157,12 @@ fi if test -z "$SKIP_LIBRARY_CHECKS"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:4158: checking for dlopen" >&5 +echo "configure:4161: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4189: \"$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 @@ -4201,7 +4204,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4205: checking for dlopen in -ldl" >&5 +echo "configure:4208: 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 @@ -4209,7 +4212,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4227: \"$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 @@ -4247,7 +4250,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:4251: checking how to run the C preprocessor" >&5 +echo "configure:4254: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -4262,13 +4265,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4275: \"$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 : @@ -4279,13 +4282,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4292: \"$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 : @@ -4296,13 +4299,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4309: \"$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 : @@ -4328,13 +4331,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:4332: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:4335: 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 < Autoconf TIOCGETP @@ -4352,7 +4355,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -4376,12 +4379,12 @@ fi for ac_func in lchown strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4380: checking for $ac_func" >&5 +echo "configure:4383: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4411: \"$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 @@ -4435,7 +4438,7 @@ done echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:4439: checking for pthread_create in -lpthreads" >&5 +echo "configure:4442: checking for pthread_create in -lpthreads" >&5 echo " #include void *foo(void *v) { int a = 1; } @@ -4457,7 +4460,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:4461: checking for pthread_create in -lpthread" >&5 +echo "configure:4464: checking for pthread_create in -lpthread" >&5 echo " #include void *foo(void *v) { int a = 1; } @@ -4479,7 +4482,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:4483: checking for pthread_create in -lc_r" >&5 +echo "configure:4486: checking for pthread_create in -lc_r" >&5 echo " #include void *foo(void *v) { int a = 1; } @@ -4501,7 +4504,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:4505: checking for pthread_create in -lc" >&5 +echo "configure:4508: checking for pthread_create in -lc" >&5 echo " #include void *foo(void *v) { int a = 1; } @@ -4651,7 +4654,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:4655: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:4658: 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 @@ -4667,7 +4670,7 @@ echo "configure:4655: 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:4671: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:4674: 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 diff --git a/mozilla/nsprpub/configure.in b/mozilla/nsprpub/configure.in index 952a6580e36..9f3b3c9683e 100644 --- a/mozilla/nsprpub/configure.in +++ b/mozilla/nsprpub/configure.in @@ -1432,14 +1432,17 @@ mips-sony-newsos*) LD='$(CC)' IMPLIB='emximp -o' FILTER='emxexp' + OS_DLLFLAGS='$(DSO_LDOPTS) -o $@' _OPTIMIZE_FLAGS=-O3 _DEBUG_FLAGS=-g if test -n "$MOZ_DEBUG"; then DLLFLAGS='-g' EXEFLAGS='-g $(OMF_FLAG) -Zmtd -L$(DIST)/lib -o $@' + DSO_LDOPTS='-g -Zomf -Zdll -Zmt -Zcrtdll -Zlinker /NOO' else DLLFLAGS= EXEFLAGS='-Zmtd -o $@' + DSO_LDOPTS='-Zomf -Zdll -Zmt -Zcrtdll -Zlinker /NOO' fi ;; *-os2_vacpp)