patches/nspr.configure.patch

   1 --- nspr-4.7.3.orig/mozilla/nsprpub/configure   2008-11-04 19:07:16.000000000 +0100
   2 +++ nspr-4.7.3/mozilla/nsprpub/configure        2008-11-09 14:36:20.000000000 +0100
   3 @@ -36,7 +36,7 @@
   4  ac_help="$ac_help
   5    --enable-n32            Enable n32 ABI support (IRIX only)"
   6  ac_help="$ac_help
   7 -  --enable-64bit          Enable 64-bit support (on certain platforms)"
   8 +  --disable-64bit         Disable 64-bit support (on 64-bit platforms)"
   9  ac_help="$ac_help
  10    --enable-mdupdate       Enable use of certain compilers' mdupdate feature"
  11  ac_help="$ac_help
  12 @@ -696,7 +696,7 @@
  13  USE_USER_PTHREADS=
  14  USE_NSPR_THREADS=
  15  USE_N32=
  16 -USE_64=
  17 +USE_64=maybe
  18  USE_CPLUS=
  19  USE_IPV6=
  20  USE_MDUPDATE=
  21 @@ -917,12 +917,44 @@
  22  # Check whether --enable-64bit or --disable-64bit was given.
  23  if test "${enable_64bit+set}" = set; then
  24    enableval="$enable_64bit"
  25 -   if test "$enableval" = "yes"; then
  26 +   if test "$enableval" = "no"; then
  27 +           USE_64=
  28 +      else
  29             USE_64=1
  30        fi
  31  fi
  32
  33
  34 +if test "${USE_64}"; then
  35 +    echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6
  36 +echo "configure:931: checking for 64-bit OS" >&5
  37 +    cat > conftest.$ac_ext <<EOF
  38 +#line 933 "configure"
  39 +#include "confdefs.h"
  40 +
  41 +int main() {
  42 +int assert[(sizeof(long) == 8) ? 1: -1]
  43 +; return 0; }
  44 +EOF
  45 +if { (eval echo configure:940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  46 +  rm -rf conftest*
  47 +  result="yes"
  48 +else
  49 +  echo "configure: failed program was:" >&5
  50 +  cat conftest.$ac_ext >&5
  51 +  rm -rf conftest*
  52 +  result="no"
  53 +fi
  54 +rm -f conftest*
  55 +    echo "$ac_t"""$result"" 1>&6
  56 +    if test "$result" = "no" && test "$USE_64" = 1; then
  57 +        { echo "configure: error: Can't --enable-64bit on non 64-bit platforms" 1>&2; exit 1; }
  58 +    fi
  59 +    if test "$result" = "yes"; then
  60 +        USE_64=1
  61 +    fi
  62 +fi
  63 +
  64  # Check whether --enable-mdupdate or --disable-mdupdate was given.
  65  if test "${enable_mdupdate+set}" = set; then
  66    enableval="$enable_mdupdate"
  67 @@ -1064,7 +1096,7 @@
  68      # Extract the first word of "$WHOAMI whoami", so it can be a program name with args.
  69  set dummy $WHOAMI whoami; ac_word=$2
  70  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  71 -echo "configure:1068: checking for $ac_word" >&5
  72 +echo "configure:1100: checking for $ac_word" >&5
  73  if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then
  74    echo $ac_n "(cached) $ac_c" 1>&6
  75  else
  76 @@ -1135,13 +1167,13 @@
  77      _SAVE_LDFLAGS="$LDFLAGS"
  78
  79      echo $ac_n "checking for $host compiler""... $ac_c" 1>&6
  80 -echo "configure:1139: checking for $host compiler" >&5
  81 +echo "configure:1171: checking for $host compiler" >&5
  82      for ac_prog in $HOST_CC gcc cc /usr/ucb/cc
  83  do
  84  # Extract the first word of "$ac_prog", so it can be a program name with args.
  85  set dummy $ac_prog; ac_word=$2
  86  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
  87 -echo "configure:1145: checking for $ac_word" >&5
  88 +echo "configure:1177: checking for $ac_word" >&5
  89  if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then
  90    echo $ac_n "(cached) $ac_c" 1>&6
  91  else
  92 @@ -1187,16 +1219,16 @@
  93      LDFLAGS="$HOST_LDFLAGS"
  94
  95      echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
  96 -echo "configure:1191: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
  97 +echo "configure:1223: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
  98      cat > conftest.$ac_ext <<EOF
  99 -#line 1193 "configure"
 100 +#line 1225 "configure"
 101  #include "confdefs.h"
 102
 103  int main() {
 104  return(0);
 105  ; return 0; }
 106  EOF
 107 -if { (eval echo configure:1200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 108 +if { (eval echo configure:1232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 109    rm -rf conftest*
 110    ac_cv_prog_host_cc_works=1 echo "$ac_t""yes" 1>&6
 111  else
 112 @@ -1225,7 +1257,7 @@
 113  # Extract the first word of "$ac_prog", so it can be a program name with args.
 114  set dummy $ac_prog; ac_word=$2
 115  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 116 -echo "configure:1229: checking for $ac_word" >&5
 117 +echo "configure:1261: checking for $ac_word" >&5
 118  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
 119    echo $ac_n "(cached) $ac_c" 1>&6
 120  else
 121 @@ -1259,7 +1291,7 @@
 122      # Extract the first word of "gcc", so it can be a program name with args.
 123  set dummy gcc; ac_word=$2
 124  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 125 -echo "configure:1263: checking for $ac_word" >&5
 126 +echo "configure:1295: checking for $ac_word" >&5
 127  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
 128    echo $ac_n "(cached) $ac_c" 1>&6
 129  else
 130 @@ -1289,7 +1321,7 @@
 131    # Extract the first word of "cc", so it can be a program name with args.
 132  set dummy cc; ac_word=$2
 133  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 134 -echo "configure:1293: checking for $ac_word" >&5
 135 +echo "configure:1325: checking for $ac_word" >&5
 136  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
 137    echo $ac_n "(cached) $ac_c" 1>&6
 138  else
 139 @@ -1340,7 +1372,7 @@
 140        # Extract the first word of "cl", so it can be a program name with args.
 141  set dummy cl; ac_word=$2
 142  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 143 -echo "configure:1344: checking for $ac_word" >&5
 144 +echo "configure:1376: checking for $ac_word" >&5
 145  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
 146    echo $ac_n "(cached) $ac_c" 1>&6
 147  else
 148 @@ -1372,7 +1404,7 @@
 149  fi
 150
 151  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 152 -echo "configure:1376: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 153 +echo "configure:1408: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 154
 155  ac_ext=c
 156  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 157 @@ -1383,12 +1415,12 @@
 158
 159  cat > conftest.$ac_ext << EOF
 160
 161 -#line 1387 "configure"
 162 +#line 1419 "configure"
 163  #include "confdefs.h"
 164
 165  main(){return(0);}
 166  EOF
 167 -if { (eval echo configure:1392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 168 +if { (eval echo configure:1424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 169    ac_cv_prog_cc_works=yes
 170    # If we can't run a trivial program, we are probably using a cross compiler.
 171    if (./conftest; exit) 2>/dev/null; then
 172 @@ -1414,12 +1446,12 @@
 173    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 174  fi
 175  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
 176 -echo "configure:1418: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 177 +echo "configure:1450: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 178  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 179  cross_compiling=$ac_cv_prog_cc_cross
 180
 181  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
 182 -echo "configure:1423: checking whether we are using GNU C" >&5
 183 +echo "configure:1455: checking whether we are using GNU C" >&5
 184  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
 185    echo $ac_n "(cached) $ac_c" 1>&6
 186  else
 187 @@ -1428,7 +1460,7 @@
 188    yes;
 189  #endif
 190  EOF
 191 -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
 192 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
 193    ac_cv_prog_gcc=yes
 194  else
 195    ac_cv_prog_gcc=no
 196 @@ -1447,7 +1479,7 @@
 197  ac_save_CFLAGS="$CFLAGS"
 198  CFLAGS=
 199  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
 200 -echo "configure:1451: checking whether ${CC-cc} accepts -g" >&5
 201 +echo "configure:1483: checking whether ${CC-cc} accepts -g" >&5
 202  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
 203    echo $ac_n "(cached) $ac_c" 1>&6
 204  else
 205 @@ -1484,7 +1516,7 @@
 206  # Extract the first word of "$ac_prog", so it can be a program name with args.
 207  set dummy $ac_prog; ac_word=$2
 208  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 209 -echo "configure:1488: checking for $ac_word" >&5
 210 +echo "configure:1520: checking for $ac_word" >&5
 211  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
 212    echo $ac_n "(cached) $ac_c" 1>&6
 213  else
 214 @@ -1520,7 +1552,7 @@
 215  # Extract the first word of "$ac_prog", so it can be a program name with args.
 216  set dummy $ac_prog; ac_word=$2
 217  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 218 -echo "configure:1524: checking for $ac_word" >&5
 219 +echo "configure:1556: checking for $ac_word" >&5
 220  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
 221    echo $ac_n "(cached) $ac_c" 1>&6
 222  else
 223 @@ -1552,7 +1584,7 @@
 224
 225
 226  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 227 -echo "configure:1556: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 228 +echo "configure:1588: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 229
 230  ac_ext=C
 231  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 232 @@ -1563,12 +1595,12 @@
 233
 234  cat > conftest.$ac_ext << EOF
 235
 236 -#line 1567 "configure"
 237 +#line 1599 "configure"
 238  #include "confdefs.h"
 239
 240  int main(){return(0);}
 241  EOF
 242 -if { (eval echo configure:1572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 243 +if { (eval echo configure:1604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 244    ac_cv_prog_cxx_works=yes
 245    # If we can't run a trivial program, we are probably using a cross compiler.
 246    if (./conftest; exit) 2>/dev/null; then
 247 @@ -1594,12 +1626,12 @@
 248    { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 249  fi
 250  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
 251 -echo "configure:1598: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 252 +echo "configure:1630: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 253  echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 254  cross_compiling=$ac_cv_prog_cxx_cross
 255
 256  echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
 257 -echo "configure:1603: checking whether we are using GNU C++" >&5
 258 +echo "configure:1635: checking whether we are using GNU C++" >&5
 259  if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
 260    echo $ac_n "(cached) $ac_c" 1>&6
 261  else
 262 @@ -1608,7 +1640,7 @@
 263    yes;
 264  #endif
 265  EOF
 266 -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
 267 +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
 268    ac_cv_prog_gxx=yes
 269  else
 270    ac_cv_prog_gxx=no
 271 @@ -1627,7 +1659,7 @@
 272  ac_save_CXXFLAGS="$CXXFLAGS"
 273  CXXFLAGS=
 274  echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
 275 -echo "configure:1631: checking whether ${CXX-g++} accepts -g" >&5
 276 +echo "configure:1663: checking whether ${CXX-g++} accepts -g" >&5
 277  if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
 278    echo $ac_n "(cached) $ac_c" 1>&6
 279  else
 280 @@ -1672,7 +1704,7 @@
 281  # Extract the first word of "$ac_prog", so it can be a program name with args.
 282  set dummy $ac_prog; ac_word=$2
 283  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 284 -echo "configure:1676: checking for $ac_word" >&5
 285 +echo "configure:1708: checking for $ac_word" >&5
 286  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
 287    echo $ac_n "(cached) $ac_c" 1>&6
 288  else
 289 @@ -1707,7 +1739,7 @@
 290  # Extract the first word of "$ac_prog", so it can be a program name with args.
 291  set dummy $ac_prog; ac_word=$2
 292  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 293 -echo "configure:1711: checking for $ac_word" >&5
 294 +echo "configure:1743: checking for $ac_word" >&5
 295  if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
 296    echo $ac_n "(cached) $ac_c" 1>&6
 297  else
 298 @@ -1742,7 +1774,7 @@
 299  # Extract the first word of "$ac_prog", so it can be a program name with args.
 300  set dummy $ac_prog; ac_word=$2
 301  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 302 -echo "configure:1746: checking for $ac_word" >&5
 303 +echo "configure:1778: checking for $ac_word" >&5
 304  if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
 305    echo $ac_n "(cached) $ac_c" 1>&6
 306  else
 307 @@ -1777,7 +1809,7 @@
 308  # Extract the first word of "$ac_prog", so it can be a program name with args.
 309  set dummy $ac_prog; ac_word=$2
 310  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 311 -echo "configure:1781: checking for $ac_word" >&5
 312 +echo "configure:1813: checking for $ac_word" >&5
 313  if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
 314    echo $ac_n "(cached) $ac_c" 1>&6
 315  else
 316 @@ -1812,7 +1844,7 @@
 317  # Extract the first word of "$ac_prog", so it can be a program name with args.
 318  set dummy $ac_prog; ac_word=$2
 319  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 320 -echo "configure:1816: checking for $ac_word" >&5
 321 +echo "configure:1848: checking for $ac_word" >&5
 322  if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
 323    echo $ac_n "(cached) $ac_c" 1>&6
 324  else
 325 @@ -1847,7 +1879,7 @@
 326  # Extract the first word of "$ac_prog", so it can be a program name with args.
 327  set dummy $ac_prog; ac_word=$2
 328  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 329 -echo "configure:1851: checking for $ac_word" >&5
 330 +echo "configure:1883: checking for $ac_word" >&5
 331  if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
 332    echo $ac_n "(cached) $ac_c" 1>&6
 333  else
 334 @@ -1882,7 +1914,7 @@
 335      # Extract the first word of "gcc", so it can be a program name with args.
 336  set dummy gcc; ac_word=$2
 337  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 338 -echo "configure:1886: checking for $ac_word" >&5
 339 +echo "configure:1918: checking for $ac_word" >&5
 340  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
 341    echo $ac_n "(cached) $ac_c" 1>&6
 342  else
 343 @@ -1912,7 +1944,7 @@
 344    # Extract the first word of "cc", so it can be a program name with args.
 345  set dummy cc; ac_word=$2
 346  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 347 -echo "configure:1916: checking for $ac_word" >&5
 348 +echo "configure:1948: checking for $ac_word" >&5
 349  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
 350    echo $ac_n "(cached) $ac_c" 1>&6
 351  else
 352 @@ -1963,7 +1995,7 @@
 353        # Extract the first word of "cl", so it can be a program name with args.
 354  set dummy cl; ac_word=$2
 355  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 356 -echo "configure:1967: checking for $ac_word" >&5
 357 +echo "configure:1999: checking for $ac_word" >&5
 358  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
 359    echo $ac_n "(cached) $ac_c" 1>&6
 360  else
 361 @@ -1995,7 +2027,7 @@
 362  fi
 363
 364  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 365 -echo "configure:1999: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 366 +echo "configure:2031: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 367
 368  ac_ext=c
 369  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 370 @@ -2006,12 +2038,12 @@
 371
 372  cat > conftest.$ac_ext << EOF
 373
 374 -#line 2010 "configure"
 375 +#line 2042 "configure"
 376  #include "confdefs.h"
 377
 378  main(){return(0);}
 379  EOF
 380 -if { (eval echo configure:2015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 381 +if { (eval echo configure:2047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 382    ac_cv_prog_cc_works=yes
 383    # If we can't run a trivial program, we are probably using a cross compiler.
 384    if (./conftest; exit) 2>/dev/null; then
 385 @@ -2037,12 +2069,12 @@
 386    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 387  fi
 388  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
 389 -echo "configure:2041: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 390 +echo "configure:2073: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 391  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 392  cross_compiling=$ac_cv_prog_cc_cross
 393
 394  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
 395 -echo "configure:2046: checking whether we are using GNU C" >&5
 396 +echo "configure:2078: checking whether we are using GNU C" >&5
 397  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
 398    echo $ac_n "(cached) $ac_c" 1>&6
 399  else
 400 @@ -2051,7 +2083,7 @@
 401    yes;
 402  #endif
 403  EOF
 404 -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
 405 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
 406    ac_cv_prog_gcc=yes
 407  else
 408    ac_cv_prog_gcc=no
 409 @@ -2070,7 +2102,7 @@
 410  ac_save_CFLAGS="$CFLAGS"
 411  CFLAGS=
 412  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
 413 -echo "configure:2074: checking whether ${CC-cc} accepts -g" >&5
 414 +echo "configure:2106: checking whether ${CC-cc} accepts -g" >&5
 415  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
 416    echo $ac_n "(cached) $ac_c" 1>&6
 417  else
 418 @@ -2110,7 +2142,7 @@
 419  # Extract the first word of "$ac_prog", so it can be a program name with args.
 420  set dummy $ac_prog; ac_word=$2
 421  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 422 -echo "configure:2114: checking for $ac_word" >&5
 423 +echo "configure:2146: checking for $ac_word" >&5
 424  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
 425    echo $ac_n "(cached) $ac_c" 1>&6
 426  else
 427 @@ -2142,7 +2174,7 @@
 428
 429
 430  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 431 -echo "configure:2146: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 432 +echo "configure:2178: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 433
 434  ac_ext=C
 435  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 436 @@ -2153,12 +2185,12 @@
 437
 438  cat > conftest.$ac_ext << EOF
 439
 440 -#line 2157 "configure"
 441 +#line 2189 "configure"
 442  #include "confdefs.h"
 443
 444  int main(){return(0);}
 445  EOF
 446 -if { (eval echo configure:2162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 447 +if { (eval echo configure:2194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 448    ac_cv_prog_cxx_works=yes
 449    # If we can't run a trivial program, we are probably using a cross compiler.
 450    if (./conftest; exit) 2>/dev/null; then
 451 @@ -2184,12 +2216,12 @@
 452    { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 453  fi
 454  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
 455 -echo "configure:2188: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 456 +echo "configure:2220: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 457  echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 458  cross_compiling=$ac_cv_prog_cxx_cross
 459
 460  echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
 461 -echo "configure:2193: checking whether we are using GNU C++" >&5
 462 +echo "configure:2225: checking whether we are using GNU C++" >&5
 463  if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
 464    echo $ac_n "(cached) $ac_c" 1>&6
 465  else
 466 @@ -2198,7 +2230,7 @@
 467    yes;
 468  #endif
 469  EOF
 470 -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
 471 +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
 472    ac_cv_prog_gxx=yes
 473  else
 474    ac_cv_prog_gxx=no
 475 @@ -2217,7 +2249,7 @@
 476  ac_save_CXXFLAGS="$CXXFLAGS"
 477  CXXFLAGS=
 478  echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
 479 -echo "configure:2221: checking whether ${CXX-g++} accepts -g" >&5
 480 +echo "configure:2253: checking whether ${CXX-g++} accepts -g" >&5
 481  if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
 482    echo $ac_n "(cached) $ac_c" 1>&6
 483  else
 484 @@ -2251,7 +2283,7 @@
 485          fi
 486      fi
 487      echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
 488 -echo "configure:2255: checking how to run the C preprocessor" >&5
 489 +echo "configure:2287: checking how to run the C preprocessor" >&5
 490  # On Suns, sometimes $CPP names a directory.
 491  if test -n "$CPP" && test -d "$CPP"; then
 492    CPP=
 493 @@ -2266,13 +2298,13 @@
 494    # On the NeXT, cc -E runs the code through the compiler's parser,
 495    # not just through cpp.
 496    cat > conftest.$ac_ext <<EOF
 497 -#line 2270 "configure"
 498 +#line 2302 "configure"
 499  #include "confdefs.h"
 500  #include <assert.h>
 501  Syntax Error
 502  EOF
 503  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 504 -{ (eval echo configure:2276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 505 +{ (eval echo configure:2308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 506  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 507  if test -z "$ac_err"; then
 508    :
 509 @@ -2283,13 +2315,13 @@
 510    rm -rf conftest*
 511    CPP="${CC-cc} -E -traditional-cpp"
 512    cat > conftest.$ac_ext <<EOF
 513 -#line 2287 "configure"
 514 +#line 2319 "configure"
 515  #include "confdefs.h"
 516  #include <assert.h>
 517  Syntax Error
 518  EOF
 519  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 520 -{ (eval echo configure:2293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 521 +{ (eval echo configure:2325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 522  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 523  if test -z "$ac_err"; then
 524    :
 525 @@ -2300,13 +2332,13 @@
 526    rm -rf conftest*
 527    CPP="${CC-cc} -nologo -E"
 528    cat > conftest.$ac_ext <<EOF
 529 -#line 2304 "configure"
 530 +#line 2336 "configure"
 531  #include "confdefs.h"
 532  #include <assert.h>
 533  Syntax Error
 534  EOF
 535  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 536 -{ (eval echo configure:2310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 537 +{ (eval echo configure:2342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 538  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 539  if test -z "$ac_err"; then
 540    :
 541 @@ -2333,7 +2365,7 @@
 542      # Extract the first word of "ranlib", so it can be a program name with args.
 543  set dummy ranlib; ac_word=$2
 544  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 545 -echo "configure:2337: checking for $ac_word" >&5
 546 +echo "configure:2369: checking for $ac_word" >&5
 547  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
 548    echo $ac_n "(cached) $ac_c" 1>&6
 549  else
 550 @@ -2365,7 +2397,7 @@
 551  # Extract the first word of "$ac_prog", so it can be a program name with args.
 552  set dummy $ac_prog; ac_word=$2
 553  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 554 -echo "configure:2369: checking for $ac_word" >&5
 555 +echo "configure:2401: checking for $ac_word" >&5
 556  if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then
 557    echo $ac_n "(cached) $ac_c" 1>&6
 558  else
 559 @@ -2406,7 +2438,7 @@
 560  # Extract the first word of "$ac_prog", so it can be a program name with args.
 561  set dummy $ac_prog; ac_word=$2
 562  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 563 -echo "configure:2410: checking for $ac_word" >&5
 564 +echo "configure:2442: checking for $ac_word" >&5
 565  if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then
 566    echo $ac_n "(cached) $ac_c" 1>&6
 567  else
 568 @@ -2447,7 +2479,7 @@
 569  # Extract the first word of "$ac_prog", so it can be a program name with args.
 570  set dummy $ac_prog; ac_word=$2
 571  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 572 -echo "configure:2451: checking for $ac_word" >&5
 573 +echo "configure:2483: checking for $ac_word" >&5
 574  if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
 575    echo $ac_n "(cached) $ac_c" 1>&6
 576  else
 577 @@ -2488,7 +2520,7 @@
 578  # Extract the first word of "$ac_prog", so it can be a program name with args.
 579  set dummy $ac_prog; ac_word=$2
 580  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 581 -echo "configure:2492: checking for $ac_word" >&5
 582 +echo "configure:2524: checking for $ac_word" >&5
 583  if eval "test \"`echo '$''{'ac_cv_path_STRIP'+set}'`\" = set"; then
 584    echo $ac_n "(cached) $ac_c" 1>&6
 585  else
 586 @@ -2529,7 +2561,7 @@
 587  # Extract the first word of "$ac_prog", so it can be a program name with args.
 588  set dummy $ac_prog; ac_word=$2
 589  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 590 -echo "configure:2533: checking for $ac_word" >&5
 591 +echo "configure:2565: checking for $ac_word" >&5
 592  if eval "test \"`echo '$''{'ac_cv_path_WINDRES'+set}'`\" = set"; then
 593    echo $ac_n "(cached) $ac_c" 1>&6
 594  else
 595 @@ -2597,7 +2629,7 @@
 596  fi
 597
 598  echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
 599 -echo "configure:2601: checking for gcc -pipe support" >&5
 600 +echo "configure:2633: checking for gcc -pipe support" >&5
 601  if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
 602      echo '#include <stdio.h>' > dummy-hello.c
 603      echo 'int main() { printf("Hello World\n"); return 0; }' >> dummy-hello.c
 604 @@ -2612,14 +2644,14 @@
 605          _SAVE_CFLAGS=$CFLAGS
 606          CFLAGS="$CFLAGS -pipe"
 607          cat > conftest.$ac_ext <<EOF
 608 -#line 2616 "configure"
 609 +#line 2648 "configure"
 610  #include "confdefs.h"
 611   #include <stdio.h>
 612  int main() {
 613  printf("Hello World\n");
 614  ; return 0; }
 615  EOF
 616 -if { (eval echo configure:2623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 617 +if { (eval echo configure:2655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 618    rm -rf conftest*
 619    _res_gcc_pipe="yes"
 620  else
 621 @@ -2646,7 +2678,7 @@
 622
 623  if test "$GNU_CC"; then
 624      echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6
 625 -echo "configure:2650: checking for visibility(hidden) attribute" >&5
 626 +echo "configure:2682: checking for visibility(hidden) attribute" >&5
 627  if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then
 628    echo $ac_n "(cached) $ac_c" 1>&6
 629  else
 630 @@ -2670,7 +2702,7 @@
 631  EOF
 632
 633          echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6
 634 -echo "configure:2674: checking for visibility pragma support" >&5
 635 +echo "configure:2706: checking for visibility pragma support" >&5
 636  if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then
 637    echo $ac_n "(cached) $ac_c" 1>&6
 638  else
 639 @@ -2723,7 +2755,7 @@
 640  # Extract the first word of "$ac_prog", so it can be a program name with args.
 641  set dummy $ac_prog; ac_word=$2
 642  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 643 -echo "configure:2727: checking for $ac_word" >&5
 644 +echo "configure:2759: checking for $ac_word" >&5
 645  if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
 646    echo $ac_n "(cached) $ac_c" 1>&6
 647  else
 648 @@ -2980,17 +3012,17 @@
 649      DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib'
 650      ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'`
 651  echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6
 652 -echo "configure:2984: checking for sys/atomic_op.h" >&5
 653 +echo "configure:3016: checking for sys/atomic_op.h" >&5
 654  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 655    echo $ac_n "(cached) $ac_c" 1>&6
 656  else
 657    cat > conftest.$ac_ext <<EOF
 658 -#line 2989 "configure"
 659 +#line 3021 "configure"
 660  #include "confdefs.h"
 661  #include <sys/atomic_op.h>
 662  EOF
 663  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 664 -{ (eval echo configure:2994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 665 +{ (eval echo configure:3026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 666  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 667  if test -z "$ac_err"; then
 668    rm -rf conftest*
 669 @@ -3147,7 +3179,7 @@
 670          _DEBUG_FLAGS='-gdwarf-2 -O0'
 671          MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@'
 672          echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6
 673 -echo "configure:3151: checking for gethostbyaddr in -lbind" >&5
 674 +echo "configure:3183: checking for gethostbyaddr in -lbind" >&5
 675  ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'`
 676  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 677    echo $ac_n "(cached) $ac_c" 1>&6
 678 @@ -3155,7 +3187,7 @@
 679    ac_save_LIBS="$LIBS"
 680  LIBS="-lbind  $LIBS"
 681  cat > conftest.$ac_ext <<EOF
 682 -#line 3159 "configure"
 683 +#line 3191 "configure"
 684  #include "confdefs.h"
 685  /* Override any gcc2 internal prototype to avoid an error.  */
 686  /* We use char because int might match the return type of a gcc2
 687 @@ -3166,7 +3198,7 @@
 688  gethostbyaddr()
 689  ; return 0; }
 690  EOF
 691 -if { (eval echo configure:3170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 692 +if { (eval echo configure:3202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 693    rm -rf conftest*
 694    eval "ac_cv_lib_$ac_lib_var=yes"
 695  else
 696 @@ -3292,7 +3324,7 @@
 697
 698          MKSHLIB='$(CC) -o $@ $(DSO_LDOPTS)'
 699          DSO_CFLAGS=-fPIC
 700 -        DSO_LDOPTS='-shared -Wl,-soname,$(@:$(OBJDIR)/%.so=%.so)'
 701 +        DSO_LDOPTS='-shared -Wl,-soname,$(SONAME)'
 702          STRIP="$STRIP -d"
 703          case "$target_os" in
 704          bsdi4.2* | bsdi4.3* | bsdi5.*)
 705 @@ -3521,7 +3553,7 @@
 706      fi
 707      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
 708      DSO_CFLAGS=-fPIC
 709 -    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
 710 +    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(SONAME)'
 711      MDCPUCFG_H=_freebsd.cfg
 712      PR_MD_CSRCS=freebsd.c
 713      ;;
 714 @@ -3551,7 +3583,7 @@
 715  #define _USE_BIG_FDS 1
 716  EOF
 717
 718 -    DSO_LDOPTS='-b +h $(notdir $@)'
 719 +    DSO_LDOPTS='-b +h $(SONAME)'
 720      PR_MD_CSRCS=hpux.c
 721      if test "$OS_TEST" = "ia64"; then
 722          DLL_SUFFIX=so
 723 @@ -3905,7 +3937,7 @@
 724      PR_MD_CSRCS=linux.c
 725      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
 726      DSO_CFLAGS=-fPIC
 727 -    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
 728 +    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(SONAME)'
 729      _OPTIMIZE_FLAGS=-O2
 730      _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
 731                                     # combo is not yet good at debugging inlined
 732 @@ -4311,7 +4343,7 @@
 733          else
 734              OBJECT_FMT=ELF
 735              DLL_SUFFIX=so
 736 -            DSO_LDOPTS='-shared -Wl,-soname,$(notdir $@)'
 737 +            DSO_LDOPTS='-shared -Wl,-soname,$(SONAME)'
 738          fi
 739      fi
 740
 741 @@ -4402,7 +4434,7 @@
 742
 743      MDCPUCFG_H=_nto.cfg
 744      PR_MD_CSRCS=nto.c
 745 -    MKSHLIB='$(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(notdir $@) -o $@'
 746 +    MKSHLIB='$(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(SONAME) -o $@'
 747      DSO_CFLAGS=-fPIC
 748      DSO_LDOPTS=-shared
 749      OS_LIBS="$OS_LIBS -lsocket"
 750 @@ -4501,17 +4533,17 @@
 751          _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000"
 752          ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'`
 753  echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6
 754 -echo "configure:4505: checking for machine/builtins.h" >&5
 755 +echo "configure:4537: checking for machine/builtins.h" >&5
 756  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 757    echo $ac_n "(cached) $ac_c" 1>&6
 758  else
 759    cat > conftest.$ac_ext <<EOF
 760 -#line 4510 "configure"
 761 +#line 4542 "configure"
 762  #include "confdefs.h"
 763  #include <machine/builtins.h>
 764  EOF
 765  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 766 -{ (eval echo configure:4515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 767 +{ (eval echo configure:4547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 768  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 769  if test -z "$ac_err"; then
 770    rm -rf conftest*
 771 @@ -4561,7 +4593,7 @@
 772  EOF
 773
 774      fi
 775 -    DSO_LDOPTS='-shared -all -expect_unresolved "*" -soname $(notdir $@)'
 776 +    DSO_LDOPTS='-shared -all -expect_unresolved "*" -soname $(SONAME)'
 777      MDCPUCFG_H=_osf1.cfg
 778      PR_MD_CSRCS=osf1.c
 779      ;;
 780 @@ -4684,7 +4716,7 @@
 781          _OPTIMIZE_FLAGS='-O -F Olimit,4000'
 782      fi
 783
 784 -    DSO_LDOPTS='-G -z defs -h $(@:$(OBJDIR)/%.so=%.so)'
 785 +    DSO_LDOPTS='-G -z defs -h $(SONAME)'
 786
 787      if test "$OS_RELEASE" = "5.43"; then
 788          cat >> confdefs.h <<\EOF
 789 @@ -4771,10 +4803,10 @@
 790          if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
 791              GCC_USE_GNU_LD=1
 792          fi
 793 -        DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore'
 794 +        DSO_LDOPTS='-shared -Wl,-h,$(SONAME),-z,combreloc,-z,defs,-z,ignore'
 795      else
 796          DSO_CFLAGS=-KPIC
 797 -        DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore'
 798 +        DSO_LDOPTS='-G -h $(SONAME) -z combreloc -z defs -z ignore'
 799      fi
 800      if test -n "$GNU_CC"; then
 801          CFLAGS="$CFLAGS -Wall"
 802 @@ -5027,7 +5059,7 @@
 803      ;;
 804  *)
 805      echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
 806 -echo "configure:5031: checking for dlopen in -ldl" >&5
 807 +echo "configure:5063: checking for dlopen in -ldl" >&5
 808  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 809  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 810    echo $ac_n "(cached) $ac_c" 1>&6
 811 @@ -5035,7 +5067,7 @@
 812    ac_save_LIBS="$LIBS"
 813  LIBS="-ldl  $LIBS"
 814  cat > conftest.$ac_ext <<EOF
 815 -#line 5039 "configure"
 816 +#line 5071 "configure"
 817  #include "confdefs.h"
 818  /* Override any gcc2 internal prototype to avoid an error.  */
 819  /* We use char because int might match the return type of a gcc2
 820 @@ -5046,7 +5078,7 @@
 821  dlopen()
 822  ; return 0; }
 823  EOF
 824 -if { (eval echo configure:5050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 825 +if { (eval echo configure:5082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 826    rm -rf conftest*
 827    eval "ac_cv_lib_$ac_lib_var=yes"
 828  else
 829 @@ -5063,17 +5095,17 @@
 830    echo "$ac_t""yes" 1>&6
 831    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 832  echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
 833 -echo "configure:5067: checking for dlfcn.h" >&5
 834 +echo "configure:5099: checking for dlfcn.h" >&5
 835  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 836    echo $ac_n "(cached) $ac_c" 1>&6
 837  else
 838    cat > conftest.$ac_ext <<EOF
 839 -#line 5072 "configure"
 840 +#line 5104 "configure"
 841  #include "confdefs.h"
 842  #include <dlfcn.h>
 843  EOF
 844  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 845 -{ (eval echo configure:5077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 846 +{ (eval echo configure:5109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 847  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 848  if test -z "$ac_err"; then
 849    rm -rf conftest*
 850 @@ -5106,13 +5138,13 @@
 851
 852  if test $ac_cv_prog_gcc = yes; then
 853      echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
 854 -echo "configure:5110: checking whether ${CC-cc} needs -traditional" >&5
 855 +echo "configure:5142: checking whether ${CC-cc} needs -traditional" >&5
 856  if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
 857    echo $ac_n "(cached) $ac_c" 1>&6
 858  else
 859      ac_pattern="Autoconf.*'x'"
 860    cat > conftest.$ac_ext <<EOF
 861 -#line 5116 "configure"
 862 +#line 5148 "configure"
 863  #include "confdefs.h"
 864  #include <sgtty.h>
 865  Autoconf TIOCGETP
 866 @@ -5130,7 +5162,7 @@
 867
 868    if test $ac_cv_prog_gcc_traditional = no; then
 869      cat > conftest.$ac_ext <<EOF
 870 -#line 5134 "configure"
 871 +#line 5166 "configure"
 872  #include "confdefs.h"
 873  #include <termio.h>
 874  Autoconf TCGETA
 875 @@ -5154,12 +5186,12 @@
 876  for ac_func in lchown strerror
 877  do
 878  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 879 -echo "configure:5158: checking for $ac_func" >&5
 880 +echo "configure:5190: checking for $ac_func" >&5
 881  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
 882    echo $ac_n "(cached) $ac_c" 1>&6
 883  else
 884    cat > conftest.$ac_ext <<EOF
 885 -#line 5163 "configure"
 886 +#line 5195 "configure"
 887  #include "confdefs.h"
 888  /* System header to define __stub macros and hopefully few prototypes,
 889      which can conflict with char $ac_func(); below.  */
 890 @@ -5182,7 +5214,7 @@
 891
 892  ; return 0; }
 893  EOF
 894 -if { (eval echo configure:5186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 895 +if { (eval echo configure:5218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 896    rm -rf conftest*
 897    eval "ac_cv_func_$ac_func=yes"
 898  else
 899 @@ -5223,7 +5255,7 @@
 900  if test -z "$GNU_CC"; then
 901
 902      echo $ac_n "checking for +Olit support""... $ac_c" 1>&6
 903 -echo "configure:5227: checking for +Olit support" >&5
 904 +echo "configure:5259: checking for +Olit support" >&5
 905  if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then
 906    echo $ac_n "(cached) $ac_c" 1>&6
 907  else
 908 @@ -5262,7 +5294,7 @@
 909  *)
 910
 911  echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
 912 -echo "configure:5266: checking for pthread_create in -lpthreads" >&5
 913 +echo "configure:5298: checking for pthread_create in -lpthreads" >&5
 914  echo "
 915      #include <pthread.h>
 916      void *foo(void *v) { return v; }
 917 @@ -5284,7 +5316,7 @@
 918          echo "$ac_t""no" 1>&6
 919
 920  echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
 921 -echo "configure:5288: checking for pthread_create in -lpthread" >&5
 922 +echo "configure:5320: checking for pthread_create in -lpthread" >&5
 923  echo "
 924      #include <pthread.h>
 925      void *foo(void *v) { return v; }
 926 @@ -5306,7 +5338,7 @@
 927          echo "$ac_t""no" 1>&6
 928
 929  echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
 930 -echo "configure:5310: checking for pthread_create in -lc_r" >&5
 931 +echo "configure:5342: checking for pthread_create in -lc_r" >&5
 932  echo "
 933      #include <pthread.h>
 934      void *foo(void *v) { return v; }
 935 @@ -5328,7 +5360,7 @@
 936          echo "$ac_t""no" 1>&6
 937
 938  echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
 939 -echo "configure:5332: checking for pthread_create in -lc" >&5
 940 +echo "configure:5364: checking for pthread_create in -lc" >&5
 941  echo "
 942      #include <pthread.h>
 943      void *foo(void *v) { return v; }
 944 @@ -5460,7 +5492,7 @@
 945        rm -f conftest*
 946     ac_cv_have_dash_pthread=no
 947     echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
 948 -echo "configure:5464: checking whether ${CC-cc} accepts -pthread" >&5
 949 +echo "configure:5496: checking whether ${CC-cc} accepts -pthread" >&5
 950     echo 'int main() { return 0; }' | cat > conftest.c
 951     ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
 952     if test $? -eq 0; then
 953 @@ -5483,7 +5515,7 @@
 954                             ac_cv_have_dash_pthreads=no
 955      if test "$ac_cv_have_dash_pthread" = "no"; then
 956             echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
 957 -echo "configure:5487: checking whether ${CC-cc} accepts -pthreads" >&5
 958 +echo "configure:5519: checking whether ${CC-cc} accepts -pthreads" >&5
 959         echo 'int main() { return 0; }' | cat > conftest.c
 960             ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
 961         if test $? -eq 0; then
 962 @@ -5899,6 +5931,7 @@
 963  config/nsprincl.mk
 964  config/nsprincl.sh
 965  config/nspr-config
 966 +config/nspr.pc
 967  lib/Makefile
 968  lib/ds/Makefile
 969  lib/libc/Makefile
 970 @@ -6016,7 +6049,7 @@
 971  s%\]%\\&%g
 972  s%\$%$$%g
 973  EOF
 974 -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' ' | tr '\015' ' '`
 975 +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
 976  rm -f conftest.defs
 977
 978