Check whether certutil as provided by nss-tools is installed.

* configure.ac: Add check for certuril, don't build nss stap server when
  not found.
* Makefile.in: Regenerated.
* aclocal.m4: Likewise.
* configure: Likewise.
* doc/Makefile.in: Likewise.
* doc/SystemTap_Tapset_Reference/Makefile.in: Likewise.
* grapher/Makefile.in: Likewise.

7 files changed, 82 insertions, 44 deletions

diff --git a/Makefile.in b/Makefile.in
index 38f5d297..23ae31d2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,7 +78,7 @@ DIST_COMMON = INSTALL NEWS README AUTHORS $(srcdir)/Makefile.in \
 	$(top_srcdir)/man/stapprobes.tcp.3stap.in \
 	$(top_srcdir)/man/stapprobes.udp.3stap.in \
 	$(top_srcdir)/initscript/systemtap.in $(srcdir)/run-stap.in \
-	$(srcdir)/run-staprun.in depcomp $(oldinclude_HEADERS)
+	$(srcdir)/run-staprun.in depcomp depcomp $(oldinclude_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -275,6 +275,7 @@ docdir = @docdir@
 dvidir = @dvidir@
 elfutils_abs_srcdir = @elfutils_abs_srcdir@
 exec_prefix = @exec_prefix@
+have_certutil = @have_certutil@
 have_dvips = @have_dvips@
 have_latex = @have_latex@
 have_latex2html = @have_latex2html@
diff --git a/aclocal.m4 b/aclocal.m4
index bed61646..696dba2c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -87,16 +87,14 @@ fi])
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
@@ -140,9 +138,9 @@ See the pkg-config man page for more details.])
 if test $pkg_failed = yes; then
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
diff --git a/configure b/configure
index 82e36a32..2c38f31a 100755
--- a/configure
+++ b/configure
@@ -658,6 +658,7 @@ BUILD_SERVER_FALSE
 BUILD_SERVER_TRUE
 nspr_CFLAGS
 nss_CFLAGS
+have_certutil
 BUILD_PDFREFDOCS_FALSE
 BUILD_PDFREFDOCS_TRUE
 BUILD_REFDOCS_FALSE
@@ -6721,6 +6722,44 @@ else
   enable_server="check"
 fi
 
