Regenerate autotools files

2 files changed, 78 insertions, 90 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index 95a48395..382a870c 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 6c904e2a..18651dab 100755
--- a/configure
+++ b/configure
@@ -6312,7 +6312,8 @@ else
   enable_server="check"
 fi
 
-# Extract the first word of "certutil", so it can be a program name with args.
+if test "$enable_server" != "no"; then
+  # 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -6350,7 +6351,7 @@ $as_echo "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/include/nss3" >&5
+  { $as_echo "$as_me:${as_lineno-$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 :
   $as_echo_n "(cached) " >&6
@@ -6369,7 +6370,7 @@ if test "x$ac_cv_file__usr_include_nss3" = x""yes; then :
   nssdir=nss3
 else
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/include/nss" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/include/nss" >&5
 $as_echo_n "checking for /usr/include/nss... " >&6; }
 if test "${ac_cv_file__usr_include_nss+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6391,7 +6392,7 @@ fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/include/nspr4" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/include/nspr4" >&5
 $as_echo_n "checking for /usr/include/nspr4... " >&6; }
 if test "${ac_cv_file__usr_include_nspr4+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6410,7 +6411,7 @@ if test "x$ac_cv_file__usr_include_nspr4" = x""yes; then :
   nsprdir=nspr4
 else
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/include/nspr" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/include/nspr" >&5
 $as_echo_n "checking for /usr/include/nspr... " >&6; }
 if test "${ac_cv_file__usr_include_nspr+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6432,15 +6433,15 @@ fi
 
 fi
 
-if test "x$nssdir" != "x" -a "x$nsprdir" != "x"; then
-nss_CFLAGS="-I/usr/include/$nssdir"
-nspr_CFLAGS="-I/usr/include/$nsprdir"
+  if test "x$nssdir" != "x" -a "x$nsprdir" != "x"; then
+  nss_CFLAGS="-I/usr/include/$nssdir"
+  nspr_CFLAGS="-I/usr/include/$nsprdir"
 
 
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CFLAGS $nss_CFLAGS $nspr_CFLAGS"
-have_nss_includes=yes
-for ac_header in "$nsprdir/nspr.h" "$nsprdir/plgetopt.h" "$nsprdir/prerror.h" "$nssdir/ssl.h" "$nssdir/nss.h" "$nssdir/pk11func.h" "$nssdir/secerr.h"
+  save_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CFLAGS $nss_CFLAGS $nspr_CFLAGS"
+  have_nss_includes=yes
+  for ac_header in "$nsprdir/nspr.h" "$nsprdir/plgetopt.h" "$nsprdir/prerror.h" "$nssdir/ssl.h" "$nssdir/nss.h" "$nssdir/pk11func.h" "$nssdir/secerr.h"
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -6456,9 +6457,9 @@ fi
 
 done
 
-CPPFLAGS="$save_CPPFLAGS"
-have_nss_libs=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PR_Connect in -lnspr4" >&5
+  CPPFLAGS="$save_CPPFLAGS"
+  have_nss_libs=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PR_Connect in -lnspr4" >&5
 $as_echo_n "checking for PR_Connect in -lnspr4... " >&6; }
 if test "${ac_cv_lib_nspr4_PR_Connect+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6496,7 +6497,7 @@ fi
 $as_echo "$ac_cv_lib_nspr4_PR_Connect" >&6; }
 if test "x$ac_cv_lib_nspr4_PR_Connect" = x""yes; then :
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_ReHandshake in -lssl3" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_ReHandshake in -lssl3" >&5
 $as_echo_n "checking for SSL_ReHandshake in -lssl3... " >&6; }
 if test "${ac_cv_lib_ssl3_SSL_ReHandshake+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -6539,19 +6540,20 @@ fi
 
 fi
 
-fi
-if test "x${have_nss_includes}${have_nss_libs}${have_certutil}" != "xyesyesyes"; then
-  if test "$enable_server" == "yes"; then
-    as_fn_error "cannot find all libraries or tools for stap-server" "$LINENO" 5
   fi
