X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.make.in;h=7a7c8d5aeefab4cf56c3e30628ccd5c57595c4e1;hb=8d4c8ba8a9b7f269bdfc42cbba8975f7cfdb206e;hp=021262f2525f5269960ad1f67d46b83078779978;hpb=5626b34b525c4979eec5e9461a4560d9cdd5b36d;p=lilypond.git

diff --git a/config.make.in b/config.make.in
index 021262f252..7a7c8d5aee 100644
--- a/config.make.in
+++ b/config.make.in
@@ -1,65 +1,146 @@
 # -*-Makefile-*-
 
+MISSING_OPTIONAL = @OPTIONAL@
+MISSING_REQUIRED = @REQUIRED@
+
 # @configure_input@
 
 package-depth = @package_depth@
 
-USER_CFLAGS = @CFLAGS@
-USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@
-USER_LDFLAGS = 
+################################################################
+## FLAGS
+################################################################
+
+FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GUILE_CFLAGS = @GUILE_CFLAGS@
+PANGO_FT2_CFLAGS = @PANGO_FT2_CFLAGS@
+
+CONFIG_CPPFLAGS = @CPPFLAGS@
+CONFIG_DEFINES = @DEFINES@
+
+CONFIG_CFLAGS = @CFLAGS@ $(GUILE_CFLAGS) $(FREETYPE2_CFLAGS) $(PANGO_FT2_CFLAGS)
+CONFIG_CXXFLAGS = @CXXFLAGS@ $(GUILE_CFLAGS) $(FREETYPE2_CFLAGS) $(PANGO_FT2_CFLAGS)
+
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+GUILE_LIBS = @GUILE_LDFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+FREETYPE2_LIBS = @FREETYPE2_LIBS@
+PANGO_FT2_LIBS = @PANGO_FT2_LIBS@
+
+CONFIG_LIBS = @LIBS@ @EXTRA_LIBS@ $(GUILE_LIBS) $(PANGO_FT2_LIBS) $(FONTCONFIG_LIBS) $(FREETYPE2_LIBS)
+CONFIG_LDFLAGS = @LDFLAGS@
 
-CC = @CC@
-CXX = @CXX@
-GCC = @GCC@
-LD = @LD@
 PACKAGE = @PACKAGE@
 package = @package@
 PACKAGE_NAME = @PACKAGE_NAME@
-stepmake = @stepmake@
-state-vector = @STATE_VECTOR@
-CONFIGSUFFIX = @CONFIGSUFFIX@
-MAKEINFO = @MAKEINFO@
-ICFLAGS = @ICFLAGS@
-ILDFLAGS = @ILDFLAGS@
-libdir = @libdir@
+
+HOST_ARCH=@HOST_ARCH@
+
+################################################################
+## FILESYSTEM
+################################################################
+
 prefix = @prefix@
-TEXPREFIX = @TEXPREFIX@
-TEXDIR = @TEXDIR@
-MFDIR = @MFDIR@
-mandir = @mandir@
-infodir = @infodir@
 exec_prefix = @exec_prefix@
+
+configure-builddir = @ugh_ugh_autoconf250_builddir@
+configure-srcdir = @srcdir@
+
 bindir = @bindir@
-includedir = @includedir@
+build_lilypond_datadir = @build_package_datadir@
+build_lilypond_libdir = @build_package_libdir@
+datarootdir = @datarootdir@
 datadir = @datadir@
+docdir = $(datadir)/doc
+elispdir = $(datadir)/emacs/site-lisp
+includedir = @includedir@
+infodir = @infodir@
+libdir = @libdir@
 localedir = @localedir@
-EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@
-RANLIB = @RANLIB@
-DEFS = @DEFS@
-#SET_MAKE = @SET_MAKE@
-DEFINES = @DEFS@ @DEFINES@
-COMPILEINFO = @COMPILEINFO@
-DOTEXE = @DOTEXE@
-INSTALL = @INSTALL@
+mandir = @mandir@
+omfdir = $(datadir)/omf
+program_prefix = @program_prefix@
+program_suffix = @program_suffix@
+sharedstatedir = @sharedstatedir@
+stepmake = @stepmake@
+
+package_datadir = $(datadir)/$(package)
+package_infodir = $(infodir)/$(package)
+package_libdir = $(libdir)/$(package)
+package_docdir = $(docdir)/$(package)
+package_omfdir = $(omfdir)/$(package)
+
+local_package_datadir = $(package_datadir)/$(TOPLEVEL_VERSION)
+local_package_docdir = $(package_docdir)/$(TOPLEVEL_VERSION)
+local_package_libdir = $(package_libdir)/$(TOPLEVEL_VERSION)
+local_package_omfdir = $(package_omfdir)/$(TOPLEVEL_VERSION)
+
+local_lilypond_datadir = $(local_package_datadir)
+local_lilypond_docdir = $(local_package_docdir)
+local_lilypond_libdir = $(local_package_libdir)
+local_lilypond_omfdir = $(local_package_omfdir)
+
+lilypond_datadir = $(local_package_datadir)
+lilypond_libdir = $(local_package_libdir)
+lilypond_docdir = $(package_docdir)
+lilypond_omfdir = $(local_package_omfdir)
+
+webdir = $(lilypond_docdir)/html
+vimdir = $(lilypond_datadir)/vim
+
+
+NCSB_SOURCE_FILES = @NCSB_SOURCE_FILES@
+
+################################################################
+## PROGRAMS
+################################################################
+
+AR = @AR@
 BASH = @BASH@
 BISON = @BISON@
+CC = @CC@
+CONFIGSUFFIX = @CONFIGSUFFIX@
+CROSS = @cross_compiling@
+CXX = @CXX@
+DEFINES = @DEFS@ @DEFINES@
+DEFS = @DEFS@
+DOCUMENTATION = @DOCUMENTATION@
+DOTEXE = @DOTEXE@
 FIND = @FIND@
+FCMATCH = @FCMATCH@
 FLEX = @FLEX@
+FLEXLEXER_FILE = @FLEXLEXER_FILE@
+FONTFORGE = @FONTFORGE@
+GROFF = @GROFF@
+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@
+METAFONT = @METAFONT@ -progname=mf
+MFMODE = @MFMODE@
+MFTRACE = @MFTRACE@
 MSGFMT = @MSGFMT@
+PAPERSIZE=a4
 PATHSEP = @PATHSEP@
 PERL = @PERL@
+PLATFORM_WINDOWS = @PLATFORM_WINDOWS@
 PYTHON = @PYTHON@
-TAR= @TAR@
-STRIPROFF = @STRIPROFF@
-TROFF = @TROFF@
-YODL= @YODL@
-YODL2HTML= @YODL2HTML@
-YODL2LATEX= @YODL2LATEX@
-YODL2MAN= @YODL2MAN@
-YODL2MSLESS= @YODL2MSLESS@
-YODL2TEXINFO= @YODL2TEXINFO@
-YODL2TXT= @YODL2TXT@
+TARGET_PYTHON = @PYTHON@
+RANLIB = @RANLIB@
+ROOTSEP = @ROOTSEP@
+SHELL = @SHELL@
+SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@
+TAR = @TAR@
+WINDRES = @WINDRES@
+YACC = @YACC@
 ZIP = @ZIP@
-