Index: CMT/HEAD/source/cmt_symbol.cxx
===================================================================
--- CMT/HEAD/source/cmt_symbol.cxx	(revision 588)
+++ CMT/HEAD/source/cmt_symbol.cxx	(revision 599)
@@ -3134,14 +3134,18 @@
   else define_text = "overrides";
 
-  cout << "# Package ";
+  if (CmtMessage::active (Verbose))
+    cout << "# Package " << (use != 0 ? use->get_package_name () + " " + use->version : "");
+  /*
   if (use != 0)
     {
       cout << use->get_package_name () << " " << use->version;
     }
+  */
 
   switch (command_type)
     {
       case CommandSet :
-        cout << " " << define_text << " set " << symbol.name << " as " << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " " << define_text << " set " << symbol.name << " as " << endl;
 	//        cout << " " << define_text << " set " << symbol.name << " as ";
         cout << "set " << symbol.name;
@@ -3150,5 +3154,6 @@
         break;
       case CommandSetAppend :
-        cout << " appends to set " << symbol.name << " : " << endl;;
+	if (CmtMessage::active (Verbose))
+	  cout << " appends to set " << symbol.name << " : " << endl;
 	//        cout << " appends to set " << symbol.name << " : ";
         cout << "set_append " << symbol.name;
@@ -3156,5 +3161,6 @@
         break;
       case CommandSetPrepend :
-        cout << " prepends to set " << symbol.name << " : " << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " prepends to set " << symbol.name << " : " << endl;
 	//        cout << " prepends to set " << symbol.name << " : ";
         cout << "set_prepend " << symbol.name;
@@ -3162,5 +3168,6 @@
         break;
       case CommandSetRemove :
-        cout << " removes from set " << symbol.name << " : " << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " removes from set " << symbol.name << " : " << endl;
 	//        cout << " removes from set " << symbol.name << " : ";
         cout << "set_remove " << symbol.name;
@@ -3168,5 +3175,6 @@
         break;
       case CommandSetRemoveRegexp :
-        cout << " removes RE from set " << symbol.name << " : " << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " removes RE from set " << symbol.name << " : " << endl;
 	//        cout << " removes RE from set " << symbol.name << " : ";
         cout << "set_remove_regexp " << symbol.name;
@@ -3174,5 +3182,6 @@
         break;
       case CommandAlias :
-        cout << " " << define_text << " alias " << symbol.name << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " " << define_text << " alias " << symbol.name << endl;
 	//        cout << " " << define_text << " alias " << symbol.name << " as ";
         cout << "alias " << symbol.name;
@@ -3181,5 +3190,6 @@
         break;
       case CommandPath :
-        cout << " " << define_text << " path " << symbol.name << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " " << define_text << " path " << symbol.name << endl;
 	//        cout << " " << define_text << " path " << symbol.name << " as ";
         cout << "path " << symbol.name;
@@ -3188,5 +3198,6 @@
         break;
       case CommandPathAppend :
-        cout << " appends to path " << symbol.name << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " appends to path " << symbol.name << endl;
 	//        cout << " appends to path " << symbol.name << " : ";
         cout << "path_append " << symbol.name;
@@ -3194,5 +3205,6 @@
         break;
       case CommandPathPrepend :
-        cout << " prepends to path " << symbol.name << " : " << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " prepends to path " << symbol.name << " : " << endl;
 	//        cout << " prepends to path " << symbol.name << " : ";
         cout << "path_prepend " << symbol.name;
@@ -3200,5 +3212,6 @@
         break;
       case CommandPathRemove :
-        cout << " removes from path " << symbol.name << " : " << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " removes from path " << symbol.name << " : " << endl;
 	//        cout << " removes from path " << symbol.name << " : ";
         cout << "path_remove " << symbol.name;
@@ -3206,5 +3219,6 @@
         break;
       case CommandPathRemoveRegexp :
-        cout << " removes RE from path " << symbol.name << " : " << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " removes RE from path " << symbol.name << " : " << endl;
 	//        cout << " removes RE from path " << symbol.name << " : ";
         cout << "path_remove_regexp " << symbol.name;
@@ -3212,5 +3226,6 @@
         break;
       case CommandMacro :
-        cout << " " << define_text << " macro " << symbol.name << " as " << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " " << define_text << " macro " << symbol.name << " as " << endl;
 	//        cout << " " << define_text << " macro " << symbol.name << " as ";
         cout << "macro " << symbol.name;
@@ -3218,5 +3233,6 @@
         break;
       case CommandMacroPrepend :
-        cout << " prepends to macro " << symbol.name << " : " << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " prepends to macro " << symbol.name << " : " << endl;
 	//        cout << " prepends to macro " << symbol.name << " : ";
         cout << "macro_prepend " << symbol.name;
@@ -3224,5 +3240,6 @@
         break;
       case CommandMacroAppend :
-        cout << " appends to macro " << symbol.name << " : " << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " appends to macro " << symbol.name << " : " << endl;
 	//        cout << " appends to macro " << symbol.name << " : ";
         cout << "macro_append " << symbol.name;
@@ -3230,5 +3247,6 @@
         break;
       case CommandMacroRemove :
-        cout << " remove from macro " << symbol.name << " : " << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " remove from macro " << symbol.name << " : " << endl;
 	//        cout << " remove from macro " << symbol.name << " : ";
         cout << "macro_remove " << symbol.name;
@@ -3236,5 +3254,6 @@
         break;
       case CommandMacroRemoveRegexp :
-        cout << " remove RE from macro " << symbol.name << " : " << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " remove RE from macro " << symbol.name << " : " << endl;
 	//        cout << " remove RE from macro " << symbol.name << " : ";
         cout << "macro_remove_regexp " << symbol.name;
@@ -3242,5 +3261,6 @@
         break;
       case CommandMacroRemoveAll :
-        cout << " remove all from macro " << symbol.name << " : " << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " remove all from macro " << symbol.name << " : " << endl;
 	//        cout << " remove all from macro " << symbol.name << " : ";
         cout << "macro_remove_all " << symbol.name;
@@ -3248,5 +3268,6 @@
         break;
       case CommandMacroRemoveAllRegexp :
-        cout << " remove all RE from macro " << symbol.name << " : " << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " remove all RE from macro " << symbol.name << " : " << endl;
 	//        cout << " remove all RE from macro " << symbol.name << " : ";
         cout << "macro_remove_all_regexp " << symbol.name;
@@ -3254,5 +3275,6 @@
         break;
       case CommandSetupScript :
-        cout << " " << define_text << " setup script " << symbol.name << endl;
+	if (CmtMessage::active (Verbose))
+	  cout << " " << define_text << " setup script " << symbol.name << endl;
 	//       cout << " " << define_text << " action " << symbol.name << " as ";
         cout << "setup_script" /* << symbol.name */;
