From 16cacae1942bf83ad3347ffa3fc53af3e9a81055 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 23 Sep 2001 17:33:52 +0200 Subject: [PATCH] patch::: 1.5.12.jcn2 1.5.12.jcn2 --- CHANGES | 6 +++++- VERSION | 2 +- aclocal.m4 | 9 ++++++--- scripts/ly2dvi.py | 3 ++- stepmake/aclocal.m4 | 9 ++++++--- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/CHANGES b/CHANGES index d0c262d784..fe629cb580 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,10 @@ -1.5.12.jcn1 +1.5.12.jcn2 =========== +* half-baken --with-kpathsea configuration fix. + +* ly2dvi: add `.' to TEXINPUTS to catch broken TEXINPUTS settings. + * guile-1.4 compile fix. 1.5.12 diff --git a/VERSION b/VERSION index 54ed4d82ae..c00e6694d3 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=12 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=jcn2 # 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 fd2b360a3a..1cf59b1171 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -435,17 +435,20 @@ dnl fi AC_DEFUN(AC_STEPMAKE_KPATHSEA, [ kpathsea_b=yes + #FIXME --with-xxx is meant for specifying a PATH too, + # so this should read: --enable-kpathsea, + # or --with-kpathsea-include=PATH --with-kpathsea-lib=PATH AC_ARG_WITH(kpathsea, [ --with-kpathsea use kpathsea lib. Default: on], - [kpathsea_b=$enableval]) + [kpathsea_b=$with_kpathsea]) - if test "$kpathsea_b" = "yes"; then + if test "$kpathsea_b" != "no"; then AC_HAVE_HEADERS(kpathsea/kpathsea.h) AC_CHECK_LIB(kpathsea, kpse_find_file) AC_CHECK_FUNCS(kpse_find_file,, AC_ERROR(Cannot find kpathsea functions. You should install kpathsea; see INSTALL.txt. Rerun ./configure --without-kpathsea only if kpathsea is not available for your platform.)) fi AC_MSG_CHECKING(whether to use kpathsea) - if test "$kpathsea_b" = yes; then + if test "$kpathsea_b" != no; then AC_MSG_RESULT(yes) KPATHSEA=1 else diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 50fa1bca87..dbf3fc6193 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -159,7 +159,8 @@ verbose_p = 0 # environment = { 'MFINPUTS' : datadir + '/mf' + ':', - 'TEXINPUTS': datadir + '/tex:' + datadir + '/ps:' + os.getcwd() + ':', + 'TEXINPUTS': datadir + '/tex:' + datadir + '/ps:' + '.:' + + os.getcwd() + ':', 'TFMFONTS' : datadir + '/tfm' + ':', 'GS_FONTPATH' : datadir + '/afm:' + datadir + '/pfa', 'GS_LIB' : datadir + '/ps', diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index fd2b360a3a..1cf59b1171 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -435,17 +435,20 @@ dnl fi AC_DEFUN(AC_STEPMAKE_KPATHSEA, [ kpathsea_b=yes + #FIXME --with-xxx is meant for specifying a PATH too, + # so this should read: --enable-kpathsea, + # or --with-kpathsea-include=PATH --with-kpathsea-lib=PATH AC_ARG_WITH(kpathsea, [ --with-kpathsea use kpathsea lib. Default: on], - [kpathsea_b=$enableval]) + [kpathsea_b=$with_kpathsea]) - if test "$kpathsea_b" = "yes"; then + if test "$kpathsea_b" != "no"; then AC_HAVE_HEADERS(kpathsea/kpathsea.h) AC_CHECK_LIB(kpathsea, kpse_find_file) AC_CHECK_FUNCS(kpse_find_file,, AC_ERROR(Cannot find kpathsea functions. You should install kpathsea; see INSTALL.txt. Rerun ./configure --without-kpathsea only if kpathsea is not available for your platform.)) fi AC_MSG_CHECKING(whether to use kpathsea) - if test "$kpathsea_b" = yes; then + if test "$kpathsea_b" != no; then AC_MSG_RESULT(yes) KPATHSEA=1 else -- 2.39.5