(main_with_guile): copy be_verbose_global into

ly_set_option()

diff --git a/lily/include/program-option.hh b/lily/include/program-option.hh
index 251db9d7f4b2885163a2a23d8af7136bdf473903..61ed1038824369ea5678056c5b751a35ce88d848 100644 (file)
--- a/lily/include/program-option.hh
+++ b/lily/include/program-option.hh
@@ -20,12 +20,6 @@ extern bool lily_1_8_compatibility_used;
 SCM ly_get_option (SCM);
 SCM ly_set_option (SCM, SCM);
 
-struct Lilypond_option_init
-{
-  char const *name_;
-  char const *init_;
-  char const *descr_;
-};
 
 
 #endif /* SCM_OPTION_HH */

diff --git a/lily/main.cc b/lily/main.cc
index 94f020f3bc19abae622388c46e52cfb9bfd215b9..6ebaae182639d11120cd152b78e6fa8b4a680bdb 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -40,6 +40,7 @@
 #include "string-convert.hh"
 #include "version.hh"
 #include "warn.hh"
+#include "program-option.hh"
 
 /*
  * Global options that can be overridden through command line.

diff --git a/lily/program-option.cc b/lily/program-option.cc
index 1df79b1682b687b6792969b21560bd96d9244d26..df34039661761ec6180f486c6c5abf9c16d6c56c 100644 (file)
--- a/lily/program-option.cc
+++ b/lily/program-option.cc
@@ -33,6 +33,13 @@ bool lily_1_8_compatibility_used = false;
 bool do_internal_type_checking_global;
 
 
+struct Lilypond_option_init
+{
+  char const *name_;
+  char const *init_;
+  char const *descr_;
+};
+
 static Lilypond_option_init options[] = {
   {"point-and-click", "#t",
    "use point & click"},