patch::: 1.5.12.jcn2

1.5.12.jcn2

diff --git a/CHANGES b/CHANGES
index d0c262d784d11748b6424e7b34e755fb8daf40f7..fe629cb5808df33d412c4f8f575de03f649ad313 100644 (file)
--- 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 54ed4d82aedd7fead3d4390ada0002671db45258..c00e6694d3eed370b80e76d73d2d699636bca993 100644 (file)
--- 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 fd2b360a3a6c614439e3b41ef5731d43c8587a2e..1cf59b1171348ba86c1f508011fbae7647f86123 100644 (file)
--- 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 50fa1bca87f5519f0bccf397fb12c789ec9daf62..dbf3fc6193b5cf1fb0b97807bc398a9ea777cbad 100644 (file)
--- 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 fd2b360a3a6c614439e3b41ef5731d43c8587a2e..1cf59b1171348ba86c1f508011fbae7647f86123 100644 (file)
--- 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