+@@ -698,16 +689,7 @@
+
+ for dir in $ac_nss_lib_dir ; do
+ if test -f $dir/libnspr4$shrext ; then
+- dnl do not add -L/usr/lib because compiler does it anyway
+- if test "z$dir" = "z/usr/lib" ; then
+ NSPR_LIBS="$NSPR_LIBS_LIST"
+- else
+- if test "z$with_gnu_ld" = "zyes" ; then
+- NSPR_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSPR_LIBS_LIST"
+- else
+- NSPR_LIBS="-L$dir $NSPR_LIBS_LIST"
+- fi
+- fi
+ NSPR_LIBS_FOUND="yes"
+ break
+ fi
+@@ -743,24 +725,15 @@
+ NSS_NSS_H=""
+
+ if test "z$with_nss" != "z" ; then
+- NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss"
+- if test "z$with_gnu_ld" = "zyes" ; then
+- NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST"
+- else
+- NSS_LIBS="$NSS_LIBS -L$with_nss/lib $NSS_LIBS_LIST"
+- fi
++ NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss -I/usr/include/nspr"
++ NSS_LIBS="$NSS_LIBS $NSS_LIBS_LIST"