X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.make.in;h=3ed8e53b05b5dde9123bec6be15e7debf7ed5511;hb=b16d78084944afc117e8bb972d277e70c6d23208;hp=bd28f57ceebc35a39fec45168db5d2b10b0596ee;hpb=1d519e03f98492015b452fe72b97fd68fee27305;p=lilypond.git

diff --git a/config.make.in b/config.make.in
index bd28f57cee..3ed8e53b05 100644
--- a/config.make.in
+++ b/config.make.in
@@ -12,7 +12,6 @@ package-depth = @package_depth@
 ################################################################
 
 FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
-GTK2_CFLAGS = @GTK2_CFLAGS@
 GUILE_CFLAGS = @GUILE_CFLAGS@
 PANGO_FT2_CFLAGS = @PANGO_FT2_CFLAGS@
 
@@ -24,9 +23,9 @@ CONFIG_CXXFLAGS = @CXXFLAGS@ $(GUILE_CFLAGS) $(FREETYPE2_CFLAGS) $(PANGO_FT2_CFL
 
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
 GUILE_LIBS = @GUILE_LDFLAGS@
-GTK2_LIBS = @GTK2_LIBS@
 FREETYPE2_LIBS = @FREETYPE2_LIBS@
 PANGO_FT2_LIBS = @PANGO_FT2_LIBS@
+CXXABI_LIBS = @CXXABI_LIBS@
 
 CONFIG_LIBS = @LIBS@ @EXTRA_LIBS@ $(GUILE_LIBS) $(PANGO_FT2_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS)
 CONFIG_LDFLAGS = @LDFLAGS@
@@ -35,6 +34,8 @@ PACKAGE = @PACKAGE@
 package = @package@
 PACKAGE_NAME = @PACKAGE_NAME@
 
+HOST_ARCH=@HOST_ARCH@
+
 ################################################################
 ## FILESYSTEM
 ################################################################
@@ -48,6 +49,7 @@ configure-srcdir = @srcdir@
 bindir = @bindir@
 build_lilypond_datadir = @build_package_datadir@
 build_lilypond_libdir = @build_package_libdir@
+datarootdir = @datarootdir@
 datadir = @datadir@
 docdir = $(datadir)/doc
 elispdir = $(datadir)/emacs/site-lisp
@@ -87,7 +89,7 @@ webdir = $(lilypond_docdir)/html
 vimdir = $(lilypond_datadir)/vim
 
 
-NCSB_DIR = @NCSB_DIR@
+NCSB_SOURCE_FILES = @NCSB_SOURCE_FILES@
 
 ################################################################
 ## PROGRAMS
@@ -100,11 +102,12 @@ CC = @CC@
 CONFIGSUFFIX = @CONFIGSUFFIX@
 CROSS = @cross_compiling@
 CXX = @CXX@
+DBLATEX = @DBLATEX@
 DEFINES = @DEFS@ @DEFINES@
 DEFS = @DEFS@
 DOCUMENTATION = @DOCUMENTATION@
-DOTEXE = @DOTEXE@
 FIND = @FIND@
+FCLIST = @FCLIST@
 FLEX = @FLEX@
 FLEXLEXER_FILE = @FLEXLEXER_FILE@
 FONTFORGE = @FONTFORGE@
@@ -113,31 +116,26 @@ GUILE = @GUILE@
 GUILE_CFLAGS = @GUILE_CFLAGS@
 GUILE_CONFIG = @GUILE_CONFIG@
 GUILE_LDFLAGS = @GUILE_LDFLAGS@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-INIMETAFONT = @INIMETAFONT@
-KPATHSEA_LIBS = @KPATHSEA_LIBS@
 LD = @LD@
 LINK_GXX_STATICALLY = @LINK_GXX_STATICALLY@
 LN = @LN@
 LN_S = @LN_S@
 MAKEINFO_PROGRAM = @MAKEINFO@
-MAKEINFO_VERSION = @MAKEINFO_VERSION@
+TEXI2HTML_PROGRAM = @TEXI2HTML@
 METAFONT = @METAFONT@ -progname=mf
 MFMODE = @MFMODE@
-MFTRACE = @MFTRACE@
 MSGFMT = @MSGFMT@
 PAPERSIZE=a4
 PATHSEP = @PATHSEP@
+PDFLATEX = @PDFLATEX@
 PERL = @PERL@
 PLATFORM_WINDOWS = @PLATFORM_WINDOWS@
 PYTHON = @PYTHON@
+TARGET_PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 ROOTSEP = @ROOTSEP@
 SHELL = @SHELL@
-SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@
 TAR = @TAR@
 WINDRES = @WINDRES@
 YACC = @YACC@
 ZIP = @ZIP@
-