X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.make.in;h=9837fc3e49f7ec52000e44fbd2c525ddc7c91031;hb=88eb0d023d44ae430f3bbce8e4c03a6382cc3d27;hp=55dfaefda36c5d75b8cac538be60cdfb1f6aaedc;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git diff --git a/config.make.in b/config.make.in index 55dfaefda3..9837fc3e49 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@ @@ -50,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 @@ -90,6 +90,7 @@ vimdir = $(lilypond_datadir)/vim NCSB_SOURCE_FILES = @NCSB_SOURCE_FILES@ +NCSB_DIR = @NCSB_DIR@ ################################################################ ## PROGRAMS @@ -102,12 +103,12 @@ CC = @CC@ CONFIGSUFFIX = @CONFIGSUFFIX@ CROSS = @cross_compiling@ CXX = @CXX@ +DBLATEX = @DBLATEX@ DEFINES = @DEFS@ @DEFINES@ DEFS = @DEFS@ DOCUMENTATION = @DOCUMENTATION@ -DOTEXE = @DOTEXE@ FIND = @FIND@ -FCMATCH = @FCMATCH@ +FCLIST = @FCLIST@ FLEX = @FLEX@ FLEXLEXER_FILE = @FLEXLEXER_FILE@ FONTFORGE = @FONTFORGE@ @@ -116,34 +117,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@ +PYTHON = @PYTHON@ -tt +TARGET_PYTHON = @PYTHON@ -tt RANLIB = @RANLIB@ ROOTSEP = @ROOTSEP@ SHELL = @SHELL@ -SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@ TAR = @TAR@ WINDRES = @WINDRES@ YACC = @YACC@ ZIP = @ZIP@ - - -