-  if test "$enable_server" == "check"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: will not build stap-server, cannot find all libraries or tools" >&5
+  if test "x${have_nss_includes}${have_nss_libs}${have_certutil}" != "xyesyesyes"; then
+    if test "$enable_server" == "yes"; then
+      as_fn_error "cannot find all libraries or tools for stap-server" "$LINENO" 5
+    fi
+    if test "$enable_server" == "check"; then
+      { $as_echo "$as_me:${as_lineno-$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
+    fi
+  else
 
 $as_echo "#define HAVE_NSS 1" >>confdefs.h
 
+  fi
 fi
  if test "x${have_nss_includes}${have_nss_libs}${have_certutil}" == "xyesyesyes" -a "$enable_server" != "no"; then
   BUILD_SERVER_TRUE=
@@ -6834,11 +6836,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtkmm" >&5
 $as_echo_n "checking for gtkmm... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$gtkmm_CFLAGS"; then
-        pkg_cv_gtkmm_CFLAGS="$gtkmm_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$gtkmm_CFLAGS"; then
+    pkg_cv_gtkmm_CFLAGS="$gtkmm_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$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=$?
@@ -6848,15 +6849,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 "$gtkmm_LIBS"; then
-        pkg_cv_gtkmm_LIBS="$gtkmm_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$gtkmm_LIBS"; then
+    pkg_cv_gtkmm_LIBS="$gtkmm_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$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=$?
@@ -6866,9 +6865,8 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -6881,9 +6879,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        gtkmm_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtkmm-2.4 >= 2.8.0"`
+	        gtkmm_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtkmm-2.4 >= 2.8.0" 2>&1`
         else
-	        gtkmm_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtkmm-2.4 >= 2.8.0"`
+	        gtkmm_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 "$gtkmm_PKG_ERRORS" >&5
@@ -6910,11 +6908,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libglade" >&5
 $as_echo_n "checking for libglade... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$libglade_CFLAGS"; then
-        pkg_cv_libglade_CFLAGS="$libglade_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$libglade_CFLAGS"; then
+    pkg_cv_libglade_CFLAGS="$libglade_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libglademm-2.4 >= 2.6.7\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libglademm-2.4 >= 2.6.7") 2>&5
   ac_status=$?
@@ -6924,15 +6921,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 "$libglade_LIBS"; then
-        pkg_cv_libglade_LIBS="$libglade_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$libglade_LIBS"; then
+    pkg_cv_libglade_LIBS="$libglade_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libglademm-2.4 >= 2.6.7\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libglademm-2.4 >= 2.6.7") 2>&5
   ac_status=$?
@@ -6942,9 +6937,8 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -6957,9 +6951,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        libglade_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libglademm-2.4 >= 2.6.7"`
+	        libglade_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libglademm-2.4 >= 2.6.7" 2>&1`
         else
-	        libglade_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libglademm-2.4 >= 2.6.7"`
+	        libglade_PKG_ERRORS=`$PKG_CONFIG --print-errors "libglademm-2.4 >= 2.6.7" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libglade_PKG_ERRORS" >&5
@@ -7268,11 +7262,10 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RPM" >&5
 $as_echo_n "checking for RPM... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$RPM_CFLAGS"; then
-        pkg_cv_RPM_CFLAGS="$RPM_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$RPM_CFLAGS"; then
+    pkg_cv_RPM_CFLAGS="$RPM_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rpm\""; } >&5
   ($PKG_CONFIG --exists --print-errors "rpm") 2>&5
   ac_status=$?
@@ -7282,15 +7275,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 "$RPM_LIBS"; then
-        pkg_cv_RPM_LIBS="$RPM_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$RPM_LIBS"; then
+    pkg_cv_RPM_LIBS="$RPM_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rpm\""; } >&5
   ($PKG_CONFIG --exists --print-errors "rpm") 2>&5
   ac_status=$?
@@ -7300,9 +7291,8 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -7315,9 +7305,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        RPM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "rpm"`
+	        RPM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "rpm" 2>&1`
         else
-	        RPM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "rpm"`
+	        RPM_PKG_ERRORS=`$PKG_CONFIG --print-errors "rpm" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$RPM_PKG_ERRORS" >&5