Bug: 334763

Description: Fix build to allow building command line tools without svrcore
Fix Description: Should allow the command line tools to be built without svrcore.  Also fixed the problem with system svrcore.

directory/c-sdk/config/autoconf/svrcore.m4

@@ -103,12 +103,11 @@ AC_DEFUN(AM_PATH_SVRCORE,
         AC_MSG_CHECKING(Trying pkg-config svrcore)
         AC_PATH_PROG(PKG_CONFIG, pkg-config)
         if test -n "$PKG_CONFIG"; then
-            if $PKG_CONFIG --exists svrcore; then
+            if $PKG_CONFIG --exists svrcore-devel; then
                 AC_MSG_CHECKING(using SVRCORE from package svrcore)
-                SVRCORE_CFLAGS=`$PKG_CONFIG --cflags-only-I svrcore`
-                SVRCORE_LIBS=`$PKG_CONFIG --libs-only-L svrcore`
+                SVRCORE_CFLAGS=`$PKG_CONFIG --cflags-only-I svrcore-devel`
+                SVRCORE_LIBS=`$PKG_CONFIG --libs-only-L svrcore-devel`
             else
-#            AC_MSG_NOTICE([system SVRCORE not found])
                 no_svrcore="yes"
             fi
         else

directory/c-sdk/configure

@@ -1181,7 +1181,7 @@ echo "configure:1156: checking using SVRCORE from package svrcore" >&5
    fi
 fi
 
-if test -n "$HAVE_SVRCORE" ; then
+if test -n "$HAVE_SVRCORE" -a -z "$_SYSTEM_SVRCORE" ; then
    if test -z "$SVRCORE_CFLAGS" -o -z "$SVRCORE_LIBS"; then
       { echo "configure: error: --with-svrcore specified, but no svrcore could be found" 1>&2; exit 1; }
    fi

directory/c-sdk/configure.in

@@ -256,7 +256,7 @@ dnl svrcore implies both nspr and nss
    fi
 fi
 
-if test -n "$HAVE_SVRCORE" ; then
+if test -n "$HAVE_SVRCORE" -a -z "$_SYSTEM_SVRCORE" ; then
    if test -z "$SVRCORE_CFLAGS" -o -z "$SVRCORE_LIBS"; then
       AC_MSG_ERROR([--with-svrcore specified, but no svrcore could be found])
    fi