(reloc_b): Add --enable-argv0-relocation.

diff --git a/ChangeLog b/ChangeLog
index 6c81048a7c0a11afba46e897f38b13f76117dea2..4edc613a95caf5d687cf7bdc90238fda32e4dccd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-31  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * configure.in (reloc_b): Add --enable-argv0-relocation.
+
 2005-05-31  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scm/font.scm (make-century-schoolbook-tree): use Sans for sans
@@ -39,6 +43,10 @@
 
 2005-05-30  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * lily/lexer.ll: Skip UTF-8 BOM at BOF.
+
+       * make/lilypond.fedora.spec.in: Fix source url.
+
        * cygwin: Update from mingw patches.
 
        * scm/editor.scm (editor-command-template-alist): Use jedit

diff --git a/config.hh.in b/config.hh.in
index fbf7d512bb2906254d2145890bffee18b7bbb212..2d972e65af431de177e62d40a5337e8b47503ec9 100644 (file)
--- a/config.hh.in
+++ b/config.hh.in
@@ -7,6 +7,9 @@
 
 #define PACKAGE_DATADIR DATADIR "/" PACKAGE
 
+/* dynamic relocation? */
+#define ARGV0_RELOCATION 0
+
 /* default lilypond locale dir */
 #define LOCALEDIR "@LOCALEDIR@"
 

diff --git a/configure.in b/configure.in
index 8507283289c64a4bbc637c7421cf9ddba2802577..cdfac4efcd7f5ccf42d46ec9ce3cbac4739d514d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -27,6 +27,11 @@ AC_ARG_ENABLE(gui,
     [  --enable-gui            compile with experimental GNOME output module.  Default: off],
     [gui_b=$enableval])
 
+reloc_b=no
+AC_ARG_ENABLE(relocation,
+    [  --enable-relocation     compile with dynamic relocation.  Default: off],
+    [reloc_b=$enableval])
+
 # must come before any header checks
 STEPMAKE_COMPILE
 
@@ -76,6 +81,10 @@ if test "$gui_b" = "yes"; then
     STEPMAKE_GTK2(gtk+-2.0, REQUIRED, 2.4.0)
 fi # $gui_b
 
+if test "$reloc_b" = "yes"; then
+    AC_DEFINE(ARGV0_RELOCATION)
+fi # $reloc_b
+
 STEPMAKE_FREETYPE2(freetype2, REQUIRED, 0)
 #STEPMAKE_PANGO(pango, REQUIRED, 1.6.0)
 STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)

diff --git a/lily/lexer.ll b/lily/lexer.ll
index bca7f0a936b6f1db2a0fc3419de7bf77d38d6797..2cf4f3fb67f8c47e0aa105f738f0a743e76d5c61 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -142,6 +142,7 @@ LYRICS              ({AA}|{TEX})[^0-9 \t\n\r\f]*
 ESCAPED                [nt\\'"]
 EXTENDER       __
 HYPHEN         --
+BOM_UTF8       \357\273\277
 %%
 
 
@@ -149,6 +150,16 @@ HYPHEN             --
        // windows-suck-suck-suck
 }
 
+<INITIAL,chords,lyrics,figures,notes>{BOM_UTF8} {
+  if (this->lexloc->line_number () != 1 || this->lexloc->column_number () != 0)
+    {
+      LexerError (_ ("stray UTF-8 BOM encountered").to_str0 ());
+      exit (1);
+    }
+  if (be_verbose_global)
+     message (_ ("Skipping UTF-8 BOM"));
+}
+
 <INITIAL,chords,figures,incl,lyrics,markup,notes>{
   "%{" {
        yy_push_state (longcomment);
@@ -188,7 +199,7 @@ HYPHEN              --
        String s (YYText () + 1);
        s = s.left_string (s.index_last ('\"'));
 
-       yy_pop_state();
+       yy_pop_state ();
        this->here_input().source_file_->name_ = s;
        message (_f ("Renaming input to: `%s'", s.to_str0 ()));
        progress_indication ("\n");

diff --git a/make/lilypond.fedora.spec.in b/make/lilypond.fedora.spec.in
index b963f4d28422e6b4e96c7a704af4112e5f22681c..0e451546e01a2e7382a87b31fbf74dd1d662ad79 100644 (file)
--- a/make/lilypond.fedora.spec.in
+++ b/make/lilypond.fedora.spec.in
@@ -8,9 +8,9 @@ Version: @TOPLEVEL_VERSION@
 Release: 1
 License: GPL
 Group: Applications/Publishing
-Source0: ftp.lilypond.org:/pub/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz
+Source0: http://lilypond.org/download/development/lilypond-@TOPLEVEL_VERSION@.tar.gz
 Summary: Create and print music notation 
-URL: http://www.lilypond.org/
+URL: http://lilypond.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 
@@ -30,7 +30,7 @@ Requires: guile >= 1.6.4-8 ghostscript >= 8.15
 
 %description
 LilyPond lets you create music notation.  It produces
-beautiful sheet music from  a high-level description file.
+beautiful sheet music from a high-level description file.
 
 %package documentation
 Summary:  All LilyPond documentation, in HTML
@@ -38,7 +38,7 @@ Group: Applications/Publishing
 # BuildArchitectures: noarch
 
 %description documentation
-Documentation and example files of LilyPond. An index is available at
+Documentation and example files of LilyPond.  An index is available at
 %{docdir}/web/Documentation/out-www/index.html
 
 %prep
@@ -194,5 +194,3 @@ scrollkeeper-update
 
 %{docdir}
 %{_datadir}/omf/lilypond/@TOPLEVEL_VERSION@
-
-