+# Extract the first word of "certutil", so it can be a program name with args.
+set dummy certutil; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_have_certutil+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$have_certutil"; then
+  ac_cv_prog_have_certutil="$have_certutil" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_have_certutil="yes"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_have_certutil" && ac_cv_prog_have_certutil="no"
+fi
+fi
+have_certutil=$ac_cv_prog_have_certutil
+if test -n "$have_certutil"; then
+  { $as_echo "$as_me:$LINENO: result: $have_certutil" >&5
+$as_echo "$have_certutil" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 { $as_echo "$as_me:$LINENO: checking for /usr/include/nss3" >&5
 $as_echo_n "checking for /usr/include/nss3... " >&6; }
 if test "${ac_cv_file__usr_include_nss3+set}" = set; then
@@ -7119,15 +7158,15 @@ fi
 fi
 
 fi
-if test "x${have_nss_includes}${have_nss_libs}" != "xyesyes"; then
+if test "x${have_nss_includes}${have_nss_libs}${have_certutil}" != "xyesyesyes"; then
   if test "$enable_server" == "yes"; then
-    { { $as_echo "$as_me:$LINENO: error: cannot find all libraries for stap-server" >&5
-$as_echo "$as_me: error: cannot find all libraries for stap-server" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: cannot find all libraries or tools for stap-server" >&5
+$as_echo "$as_me: error: cannot find all libraries or tools for stap-server" >&2;}
    { (exit 1); exit 1; }; }
   fi
   if test "$enable_server" == "check"; then
-    { $as_echo "$as_me:$LINENO: WARNING: will not build stap-server, cannot find all libraries" >&5
-$as_echo "$as_me: WARNING: will not build stap-server, cannot find all libraries" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: will not build stap-server, cannot find all libraries or tools" >&5
+$as_echo "$as_me: WARNING: will not build stap-server, cannot find all libraries or tools" >&2;}
   fi
 else
 
@@ -7136,7 +7175,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 fi
- if test "x${have_nss_includes}${have_nss_libs}" == "xyesyes" -a "$enable_server" != "no"; then
+ if test "x${have_nss_includes}${have_nss_libs}${javer_certutil}" == "xyesyesyes" -a "$enable_server" != "no"; then
   BUILD_SERVER_TRUE=
   BUILD_SERVER_FALSE='#'
 else
@@ -7144,7 +7183,7 @@ else
   BUILD_SERVER_FALSE=
 fi
 
- if test "x${have_nss_includes}${have_nss_libs}" == "xyesyes"; then
+ if test "x${have_nss_includes}${have_nss_libs}${have_certutil}" == "xyesyesyes"; then
   HAVE_NSS_TRUE=
   HAVE_NSS_FALSE='#'
 else
@@ -7281,11 +7320,10 @@ pkg_failed=no
 { $as_echo "$as_me:$LINENO: checking for GRAPHER" >&5
 $as_echo_n "checking for GRAPHER... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GRAPHER_CFLAGS"; then
-        pkg_cv_GRAPHER_CFLAGS="$GRAPHER_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GRAPHER_CFLAGS"; then
+    pkg_cv_GRAPHER_CFLAGS="$GRAPHER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtkmm-2.4 >= 2.8.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "gtkmm-2.4 >= 2.8.0") 2>&5
   ac_status=$?
@@ -7295,15 +7333,13 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GRAPHER_LIBS"; then
-        pkg_cv_GRAPHER_LIBS="$GRAPHER_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GRAPHER_LIBS"; then
+    pkg_cv_GRAPHER_LIBS="$GRAPHER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtkmm-2.4 >= 2.8.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "gtkmm-2.4 >= 2.8.0") 2>&5
   ac_status=$?
@@ -7313,9 +7349,8 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -7328,9 +7363,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GRAPHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtkmm-2.4 >= 2.8.0"`
+	        GRAPHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtkmm-2.4 >= 2.8.0" 2>&1`
         else
-	        GRAPHER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtkmm-2.4 >= 2.8.0"`
+	        GRAPHER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtkmm-2.4 >= 2.8.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GRAPHER_PKG_ERRORS" >&5
diff --git a/configure.ac b/configure.ac
index e8a8efda..f3135287 100644
--- a/configure.ac
+++ b/configure.ac
@@ -228,7 +228,8 @@ AC_ARG_ENABLE([server],
     [enable building of stap-server/client (default on if nss etc. found).]),
   [enable_server=$enableval],
   [enable_server="check"])
-dnl Find the location of nss and nspr headers
+dnl Find the location of nss and nspr headers and certutil
+AC_CHECK_PROG(have_certutil, certutil, [yes], [no])
 AC_CHECK_FILE([/usr/include/nss3], nssdir=nss3, [
 	AC_CHECK_FILE([/usr/include/nss], nssdir=nss)
 ])
@@ -249,18 +250,18 @@ AC_CHECK_LIB(nspr4, PR_Connect, [
 	AC_CHECK_LIB(ssl3, SSL_ReHandshake, have_nss_libs=yes)
 ])
 fi
-if test "x${have_nss_includes}${have_nss_libs}" != "xyesyes"; then
+if test "x${have_nss_includes}${have_nss_libs}${have_certutil}" != "xyesyesyes"; then
   if test "$enable_server" == "yes"; then
-    AC_MSG_ERROR([cannot find all libraries for stap-server])
+    AC_MSG_ERROR([cannot find all libraries or tools for stap-server])
   fi
   if test "$enable_server" == "check"; then
-    AC_MSG_WARN([will not build stap-server, cannot find all libraries])
+    AC_MSG_WARN([will not build stap-server, cannot find all libraries or tools])
   fi
 else
     AC_DEFINE([HAVE_NSS], [1], [Define to 1 if you have the nss libraries.])
 fi
-AM_CONDITIONAL([BUILD_SERVER], [test "x${have_nss_includes}${have_nss_libs}" == "xyesyes" -a "$enable_server" != "no"])
-AM_CONDITIONAL([HAVE_NSS],     [test "x${have_nss_includes}${have_nss_libs}" == "xyesyes"])
+AM_CONDITIONAL([BUILD_SERVER], [test "x${have_nss_includes}${have_nss_libs}${javer_certutil}" == "xyesyesyes" -a "$enable_server" != "no"])
+AM_CONDITIONAL([HAVE_NSS],     [test "x${have_nss_includes}${have_nss_libs}${have_certutil}" == "xyesyesyes"])
 
 dnl Handle the optional grapher
 AC_ARG_ENABLE([grapher],
diff --git a/doc/Makefile.in b/doc/Makefile.in
index ac11ab4f..2f1683c1 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -134,6 +134,7 @@ docdir = @docdir@
 dvidir = @dvidir@
 elfutils_abs_srcdir = @elfutils_abs_srcdir@
 exec_prefix = @exec_prefix@
+have_certutil = @have_certutil@
 have_dvips = @have_dvips@
 have_latex = @have_latex@
 have_latex2html = @have_latex2html@
diff --git a/doc/SystemTap_Tapset_Reference/Makefile.in b/doc/SystemTap_Tapset_Reference/Makefile.in
index ee7bb06c..ae0b2f59 100644
--- a/doc/SystemTap_Tapset_Reference/Makefile.in
+++ b/doc/SystemTap_Tapset_Reference/Makefile.in
@@ -137,6 +137,7 @@ docdir = @docdir@
 dvidir = @dvidir@
 elfutils_abs_srcdir = @elfutils_abs_srcdir@
 exec_prefix = @exec_prefix@
+have_certutil = @have_certutil@
 have_dvips = @have_dvips@
 have_latex = @have_latex@
 have_latex2html = @have_latex2html@
diff --git a/grapher/Makefile.in b/grapher/Makefile.in
index 786719da..fc260d60 100644
--- a/grapher/Makefile.in
+++ b/grapher/Makefile.in
@@ -144,6 +144,7 @@ docdir = @docdir@
 dvidir = @dvidir@
 elfutils_abs_srcdir = @elfutils_abs_srcdir@
 exec_prefix = @exec_prefix@
+have_certutil = @have_certutil@
 have_dvips = @have_dvips@
 have_latex = @have_latex@
 have_latex2html = @have_latex2html@