propagate from branch 'net.randombit.botan' (head 85c4aa25e9168862a96d7a2eca7478049fffa5d5)

            to branch 'net.randombit.botan.c++0x' (head 179c9203bd3a633b86a2d54992d8ffc77369de20)

2 files changed, 10 insertions, 8 deletions

diff --git a/configure.py b/configure.py
index 1e4744f72..d4cb54e53 100755
--- a/configure.py
+++ b/configure.py
@@ -1132,17 +1132,21 @@ def load_info_files(options):
     archinfo = dict([(form_name(info), ArchInfo(info))
                      for info in list_files_in_build_data('arch')])
 
-    logging.debug('Loaded %d CPU info files' % (len(archinfo)))
-
     osinfo   = dict([(form_name(info), OsInfo(info))
                       for info in list_files_in_build_data('os')])
 
-    logging.debug('Loaded %d OS info files' % (len(osinfo)))
-
     ccinfo = dict([(form_name(info), CompilerInfo(info))
                     for info in list_files_in_build_data('cc')])
 
-    logging.debug('Loaded %d compiler info files' % (len(ccinfo)))
+    def info_file_load_report(type, num):
+        if num > 0:
+            logging.debug('Loaded %d %s info files' % (num, type))
+        else:
+            logging.warning('Failed to load any %s info files' % (type))
+
+    info_file_load_report('CPU', len(archinfo));
+    info_file_load_report('OS', len(osinfo))
+    info_file_load_report('compiler', len(ccinfo))
 
     return (modules, archinfo, ccinfo, osinfo)
 
diff --git a/doc/examples/cms_dec.cpp b/doc/examples/cms_dec.cpp
index 6a9d99137..84355fb4a 100644
--- a/doc/examples/cms_dec.cpp
+++ b/doc/examples/cms_dec.cpp
@@ -40,9 +40,7 @@ int main(int argc, char* argv[])
 
       DataSource_Stream message(argv[1]);
 
-      User_Interface ui;
-
-      CMS_Decoder decoder(message, store, ui, mykey);
+      CMS_Decoder decoder(message, store, mykey);
 
       while(decoder.layer_type() != CMS_Decoder::DATA)
          {