* GNUmakefile.in (builddir-exec): Add symlink tex/out. Fixes

--srcdir build (Bertalan).

* stepmake/aclocal.m4 (STEPMAKE_GUILE_DEVEL): Check for guile
headers and library too (Laura Conrad).

* Documentation/topdocs/INSTALL.texi (Top): Mention development
package for guile too (Laura Conrad).

* lily/main.cc (usage): Typo.

diff --git a/ChangeLog b/ChangeLog
index c29f2433a54a19167d8128446cf49c88c7340b9d..54aa83929639f7796565ead49a1777371147c9dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-11-03  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * GNUmakefile.in (builddir-exec): Add symlink tex/out.  Fixes
+       --srcdir build (Bertalan).
+
+       * stepmake/aclocal.m4 (STEPMAKE_GUILE_DEVEL): Check for guile
+       headers and library too (Laura Conrad).
+
+       * Documentation/topdocs/INSTALL.texi (Top): Mention development
+       package for guile too (Laura Conrad).
+
+       * lily/main.cc (usage): Typo.
+
 2004-11-02  Werner Lemberg  <wl@gnu.org>
 
        * Documentation/user/notation.ly: More fixes to improve appearance.

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 08aba505d450fae90e653b2e7bac1bb4313db62a..ff7f256d15b148d62dd79985b46f0539a51a3ad0 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -76,6 +76,8 @@ newer),
 work.
 
 @item @uref{http://www.gnu.org/software/guile/guile.html,GUILE} (version 1.6.0 or newer).
+If you are installing a binary packages, you may need to install
+guile-devel or guile-dev or libguile-dev too.
 
 @item  @uref{http://www.gnu.org/software/flex/,Flex} (version 2.5.4a or newer). 
 
@@ -90,8 +92,8 @@ lexer-gcc-3.1.sh in the source directory.
 
 Also, @TeX{}'s libkpathsea is used to find the fonts (@file{.mf},
 @file{.afm}, @file{.tfm}).  Make sure you have tetex 1.0 or newer
-(1.0.6 is known to work).  You may need to install a tetex-devel (or
-tetex-dev or libkpathsea-dev) package too.
+(1.0.6 is known to work).  If you are installing binary packages, you
+may need to install tetex-devel, tetex-dev or libkpathsea-dev too.
 
 @item @uref{ftp://ftp.gnu.org/gnu/texinfo/,Texinfo} (version 4.7 or newer).
 

diff --git a/GNUmakefile.in b/GNUmakefile.in
index d4e8ae5ebe62b639d6bdf303e5be9b3fa9b6500d..8ede7e6cda93b154269ca7f27b3bbda9ffd57ee6 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -114,7 +114,8 @@ $(builddir)/share/lilypond-force:
                ln -s $(abs-srcdir)/scm
        cd $(builddir)/share/lilypond/tex && \
                ln -s $(abs-srcdir)/tex source && \
-               ln -s ../../../mf/$(outconfbase) generate
+               ln -s ../../../tex/$(outconfbase) tex-out && \
+               ln -s ../../../mf/$(outconfbase) mf-out
        cd $(builddir)/share/lilypond/fonts && \
                ln -s $(abs-srcdir)/mf source && \
                ln -s ../../../mf/$(outconfbase) afm && \

diff --git a/SConstruct b/SConstruct
index 5adfcb3058df19280ddf37615907e6120a6253ad..f3067fd56f0a80bc87a11df3f50d9bab8c840020 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -367,6 +367,8 @@ def configure (target, source, env):
                cpppath = []
                if env.has_key ('CPPPATH'):
                        cpppath = env['CPPPATH']
+
+       ## FIXME: linkage, check for libguile.h and scm_boot_guile
        #this could happen after flower...
        env.ParseConfig ('guile-config compile')
 
@@ -674,7 +676,8 @@ def symlink_tree (target, source, env):
              ('mf',         'share/lilypond/fonts/tfm'),
              ('mf',         'share/lilypond/fonts/type1'),
              ('#tex',       'share/lilypond/tex/source'),
-             ('mf',         'share/lilypond/tex/generate'),
+             ('tex',        'share/lilypond/tex/tex-out'),
+             ('mf',         'share/lilypond/tex/mf-out'),
              ('#ly',        'share/lilypond/ly'),
              ('#scm',       'share/lilypond/scm'),
              ('#ps',        'share/lilypond/ps'),

diff --git a/lily/main.cc b/lily/main.cc
index 437100dc392126260cdc8ecc6fe7d13ff46f6052..edd9ba013e4e2036482d37a4bed83bf85dcdcdbe 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -125,7 +125,7 @@ static Getopt_long *option_parser = 0;
 static Long_option_init options_static[] =
   {
     {_i ("EXPR"), "evaluate", 'e',
-     _i ("set options, use -e '(ly:option-usage)' for help")},
+     _i ("set option, use -e '(ly:option-usage)' for help")},
     /* Bug in option parser: --output=foe is taken as an abbreviation
        for --output-format.  */
     {_i ("EXT"), "format", 'f', _i ("select back-end to use")},
@@ -191,7 +191,7 @@ static void
 usage ()
 {
   /* No version number or newline here.  It confuses help2man.  */
-  printf (_f ("Usage: %s [OPTIONS]... FILE...", PROGRAM_NAME).to_str0 ());
+  printf (_f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).to_str0 ());
   printf ("\n\n");
   printf (_ ("Typeset music and/or produce MIDI from FILE.").to_str0 ());
   printf ("\n\n");

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index a91e4276c735b9c2434848c144b499f72457a217..ecf44f68f7830817424c8893c2d9a082ac208680 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -514,6 +514,20 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
     GUILE_PATCH_LEVEL=`expr $guile_version : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
     changequote([, ])dnl
     STEPMAKE_GUILE_FLAGS
+    save_CPPFLAGS="$CPPFLAGS"
+    save_LIBS="$LIBS"
+    CPPFLAGS="$GUILE_CFLAGS $CPPFLAGS"
+    LIBS="$GUILE_LDFLAGS $LIBS"
+    AC_CHECK_HEADERS([libguile.h])
+    AC_CHECK_LIB(guile, scm_boot_guile)
+    AC_CHECK_FUNCS(scm_boot_guile,,libguile_b=no)
+    if test "$libguile_b" = "no"; then
+           warn='libguile (libguile-dev, guile-devel or guile-dev
+   package).'
+           STEPMAKE_ADD_ENTRY(REQUIRED, $warn)
+    fi
+    CPPFLAGS="$save_CPPFLAGS"
+    LIBS="$save_LIBS"
     AC_DEFINE_UNQUOTED(GUILE_MAJOR_VERSION, $GUILE_MAJOR_VERSION)
     AC_DEFINE_UNQUOTED(GUILE_MINOR_VERSION, $GUILE_MINOR_VERSION)
     AC_DEFINE_UNQUOTED(GUILE_PATCH_LEVEL, $GUILE_PATCH_LEVEL)