* lily/general-scheme.cc: Compile fixes: include wchar.h, string.h.

[lilypond.git] / config.make.in

diff --git a/config.make.in b/config.make.in
index f49b02586163f70e915470ed9ed1d80af1f3b391..c7e331d163cbb4dd631feaace3f12850a5b6758b 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -7,27 +7,26 @@ MISSING_REQUIRED = @REQUIRED@
 
 package-depth = @package_depth@
 
-USER_CFLAGS = @CFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@
-USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@
+USER_CFLAGS = @CFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@ @PANGO_FT2_CFLAGS@ @FREETYPE2_CFLAGS@
+USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@ @PANGO_FT2_CFLAGS@ @FREETYPE2_CFLAGS@
 USER_LDFLAGS = @LDFLAGS@ @GUILE_LDFLAGS@
-EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@
+EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@ @PANGO_FT2_LIBS@ @FREETYPE2_LIBS@
 
 PACKAGE = @PACKAGE@
 package = @package@
 PACKAGE_NAME = @PACKAGE_NAME@
 
-prefix = $(DESTDIR)@prefix@
+prefix = @prefix@
 exec_prefix = @exec_prefix@
 
 builddir = @ugh_ugh_autoconf250_builddir@
 build_lilypond_datadir = @build_package_datadir@
+build_lilypond_libdir = @build_package_libdir@
 bindir = @bindir@
 datadir = @datadir@
 includedir = @includedir@
 infodir = @infodir@
 libdir = @libdir@
-lilypond_datadir = @package_datadir@
-local_lilypond_datadir = @local_package_datadir@
 localedir = @localedir@
 mandir = @mandir@
 program_prefix = @program_prefix@
@@ -35,6 +34,33 @@ program_suffix = @program_suffix@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 stepmake = @stepmake@
+docdir = $(datadir)/doc/
+omfdir = $(datadir)/omf/
+elispdir = $(datadir)/emacs/site-lisp
+# forced instead of $(datadir)/vim
+
+# move out of config.make.in?
+package_datadir = $(datadir)/$(package)
+package_infodir = $(infodir)/$(package)
+package_libdir = $(libdir)/$(package)
+package_docdir = $(docdir)/$(package)
+package_omfdir = $(omfdir)/$(package)
+
+
+local_package_datadir = $(lilypond_datadir)/$(TOPLEVEL_VERSION)
+local_package_libdir = $(lilypond_libdir)/$(TOPLEVEL_VERSION)
+local_package_docdir = $(lilypond_docdir)/$(TOPLEVEL_VERSION)
+local_package_omfdir = $(lilypond_omfdir)/$(TOPLEVEL_VERSION)
+
+vimdir = $(local_package_datadir)/vim
+
+lilypond_datadir = $(package_datadir)
+lilypond_libdir = $(package_libdir)
+lilypond_docdir = $(package_docdir)
+lilypond_omfdir = $(package_omfdir)
+
+local_lilypond_datadir = $(local_package_datadir)
+local_lilypond_libdir = $(local_package_libdir)
 
 CC = @CC@
 GCC = @GCC@
@@ -43,8 +69,9 @@ CXX = @CXX@
 GXX = @GXX@
 LD = @LD@
 CONFIGSUFFIX = @CONFIGSUFFIX@
-MAKEINFO = @MAKEINFO@
+MAKEINFO_PROGRAM = @MAKEINFO@
 SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@
+MAKEINFO_VERSION = @MAKEINFO_VERSION@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 TFM_PATH = @TFM_PATH@
@@ -54,11 +81,10 @@ DEFINES = @DEFS@ @DEFINES@
 DOTEXE = @DOTEXE@
 INSTALL = @INSTALL@
 BASH = @BASH@
-BIBTEX2HTML=@BIBTEX2HTML@
-BIBTEX2HTML_FLAGS=@BIBTEX2HTML_FLAGS@
 BISON = @BISON@
 FIND = @FIND@
 FLEX = @FLEX@
+FONTFORGE = @FONTFORGE@
 GROFF = @GROFF@
 GUILE = @GUILE@
 GUILE_CONFIG = @GUILE_CONFIG@
@@ -67,7 +93,7 @@ GUILE_LDFLAGS = @GUILE_LDFLAGS@
 INIMETAFONT = @INIMETAFONT@
 LN = @LN@
 LN_S = @LN_S@
-METAFONT = @METAFONT@
+METAFONT = @METAFONT@ -progname=mf
 MFMODE = @MFMODE@
 MSGFMT = @MSGFMT@
 ROOTSEP = @ROOTSEP@
@@ -77,6 +103,7 @@ MFTRACE = @MFTRACE@
 PYTHON = @PYTHON@
 SHELL = @SHELL@
 TAR = @TAR@
-TBL = @TBL@
-TROFF = @TROFF@
+YACC = @YACC@
 ZIP = @ZIP@
+
+PAPERSIZE=a4