nspr-config --libs includes -lplds4 and -lplc4... use nspr-config for

NSPR_LIBS when it's available.

This make fix a problem with libsbbs.so not having libnspr as a dependency
for Venom.

3rdp/build/Common.gmake

@@ -5,17 +5,32 @@
 ifeq ($(shell nspr-config --version > /dev/null 2>&1 && echo YES),YES)
  NSPRDIR ?= $(shell nspr-config --libdir)
  NSPRINCLUDE ?= $(shell nspr-config --includedir)
-endif
-
-ifeq ($(os),sunos)
- ifeq ($(shell test -f /usr/sfw/lib/mozilla/libnspr4.so && echo "yes"),yes)
-  NSPRDIR ?= /usr/sfw/lib/mozilla
-  ifeq ($(shell test -d /usr/sfw/include/mozilla/nspr && echo "yes"),yes)
-   NSPRINCLUDE ?= /usr/sfw/include/mozilla/nspr
+ NSPR_CFLAGS ?= $(shell nspr-config --cflags)
+ NSPR_LIBS ?= $(shell nspr-config --libs)
+else
+ ifeq ($(os),sunos)
+  ifeq ($(shell test -f /usr/sfw/lib/mozilla/libnspr4.so && echo "yes"),yes)
+   NSPRDIR ?= /usr/sfw/lib/mozilla
+   ifeq ($(shell test -d /usr/sfw/include/mozilla/nspr && echo "yes"),yes)
+    NSPRINCLUDE ?= /usr/sfw/include/mozilla/nspr
+   endif
   endif
  endif
+
+ ifndef NSPRDIR
+  NSPRDIR := $(SRC_ROOT)$(DIRSEP)..$(DIRSEP)lib$(DIRSEP)mozilla$(DIRSEP)nspr$(DIRSEP)$(machine).$(BUILD)
+ endif
+
+ #The following is needed for nspr support on Linux
+ ifeq ($(os),linux)
+  NSPR_LIBS +=	-ldl
+ endif
+
+ NSPR_LIBS	+=	-lnspr4
 endif
 
+NSPR_LDFLAGS	+=	-L/usr/local/lib -L$(NSPRDIR)
+
 ifdef NSPRINCLUDE
  NSPR_CFLAGS += -I$(NSPRINCLUDE)
 else
@@ -23,18 +38,6 @@ else
  NSPR_CFLAGS += -I/usr/local/include -I$(SRC_ROOT)$(DIRSEP)..$(DIRSEP)include$(DIRSEP)mozilla$(DIRSEP)nspr
 endif
 
-ifndef NSPRDIR
- NSPRDIR := $(SRC_ROOT)$(DIRSEP)..$(DIRSEP)lib$(DIRSEP)mozilla$(DIRSEP)nspr$(DIRSEP)$(machine).$(BUILD)
-endif
-
-#The following is needed for nspr support on Linux
-ifeq ($(os),linux)
- NSPR_LIBS +=	-ldl
-endif
-
-NSPR_LDFLAGS	+=	-L/usr/local/lib -L$(NSPRDIR)
-NSPR_LIBS	+=	-lnspr4
-
 ################
 # Common stuff #
 ################