From: Jakub Bogusz Date: Mon, 19 May 2003 07:41:10 +0000 (+0000) Subject: - obsolete X-Git-Tag: MOZILLA_1_4~3 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;ds=sidebyside;h=e505f9832ff042c4eb8401266a3b6a3e863ab61d;p=packages%2Fnspr.git - obsolete Changed files: nspr-4.2.2-mozilla1.2b.patch -> 1.2 --- diff --git a/nspr-4.2.2-mozilla1.2b.patch b/nspr-4.2.2-mozilla1.2b.patch deleted file mode 100644 index 9263bfb..0000000 --- a/nspr-4.2.2-mozilla1.2b.patch +++ /dev/null @@ -1,1238 +0,0 @@ -diff -Nur nspr-4.2.2/mozilla/nsprpub/configure nspr-4.2.2.b/mozilla/nsprpub/configure ---- nspr-4.2.2/mozilla/nsprpub/configure Thu Sep 19 02:16:14 2002 -+++ nspr-4.2.2.b/mozilla/nsprpub/configure Thu Sep 26 14:46:21 2002 -@@ -39,6 +39,9 @@ - ac_help="$ac_help - --enable-mdupdate Enable use of certain compilers' mdupdate feature" - ac_help="$ac_help -+ --enable-macos-target=VER (default=10.1) -+ Set the minimum MacOS version needed at runtime" -+ac_help="$ac_help - --enable-strip Enable stripping of shared libs and programs" - ac_help="$ac_help - --with-pthreads Use system pthreads library as thread subsystem" -@@ -614,7 +617,7 @@ - fi - - echo $ac_n "checking host system type""... $ac_c" 1>&6 --echo "configure:618: checking host system type" >&5 -+echo "configure:621: checking host system type" >&5 - - host_alias=$host - case "$host_alias" in -@@ -635,7 +638,7 @@ - echo "$ac_t""$host" 1>&6 - - echo $ac_n "checking target system type""... $ac_c" 1>&6 --echo "configure:639: checking target system type" >&5 -+echo "configure:642: checking target system type" >&5 - - target_alias=$target - case "$target_alias" in -@@ -653,7 +656,7 @@ - echo "$ac_t""$target" 1>&6 - - echo $ac_n "checking build system type""... $ac_c" 1>&6 --echo "configure:657: checking build system type" >&5 -+echo "configure:660: checking build system type" >&5 - - build_alias=$build - case "$build_alias" in -@@ -689,6 +692,7 @@ - USE_CPLUS= - USE_IPV6= - USE_MDUPDATE= -+MACOS_DEPLOYMENT_TARGET= - _OPTIMIZE_FLAGS=-O - _DEBUG_FLAGS=-g - MOZ_DEBUG=1 -@@ -719,7 +723,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:723: checking for $ac_word" >&5 -+echo "configure:727: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -907,6 +911,15 @@ - fi - - -+# Check whether --enable-macos-target or --disable-macos-target was given. -+if test "${enable_macos_target+set}" = set; then -+ enableval="$enable_macos_target" -+ MACOS_DEPLOYMENT_TARGET_STR=$enableval -+else -+ MACOS_DEPLOYMENT_TARGET_STR=10.1 -+fi -+ -+ - case "$target" in - - *-aix*) -@@ -996,7 +1009,7 @@ - # Extract the first word of "$WHOAMI whoami", so it can be a program name with args. - set dummy $WHOAMI whoami; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1000: checking for $ac_word" >&5 -+echo "configure:1013: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1067,14 +1080,14 @@ - _SAVE_LDFLAGS="$LDFLAGS" - - echo $ac_n "checking for $host compiler""... $ac_c" 1>&6 --echo "configure:1071: checking for $host compiler" >&5 -+echo "configure:1084: checking for $host compiler" >&5 - if test -z "$HOST_CC"; then - for ac_prog in gcc cc /usr/ucb/cc - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1078: checking for $ac_word" >&5 -+echo "configure:1091: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1121,16 +1134,16 @@ - LDFLAGS="$HOST_LDFLAGS" - - echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1125: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 -+echo "configure:1138: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_prog_host_cc_works=1 echo "$ac_t""yes" 1>&6 - else -@@ -1151,7 +1164,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1155: checking for $ac_word" >&5 -+echo "configure:1168: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1186,7 +1199,7 @@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1190: checking for $ac_word" >&5 -+echo "configure:1203: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1216,7 +1229,7 @@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1220: checking for $ac_word" >&5 -+echo "configure:1233: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1267,7 +1280,7 @@ - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1271: checking for $ac_word" >&5 -+echo "configure:1284: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1299,7 +1312,7 @@ - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1303: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:1316: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -1310,12 +1323,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 1314 "configure" -+#line 1327 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:1319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -1341,12 +1354,12 @@ - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:1345: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:1358: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:1350: checking whether we are using GNU C" >&5 -+echo "configure:1363: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1355,7 +1368,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@ -1374,7 +1387,7 @@ - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:1378: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:1391: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1411,7 +1424,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1415: checking for $ac_word" >&5 -+echo "configure:1428: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1448,7 +1461,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1452: checking for $ac_word" >&5 -+echo "configure:1465: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1480,7 +1493,7 @@ - - - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1484: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+echo "configure:1497: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 - - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -1491,12 +1504,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 1495 "configure" -+#line 1508 "configure" - #include "confdefs.h" - - int main(){return(0);} - EOF --if { (eval echo configure:1500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cxx_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -1522,12 +1535,12 @@ - { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:1526: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:1539: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 --echo "configure:1531: checking whether we are using GNU C++" >&5 -+echo "configure:1544: checking whether we are using GNU C++" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1536,7 +1549,7 @@ - yes; - #endif - EOF --if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gxx=yes - else - ac_cv_prog_gxx=no -@@ -1555,7 +1568,7 @@ - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= - echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 --echo "configure:1559: checking whether ${CXX-g++} accepts -g" >&5 -+echo "configure:1572: checking whether ${CXX-g++} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1592,7 +1605,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1596: checking for $ac_word" >&5 -+echo "configure:1609: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1629,7 +1642,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1633: checking for $ac_word" >&5 -+echo "configure:1646: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1666,7 +1679,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1670: checking for $ac_word" >&5 -+echo "configure:1683: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1703,7 +1716,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1707: checking for $ac_word" >&5 -+echo "configure:1720: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1740,7 +1753,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1744: checking for $ac_word" >&5 -+echo "configure:1757: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1777,7 +1790,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1781: checking for $ac_word" >&5 -+echo "configure:1794: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1814,7 +1827,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1818: checking for $ac_word" >&5 -+echo "configure:1831: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1852,7 +1865,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1856: checking for $ac_word" >&5 -+echo "configure:1869: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1884,7 +1897,7 @@ - - - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1888: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+echo "configure:1901: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 - - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -1895,12 +1908,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 1899 "configure" -+#line 1912 "configure" - #include "confdefs.h" - - int main(){return(0);} - EOF --if { (eval echo configure:1904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cxx_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -1926,12 +1939,12 @@ - { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:1930: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:1943: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 - cross_compiling=$ac_cv_prog_cxx_cross - - echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 --echo "configure:1935: checking whether we are using GNU C++" >&5 -+echo "configure:1948: checking whether we are using GNU C++" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1940,7 +1953,7 @@ - yes; - #endif - EOF --if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gxx=yes - else - ac_cv_prog_gxx=no -@@ -1959,7 +1972,7 @@ - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= - echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 --echo "configure:1963: checking whether ${CXX-g++} accepts -g" >&5 -+echo "configure:1976: checking whether ${CXX-g++} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1996,7 +2009,7 @@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2000: checking for $ac_word" >&5 -+echo "configure:2013: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2026,7 +2039,7 @@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2030: checking for $ac_word" >&5 -+echo "configure:2043: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2077,7 +2090,7 @@ - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2081: checking for $ac_word" >&5 -+echo "configure:2094: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2109,7 +2122,7 @@ - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:2113: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:2126: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -2120,12 +2133,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 2124 "configure" -+#line 2137 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:2129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -2151,12 +2164,12 @@ - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:2155: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:2168: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:2160: checking whether we are using GNU C" >&5 -+echo "configure:2173: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2165,7 +2178,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@ -2184,7 +2197,7 @@ - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:2188: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:2201: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2217,7 +2230,7 @@ - - fi - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:2221: checking how to run the C preprocessor" >&5 -+echo "configure:2234: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -2232,13 +2245,13 @@ - # 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:2242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2255: \"$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 - : -@@ -2249,13 +2262,13 @@ - 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:2259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2272: \"$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 - : -@@ -2266,13 +2279,13 @@ - 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:2276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2289: \"$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 - : -@@ -2299,7 +2312,7 @@ - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2303: checking for $ac_word" >&5 -+echo "configure:2316: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2331,7 +2344,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2335: checking for $ac_word" >&5 -+echo "configure:2348: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2372,7 +2385,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2376: checking for $ac_word" >&5 -+echo "configure:2389: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2413,7 +2426,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2417: checking for $ac_word" >&5 -+echo "configure:2430: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2454,7 +2467,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2458: checking for $ac_word" >&5 -+echo "configure:2471: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2495,7 +2508,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2499: checking for $ac_word" >&5 -+echo "configure:2512: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_DLLTOOL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2536,7 +2549,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2540: checking for $ac_word" >&5 -+echo "configure:2553: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_WINDRES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2598,7 +2611,7 @@ - fi - - echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 --echo "configure:2602: checking for gcc -pipe support" >&5 -+echo "configure:2615: checking for gcc -pipe support" >&5 - if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then - echo '#include ' > dummy-hello.c - echo 'int main() { printf("Hello World\n"); return 0; }' >> dummy-hello.c -@@ -2613,14 +2626,14 @@ - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -pipe" - cat > conftest.$ac_ext < - int main() { - printf("Hello World\n"); - ; return 0; } - EOF --if { (eval echo configure:2624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - _res_gcc_pipe="yes" - else -@@ -2653,7 +2666,7 @@ - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2657: checking for $ac_word" >&5 -+echo "configure:2670: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2886,17 +2899,17 @@ - DSO_LDOPTS='-brtl -bM:SRE -bnoentry -bexpall' - ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 --echo "configure:2890: checking for sys/atomic_op.h" >&5 -+echo "configure:2903: checking for sys/atomic_op.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2913: \"$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 - rm -rf conftest* -@@ -3052,7 +3065,7 @@ - _DEBUG_FLAGS='-gdwarf-2 -O0' - MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@' - echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6 --echo "configure:3056: checking for gethostbyaddr in -lbind" >&5 -+echo "configure:3069: checking for gethostbyaddr in -lbind" >&5 - ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3060,7 +3073,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lbind $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3088: \"$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 -@@ -3174,7 +3187,7 @@ - PR_MD_ASFILES=os_BSD_OS_386_2.s - ;; - -- bsdi4.*) -+ bsdi4.* | bsdi5.*) - cat >> confdefs.h <<\EOF - #define _PR_SELECT_CONST_TIMEVAL 1 - EOF -@@ -3200,7 +3213,7 @@ - DSO_LDOPTS='-shared -Wl,-soname,$(@:$(OBJDIR)/%.so=%.so)' - STRIP="$STRIP -d" - case "$target_os" in -- bsdi4.2*) -+ bsdi4.2* | bsdi4.3* | bsdi5.*) - cat >> confdefs.h <<\EOF - #define _PR_HAVE_GETPROTO_R 1 - EOF -@@ -3274,6 +3287,22 @@ - USE_PTHREADS=1 - MDCPUCFG_H=_darwin.cfg - PR_MD_CSRCS=darwin.c -+ -+ -+ MACOS_VERSION_MAJOR=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 1` -+ MACOS_VERSION_MINOR=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 2` -+ MACOS_VERSION_MICRO=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 3` -+ if test -z "$MACOS_VERSION_MINOR"; then -+ MACOS_VERSION_MINOR=0 -+ fi -+ if test -z "$MACOS_VERSION_MICRO"; then -+ MACOS_VERSION_MICRO=0 -+ fi -+ MACOS_DEPLOYMENT_TARGET=`printf "%02d%02d%02d" "$MACOS_VERSION_MAJOR" "$MACOS_VERSION_MINOR" "$MACOS_VERSION_MICRO"` -+ cat >> confdefs.h <&6 --echo "configure:4212: checking for machine/builtins.h" >&5 -+echo "configure:4238: checking for machine/builtins.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4248: \"$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 - rm -rf conftest* -@@ -4726,12 +4752,12 @@ - if test -z "$SKIP_LIBRARY_CHECKS"; then - - echo $ac_n "checking for dlopen""... $ac_c" 1>&6 --echo "configure:4730: checking for dlopen" >&5 -+echo "configure:4756: 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:4784: \"$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 -@@ -4773,7 +4799,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:4777: checking for dlopen in -ldl" >&5 -+echo "configure:4803: 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 -@@ -4781,7 +4807,7 @@ - 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:4822: \"$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 -@@ -4820,13 +4846,13 @@ - - if test $ac_cv_prog_gcc = yes; then - echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 --echo "configure:4824: checking whether ${CC-cc} needs -traditional" >&5 -+echo "configure:4850: 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 -@@ -4844,7 +4870,7 @@ - - if test $ac_cv_prog_gcc_traditional = no; then - cat > conftest.$ac_ext < - Autoconf TCGETA -@@ -4868,12 +4894,12 @@ - for ac_func in lchown strerror - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4872: checking for $ac_func" >&5 -+echo "configure:4898: 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:4926: \"$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 -@@ -4935,7 +4961,7 @@ - if test -z "$GNU_CC"; then - - echo $ac_n "checking for +Olit support""... $ac_c" 1>&6 --echo "configure:4939: checking for +Olit support" >&5 -+echo "configure:4965: checking for +Olit support" >&5 - if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4969,7 +4995,7 @@ - - - echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 --echo "configure:4973: checking for pthread_create in -lpthreads" >&5 -+echo "configure:4999: checking for pthread_create in -lpthreads" >&5 - echo " - #include - void *foo(void *v) { return v; } -@@ -4991,7 +5017,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 --echo "configure:4995: checking for pthread_create in -lpthread" >&5 -+echo "configure:5021: checking for pthread_create in -lpthread" >&5 - echo " - #include - void *foo(void *v) { return v; } -@@ -5013,7 +5039,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 --echo "configure:5017: checking for pthread_create in -lc_r" >&5 -+echo "configure:5043: checking for pthread_create in -lc_r" >&5 - echo " - #include - void *foo(void *v) { return v; } -@@ -5035,7 +5061,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 --echo "configure:5039: checking for pthread_create in -lc" >&5 -+echo "configure:5065: checking for pthread_create in -lc" >&5 - echo " - #include - void *foo(void *v) { return v; } -@@ -5187,7 +5213,7 @@ - rm -f conftest* - ac_cv_have_dash_pthread=no - echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 --echo "configure:5191: checking whether ${CC-cc} accepts -pthread" >&5 -+echo "configure:5217: 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 -@@ -5210,7 +5236,7 @@ - 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:5214: checking whether ${CC-cc} accepts -pthreads" >&5 -+echo "configure:5240: 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 -@@ -5581,6 +5607,7 @@ - - - -+ - MAKEFILES=" - Makefile - config/Makefile -@@ -5841,6 +5868,7 @@ - s%@OS_ARCH@%$OS_ARCH%g - s%@OS_RELEASE@%$OS_RELEASE%g - s%@OS_TEST@%$OS_TEST%g -+s%@MACOS_DEPLOYMENT_TARGET@%$MACOS_DEPLOYMENT_TARGET%g - s%@DEFINES@%$DEFINES%g - s%@AR_FLAGS@%$AR_FLAGS%g - s%@ASFLAGS@%$ASFLAGS%g -diff -Nur nspr-4.2.2/mozilla/nsprpub/configure.in nspr-4.2.2.b/mozilla/nsprpub/configure.in ---- nspr-4.2.2/mozilla/nsprpub/configure.in Thu Sep 19 02:16:13 2002 -+++ nspr-4.2.2.b/mozilla/nsprpub/configure.in Thu Sep 26 14:46:25 2002 -@@ -55,6 +55,7 @@ - USE_CPLUS= - USE_IPV6= - USE_MDUPDATE= -+MACOS_DEPLOYMENT_TARGET= - _OPTIMIZE_FLAGS=-O - _DEBUG_FLAGS=-g - MOZ_DEBUG=1 -@@ -215,6 +216,12 @@ - USE_MDUPDATE=1 - fi ]) - -+AC_ARG_ENABLE(macos-target, -+ [ --enable-macos-target=VER (default=10.1) -+ Set the minimum MacOS version needed at runtime], -+ [MACOS_DEPLOYMENT_TARGET_STR=$enableval], -+ [MACOS_DEPLOYMENT_TARGET_STR=10.1]) -+ - dnl ======================================================== - dnl = - dnl = Set the threading model -@@ -813,7 +820,7 @@ - PR_MD_ASFILES=os_BSD_OS_386_2.s - ;; - -- bsdi4.*) -+ bsdi4.* | bsdi5.*) - AC_DEFINE(_PR_SELECT_CONST_TIMEVAL) - AC_DEFINE(_PR_BSDI_JMPBUF_IS_STRUCT) - AC_DEFINE(HAVE_DLL) -@@ -824,7 +831,7 @@ - DSO_LDOPTS='-shared -Wl,-soname,$(@:$(OBJDIR)/%.so=%.so)' - STRIP="$STRIP -d" - case "$target_os" in -- bsdi4.2*) -+ bsdi4.2* | bsdi4.3* | bsdi5.*) - AC_DEFINE(_PR_HAVE_GETPROTO_R) - AC_DEFINE(_PR_HAVE_GETPROTO_R_POINTER) - ;; -@@ -862,6 +869,22 @@ - USE_PTHREADS=1 - MDCPUCFG_H=_darwin.cfg - PR_MD_CSRCS=darwin.c -+ -+ dnl The C preprocessor can only handle integers in comparisons, so -+ dnl convert the version to the form AABBCC where AA=major release, -+ dnl BB=minor release, and CC=point/micro release. -+ -+ MACOS_VERSION_MAJOR=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 1` -+ MACOS_VERSION_MINOR=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 2` -+ MACOS_VERSION_MICRO=`echo $MACOS_DEPLOYMENT_TARGET_STR | cut -d . -f 3` -+ if test -z "$MACOS_VERSION_MINOR"; then -+ MACOS_VERSION_MINOR=0 -+ fi -+ if test -z "$MACOS_VERSION_MICRO"; then -+ MACOS_VERSION_MICRO=0 -+ fi -+ MACOS_DEPLOYMENT_TARGET=`printf "%02d%02d%02d" "$MACOS_VERSION_MAJOR" "$MACOS_VERSION_MINOR" "$MACOS_VERSION_MICRO"` -+ AC_DEFINE_UNQUOTED(MACOS_DEPLOYMENT_TARGET, $MACOS_DEPLOYMENT_TARGET) - ;; - - *-dgux*) -@@ -1187,11 +1210,8 @@ - AC_DEFINE(NONAMELESSUNION) - MKSHLIB='$(DLLTOOL) --as=$(AS) -k --dllname $*.dll --output-lib $@' - else -- case "$target" in -- *-mingw*|*-cygwin*) -- CYGWIN_WRAPPER='sh $(topsrcdir)/build/cygwin-wrapper' -- ;; -- esac -+ topsrcdir=$srcdir -+ CYGWIN_WRAPPER='sh $(topsrcdir)/build/cygwin-wrapper' - CC='$(CYGWIN_WRAPPER) cl' - CXX='$(CYGWIN_WRAPPER) cl' - LD=link -@@ -2335,6 +2355,7 @@ - AC_SUBST(OS_ARCH) - AC_SUBST(OS_RELEASE) - AC_SUBST(OS_TEST) -+AC_SUBST(MACOS_DEPLOYMENT_TARGET) - - AC_SUBST(DEFINES) - AC_SUBST(DEFS) -diff -Nur nspr-4.2.2/mozilla/nsprpub/pr/include/md/_bsdi.h nspr-4.2.2.b/mozilla/nsprpub/pr/include/md/_bsdi.h ---- nspr-4.2.2/mozilla/nsprpub/pr/include/md/_bsdi.h Tue Jun 20 23:22:09 2000 -+++ nspr-4.2.2.b/mozilla/nsprpub/pr/include/md/_bsdi.h Thu Sep 12 16:53:38 2002 -@@ -39,6 +39,8 @@ - * Internal configuration macros - */ - -+#include /* for _BSDI_VERSION */ -+ - #define PR_LINKER_ARCH "bsdi" - #define _PR_SI_SYSNAME "BSDI" - #if defined(__i386__) -@@ -61,6 +63,14 @@ - - #define USE_SETJMP - -+/* BSD/OS 4.3 and newer all have IPv6 support */ -+#if _BSDI_VERSION >= 200105 -+#define _PR_INET6 -+#define _PR_HAVE_GETIPNODEBYNAME -+#define _PR_HAVE_GETIPNODEBYADDR -+#define _PR_INET6_PROBE -+#endif -+ - #ifndef _PR_PTHREADS - - #include -diff -Nur nspr-4.2.2/mozilla/nsprpub/pr/include/prtypes.h nspr-4.2.2.b/mozilla/nsprpub/pr/include/prtypes.h ---- nspr-4.2.2/mozilla/nsprpub/pr/include/prtypes.h Sun Feb 3 05:34:50 2002 -+++ nspr-4.2.2.b/mozilla/nsprpub/pr/include/prtypes.h Wed Sep 18 16:20:01 2002 -@@ -280,6 +280,18 @@ - #endif - - /************************************************************************ -+ * MACROS: PR_INT8_MAX -+ * PR_INT8_MIN -+ * PR_UINT8_MAX -+ * DESCRIPTION: -+ * The maximum and minimum values of a PRInt8 or PRUint8. -+************************************************************************/ -+ -+#define PR_INT8_MAX 127 -+#define PR_INT8_MIN (-128) -+#define PR_UINT8_MAX 255U -+ -+/************************************************************************ - ** TYPES: PRUint16 - ** PRInt16 - ** DESCRIPTION: -@@ -293,6 +305,18 @@ - #endif - - /************************************************************************ -+ * MACROS: PR_INT16_MAX -+ * PR_INT16_MIN -+ * PR_UINT16_MAX -+ * DESCRIPTION: -+ * The maximum and minimum values of a PRInt16 or PRUint16. -+************************************************************************/ -+ -+#define PR_INT16_MAX 32767 -+#define PR_INT16_MIN (-32768) -+#define PR_UINT16_MAX 65535U -+ -+/************************************************************************ - ** TYPES: PRUint32 - ** PRInt32 - ** DESCRIPTION: -@@ -313,6 +337,18 @@ - #endif - - /************************************************************************ -+ * MACROS: PR_INT32_MAX -+ * PR_INT32_MIN -+ * PR_UINT32_MAX -+ * DESCRIPTION: -+ * The maximum and minimum values of a PRInt32 or PRUint32. -+************************************************************************/ -+ -+#define PR_INT32_MAX PR_INT32(2147483647) -+#define PR_INT32_MIN (-PR_INT32_MAX - 1) -+#define PR_UINT32_MAX PR_UINT32(4294967295) -+ -+/************************************************************************ - ** TYPES: PRUint64 - ** PRInt64 - ** DESCRIPTION: -diff -Nur nspr-4.2.2/mozilla/nsprpub/pr/src/md/beos/bfile.c nspr-4.2.2.b/mozilla/nsprpub/pr/src/md/beos/bfile.c ---- nspr-4.2.2/mozilla/nsprpub/pr/src/md/beos/bfile.c Wed Jul 17 08:04:41 2002 -+++ nspr-4.2.2.b/mozilla/nsprpub/pr/src/md/beos/bfile.c Tue Sep 24 16:20:58 2002 -@@ -673,6 +673,10 @@ - } - } - } -+ else -+ { -+ pd->out_flags = 0; -+ } - } - - if (0 != ready) return ready; /* no need to block */ -diff -Nur nspr-4.2.2/mozilla/nsprpub/pr/src/md/os2/os2poll.c nspr-4.2.2.b/mozilla/nsprpub/pr/src/md/os2/os2poll.c ---- nspr-4.2.2/mozilla/nsprpub/pr/src/md/os2/os2poll.c Fri Jan 18 02:27:19 2002 -+++ nspr-4.2.2.b/mozilla/nsprpub/pr/src/md/os2/os2poll.c Tue Sep 24 16:21:00 2002 -@@ -214,6 +214,10 @@ - } - } - } -+ else -+ { -+ pd->out_flags = 0; -+ } - } - - if (0 != ready) -diff -Nur nspr-4.2.2/mozilla/nsprpub/pr/src/md/unix/uxpoll.c nspr-4.2.2.b/mozilla/nsprpub/pr/src/md/unix/uxpoll.c ---- nspr-4.2.2/mozilla/nsprpub/pr/src/md/unix/uxpoll.c Tue Jun 20 23:33:25 2000 -+++ nspr-4.2.2.b/mozilla/nsprpub/pr/src/md/unix/uxpoll.c Tue Sep 24 16:21:02 2002 -@@ -173,6 +173,7 @@ - { - /* make poll() ignore this entry */ - syspoll[index].fd = -1; -+ pds[index].out_flags = 0; - } - } - -@@ -384,6 +385,10 @@ - } - } - } -+ else -+ { -+ pd->out_flags = 0; -+ } - } - - if (0 != ready) return ready; /* no need to block */ -diff -Nur nspr-4.2.2/mozilla/nsprpub/pr/src/md/windows/w32poll.c nspr-4.2.2.b/mozilla/nsprpub/pr/src/md/windows/w32poll.c ---- nspr-4.2.2/mozilla/nsprpub/pr/src/md/windows/w32poll.c Tue Jun 20 23:34:58 2000 -+++ nspr-4.2.2.b/mozilla/nsprpub/pr/src/md/windows/w32poll.c Tue Sep 24 16:21:04 2002 -@@ -223,6 +223,10 @@ - } - } - } -+ else -+ { -+ pd->out_flags = 0; -+ } - } - - if (0 != ready) return ready; /* no need to block */ -diff -Nur nspr-4.2.2/mozilla/nsprpub/pr/src/misc/prdtoa.c nspr-4.2.2.b/mozilla/nsprpub/pr/src/misc/prdtoa.c ---- nspr-4.2.2/mozilla/nsprpub/pr/src/misc/prdtoa.c Fri Dec 28 04:35:14 2001 -+++ nspr-4.2.2.b/mozilla/nsprpub/pr/src/misc/prdtoa.c Thu Sep 26 14:46:29 2002 -@@ -197,6 +197,16 @@ - #endif - #else - #include "float.h" -+/* -+ * MacOS 10.2 defines the macro FLT_ROUNDS to an internal function -+ * which does not exist on 10.1. We can safely #define it to 1 here -+ * to allow 10.2 builds to run on 10.1, since we can't use fesetround() -+ * (which does not exist on 10.1 either). -+ */ -+#if defined(MACOS_DEPLOYMENT_TARGET) && (MACOS_DEPLOYMENT_TARGET < 100200) -+#undef FLT_ROUNDS -+#define FLT_ROUNDS 1 -+#endif - #endif - #ifndef __MATH_H__ - #include "math.h" -diff -Nur nspr-4.2.2/mozilla/nsprpub/pr/src/pthreads/ptio.c nspr-4.2.2.b/mozilla/nsprpub/pr/src/pthreads/ptio.c ---- nspr-4.2.2/mozilla/nsprpub/pr/src/pthreads/ptio.c Thu Jun 13 20:05:26 2002 -+++ nspr-4.2.2.b/mozilla/nsprpub/pr/src/pthreads/ptio.c Tue Sep 24 16:21:06 2002 -@@ -3824,6 +3824,7 @@ - { - /* make poll() ignore this entry */ - syspoll[index].fd = -1; -+ pds[index].out_flags = 0; - } - } - if (0 == ready) -@@ -4085,6 +4086,10 @@ - } - } - } -+ else -+ { -+ pds[index].out_flags = 0; -+ } - } - if (0 == ready) - {