From c4a94c1a262c8d2847d681eb60ad9a6c2e692fa7 Mon Sep 17 00:00:00 2001
From: fche <fche>
Date: Thu, 14 Jun 2007 21:38:24 +0000
Subject: [PATCH] 2007-06-14  Frank Ch. Eigler  <fche@elastic.org>

	* translate.cxx (emit_module_init): Emit translator/elfutils
	version numbers together.
	* main.cxx (version): Ditto.
	(main): Skip printing tapset directories where no sources were found.
---
 ChangeLog     | 7 +++++++
 main.cxx      | 8 ++++----
 translate.cxx | 6 +++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8d577b3ec..a20252f54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-14  Frank Ch. Eigler  <fche@elastic.org>
+
+	* translate.cxx (emit_module_init): Emit translator/elfutils
+	version numbers together.
+	* main.cxx (version): Ditto.
+	(main): Skip printing tapset directories where no sources were found.
+
 2007-06-14  Frank Ch. Eigler  <fche@elastic.org>
 
 	PR 3331 cont'd.
diff --git a/main.cxx b/main.cxx
index 0c975c1dd..6c28b25e0 100644
--- a/main.cxx
+++ b/main.cxx
@@ -44,8 +44,8 @@ version ()
 {
   clog
     << "SystemTap translator/driver "
-    << "(version " << VERSION << " built " << DATE << ")" << endl
-    << "(Using " << dwfl_version (NULL) << " libraries.)" << endl
+    << "(version " << VERSION << "/" << dwfl_version (NULL)
+    << " built " << DATE << ")" << endl
     << "Copyright (C) 2005-2007 Red Hat, Inc. and others" << endl
     << "This is free software; see the source for copying conditions." << endl;
 }
@@ -563,9 +563,9 @@ main (int argc, char * const argv [])
             rc ++;
           // GLOB_NOMATCH is acceptable
 
-          if (s.verbose>1)
+          if (s.verbose>1 && globbuf.gl_pathc > 0)
             clog << "Searched '" << dir << "', "
-                 << "match count " << globbuf.gl_pathc << endl;
+                 << "found " << globbuf.gl_pathc << endl;
 
           for (unsigned j=0; j<globbuf.gl_pathc; j++)
             {
diff --git a/translate.cxx b/translate.cxx
index b5fef8904..e799c42a6 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -22,6 +22,10 @@
 #include <string>
 #include <cassert>
 
+extern "C" {
+#include <elfutils/libdwfl.h>
+}
+
 using namespace std;
 
 struct var;
@@ -1162,7 +1166,7 @@ c_unparser::emit_module_init ()
   // Print a message to the kernel log about this module.  This is
   // intended to help debug problems with systemtap modules.
   o->newline() << "printk (KERN_DEBUG \"%s: "
-               << "systemtap: " << VERSION
+               << "systemtap: " << VERSION << "/" << dwfl_version (NULL)
                << ", base: %p"
                << ", memory: %lu+%lu+%lu+%lu+%lu data+text+ctx+io+glob"
                << ", probes: " << session->probes.size()
-- 
2.43.5