lilypond-1.3.71

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index f7d9daed120f6beea0e43a3afa4d0f6ac7db6d94..3ae43ce2fe1b2b87e64f25cb404665fd9dacc854 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -91,6 +91,9 @@ files.
 
 If you do not want to use PostScript output, edit @file{mf/GNUmakefile}.
 
+@item kpathsea, a library for searching (TeX) files.  @code{kpathsea} is
+usually included with your installation of TeX. 
+
 
 @end itemize
 

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 16218df88e8373db8e0e5e055fad58cf64ac0605..76993047696e78edadee537ab1ca3adb94a5308b 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -6,15 +6,16 @@ depth = ..
 NAME = lilypond
 SUBDIRS = include
 
+EXTRA_LIBES=-lkpathsea
 MODULE_LIBS=$(depth)/flower 
-MODULE_INCLUDES= $(depth)/flower/include 
+MODULE_INCLUDES= $(depth)/flower/include
 MODULE_CXXFLAGS=
 HELP2MAN_EXECS = lilypond
 
 STEPMAKE_TEMPLATES= c++ executable po help2man
 
 include $(depth)/make/stepmake.make 
-
+EXTRA_LIBES=-lkpathsea
 # force these: Make can't know these have to be generated in advance
 $(outdir)/my-lily-parser.o: $(outdir)/parser.hh
 $(outdir)/my-lily-lexer.o: $(outdir)/parser.hh

diff --git a/lily/main.cc b/lily/main.cc
index d5752455707c7b65adade9bd7fbaa1c9014343de..f1362afc9b3921ad210f3b8f7602514285a8f88b 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -15,7 +15,6 @@
 #include "lily-version.hh"
 
 #include "all-font-metrics.hh"
-#include "proto.hh"
 #include "getopt-long.hh"
 #include "misc.hh"
 #include "string.hh"
@@ -33,6 +32,9 @@
 #include <libintl.h>
 #endif
 
+extern "C" {
+#include <kpathsea/kpathsea.h>
+}
 
 bool verbose_global_b = false;
 bool no_paper_global_b = false;
@@ -309,6 +311,12 @@ main (int argc, char **argv)
   setenv ("GUILE_INIT_SEGMENT_SIZE_1", "4194304", 0);
   setenv ("GUILE_MAX_SEGMENT_SIZE", "8388608", 0);
 
+  /*
+   initialize kpathsea
+   */
+  kpse_set_program_name(argv[0], NULL);
+  kpse_maketex_option("tfm", TRUE);
+
   oparser_global_p = new Getopt_long(argc, argv,theopts);
   while (Long_option_init const * opt = (*oparser_global_p)())
     {