From: Jan Nieuwenhuizen Date: Mon, 12 Oct 1998 20:06:51 +0000 (+0300) Subject: patch::: 1.0.15.jcn1: (+ 1 2) X-Git-Tag: release/1.0.16~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4bbb44a0ce9561443efbcbd2f2a0aec90f2ae6e7;p=lilypond.git patch::: 1.0.15.jcn1: (+ 1 2) pl 15.jcn1 - autoconf on mf,mfont mp,mpost --- diff --git a/NEWS b/NEWS index 104db47365..68ee27c246 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +pl 15.jcn1 + - autoconf on mf,mfont mp,mpost + pl 15 pl 14.hwn1 - \lyrics iso \lyric (mudela 1.0.7) diff --git a/VERSION b/VERSION index 146c8727d6..90ec2ef110 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_LEVEL=15 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/aclocal.m4 b/aclocal.m4 index 9aae46c032..5844b69dcf 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -396,7 +396,7 @@ AC_DEFUN(AC_STEPMAKE_MSGFMT, [ fi ]) -AC_DEFUN(AC_STEPMAKE_TEXMF, [ +AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ AC_ARG_ENABLE(tex-prefix, [ enable-tex-prefix=DIR set the tex-directory to find TeX subdirectories. (default: PREFIX)], [TEXPREFIX=$enableval], @@ -425,12 +425,29 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [ if test "x$TEXDIR" = xauto ; then AC_TEX_SUBDIR(TEXDIR) fi - AC_SUBST(TEXPREFIX) AC_SUBST(TEXDIR) AC_SUBST(MFDIR) ]) +AC_DEFUN(AC_STEPMAKE_TEXMF, [ + # urg, never know what names these teTeX guys will think up + AC_CHECK_PROGS(METAFONT, mf, no) + if test "x$METAFONT" = "xno"; then + AC_CHECK_PROGS(MFONT, mfont, -echo no mf or mfont) + METAFONT=$MFONT + fi + + AC_CHECK_PROGS(METAPOST, mp, no) + if test "x$METAPOST" = "xno"; then + AC_CHECK_PROGS(MPOST, mpost, -echo no mp or mpost) + METAPOST=$MPOST + fi + + AC_SUBST(METAFONT) + AC_SUBST(METAPOST) +]) + AC_DEFUN(AC_STEPMAKE_WARN, [ AC_MSG_WARN($1) warn_b=yes diff --git a/config.make.in b/config.make.in index 021262f252..292783aab0 100644 --- a/config.make.in +++ b/config.make.in @@ -47,6 +47,8 @@ FIND = @FIND@ FLEX = @FLEX@ LN = @LN@ LN_S = @LN_S@ +METAFONT = @METAFONT@ +METAPOST = @METAPOST@ MSGFMT = @MSGFMT@ PATHSEP = @PATHSEP@ PERL = @PERL@ diff --git a/configure.in b/configure.in index 0774dcc824..22893a11fe 100644 --- a/configure.in +++ b/configure.in @@ -34,7 +34,8 @@ AC_STEPMAKE_LIB AC_STEPMAKE_LOCALE AC_STEPMAKE_GETTEXT AC_STEPMAKE_MSGFMT -# AC_STEPMAKE_TEXMF +AC_STEPMAKE_TEXMF +# AC_STEPMAKE_TEXMF_DIRS AC_STEPMAKE_YODL diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR index 86cdccd5b8..79dc5319e7 100644 --- a/make/STATE-VECTOR +++ b/make/STATE-VECTOR @@ -100,3 +100,4 @@ 1.0.14 1.0.14.hwn1 1.0.15 +1.0.15.jcn1 diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index ff8f808a82..ebbe27e3c7 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -394,7 +394,7 @@ AC_DEFUN(AC_STEPMAKE_MSGFMT, [ fi ]) -AC_DEFUN(AC_STEPMAKE_TEXMF, [ +AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [ AC_ARG_ENABLE(tex-prefix, [ enable-tex-prefix=DIR set the tex-directory to find TeX subdirectories. (default: PREFIX)], [TEXPREFIX=$enableval], @@ -423,12 +423,29 @@ AC_DEFUN(AC_STEPMAKE_TEXMF, [ if test "x$TEXDIR" = xauto ; then AC_TEX_SUBDIR(TEXDIR) fi - AC_SUBST(TEXPREFIX) AC_SUBST(TEXDIR) AC_SUBST(MFDIR) ]) +AC_DEFUN(AC_STEPMAKE_TEXMF, [ + # urg, never know what names these teTeX guys will think up + AC_CHECK_PROGS(METAFONT, mf, no) + if test "x$METAFONT" = "xno"; then + AC_CHECK_PROGS(MFONT, mfont, -echo no mf or mfont) + METAFONT=$MFONT + fi + + AC_CHECK_PROGS(METAPOST, mp, no) + if test "x$METAPOST" = "xno"; then + AC_CHECK_PROGS(MPOST, mpost, -echo no mp or mpost) + METAPOST=$MPOST + fi + + AC_SUBST(METAFONT) + AC_SUBST(METAPOST) +]) + AC_DEFUN(AC_STEPMAKE_WARN, [ AC_MSG_WARN($1) warn_b=yes diff --git a/stepmake/config.make.in b/stepmake/config.make.in index 021262f252..292783aab0 100644 --- a/stepmake/config.make.in +++ b/stepmake/config.make.in @@ -47,6 +47,8 @@ FIND = @FIND@ FLEX = @FLEX@ LN = @LN@ LN_S = @LN_S@ +METAFONT = @METAFONT@ +METAPOST = @METAPOST@ MSGFMT = @MSGFMT@ PATHSEP = @PATHSEP@ PERL = @PERL@ diff --git a/stepmake/configure.in b/stepmake/configure.in index 30b29f450c..892338dac1 100644 --- a/stepmake/configure.in +++ b/stepmake/configure.in @@ -25,6 +25,7 @@ AC_STEPMAKE_LOCALE # AC_STEPMAKE_MAN # AC_STEPMAKE_MSGFMT # AC_STEPMAKE_TEXMF +# AC_STEPMAKE_TEXMF_DIRS AC_STEPMAKE_YODL # AM_PATH_GTK(1.0.0,,AC_MSG_ERROR([please install proper version of gtk])) diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make index 210a6d1ab8..b9e253e114 100644 --- a/stepmake/stepmake/metafont-rules.make +++ b/stepmake/stepmake/metafont-rules.make @@ -1,22 +1,22 @@ $(outdir)/%.dvi: %.mf - mf $< + $(METAFONT) $< gftodvi $(basename $<) mv $(basename $<).dvi $(outdir) rm $(basename $<).*gf $(outdir)/%.log: %.mf - mf $< + $(METAFONT) $< mv $(@F) $@ rm $(basename $< ).*gf $(outdir)/%.tfm: %.mf - mf '\mode:=ljfour; input $<;' + $(METAFONT) '\mode:=ljfour; input $<;' mv $(@F) $(outdir) rm $(basename $<).*gf $(basename $<).*log $(outdir)/%.$(XPM_RESOLUTION)gf: %.mf - mf "\\mode=$(XPM_MODE); \\input $<" + $(METAFONT) "\\mode=$(XPM_MODE); \\input $<" mv $(@F) out rm -f $(basename $<).log $(basename $<).tfm diff --git a/stepmake/stepmake/metapost-rules.make b/stepmake/stepmake/metapost-rules.make index a29f2508b4..866786d15b 100644 --- a/stepmake/stepmake/metapost-rules.make +++ b/stepmake/stepmake/metapost-rules.make @@ -4,11 +4,8 @@ $(outdir)/%.pfa: %.mf # i've got no idea what this scaling could be for, on both sides... # it seems that 'low_res', which should be all we ever need according # to the metapost mfplain guru, really does 200dpi, iso 600dpi (minimun) - -$(METAPOST) "&mfplain \mode=lowres; \mag=100.0; batchmode; input $<" -# -mp "&mfmp \mode=ljfour; \mag=100.0; batchmode; input $<" -# -mp "&mfplain modes \mode=ljfour; \mag=100.0; batchmode; \\input $<" -# -mp "&mfplain \mode=lowres; \mag=10.0; batchmode; input $<" -# -mp "&mfplain \mode=lowres; \mag=1.0; batchmode; input $<" + $(METAPOST) "&mfplain \mode=lowres; \mag=100.0; batchmode; input $<" +# -$(METAPOST) "&mfmp \mode=ljfour; \mag=100.0; batchmode; input $<" $(PYTHON) $(depth)/buildscripts/ps-to-pfa.py $< rm -f $(basename $(@F)).[0-9]* rm -f $(basename $<).log $(basename $<).tfm