From 98ea09d968c197e48a372f6326eec81a739f59f0 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 21:25:39 +0000 Subject: [PATCH] lilypond-1.0.8 --- aclocal.m4 | 4 +++- configure | 68 +++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 55 insertions(+), 17 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 9947522568..3f1287644c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -439,6 +439,7 @@ AC_DEFUN(AC_STEPMAKE_YODL, [ AC_CHECK_PROGS(YODL2HTML, yodl2html, -echo no yodl) AC_CHECK_PROGS(YODL2LATEX, yodl2latex, ) AC_CHECK_PROGS(YODL2MAN, yodl2man, -echo no yodl) + AC_CHECK_PROGS(YODL2MSLESS, yodl2msless, -echo no yodl) AC_CHECK_PROGS(YODL2TEXINFO, yodl2texinfo, -echo no yodl) AC_CHECK_PROGS(YODL2TXT, yodl2txt, -echo no yodl) else @@ -446,9 +447,10 @@ AC_DEFUN(AC_STEPMAKE_YODL, [ AC_SUBST(YODL2HTML) AC_SUBST(YODL2LATEX) AC_SUBST(YODL2MAN) + AC_SUBST(YODL2MSLESS) AC_SUBST(YODL2TEXINFO) AC_SUBST(YODL2TXT) - export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2TEXINFO YODL2TXT + export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT fi if test "x$YODL" = "-echo no yodl"; then AC_STEPMAKE_WARN(Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl)) diff --git a/configure b/configure index d5e61aee35..699e1f1c5a 100755 --- a/configure +++ b/configure @@ -2194,12 +2194,46 @@ test -n "$YODL2MAN" && break done test -n "$YODL2MAN" || YODL2MAN="-echo no yodl" - for ac_prog in yodl2texinfo + for ac_prog in yodl2msless do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:2203: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2MSLESS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2MSLESS"; then + ac_cv_prog_YODL2MSLESS="$YODL2MSLESS" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2MSLESS="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2MSLESS="$ac_cv_prog_YODL2MSLESS" +if test -n "$YODL2MSLESS"; then + echo "$ac_t""$YODL2MSLESS" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2MSLESS" && break +done +test -n "$YODL2MSLESS" || YODL2MSLESS="-echo no yodl" + + for ac_prog in yodl2texinfo +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:2237: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TEXINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2233,7 +2267,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2237: checking for $ac_word" >&5 +echo "configure:2271: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2269,7 +2303,8 @@ test -n "$YODL2TXT" || YODL2TXT="-echo no yodl" - export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2TEXINFO YODL2TXT + + export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT fi if test "x$YODL" = "-echo no yodl"; then @@ -2291,7 +2326,7 @@ test -n "$YODL2TXT" || YODL2TXT="-echo no yodl" echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2295: checking for 8-bit clean memcmp" >&5 +echo "configure:2330: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2299,7 +2334,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2330,12 +2365,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o" echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2334: checking for vprintf" >&5 +echo "configure:2369: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2385,12 +2420,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2389: checking for _doprnt" >&5 +echo "configure:2424: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2443,12 +2478,12 @@ fi for ac_func in memmem snprintf vsnprintf gettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2447: checking for $ac_func" >&5 +echo "configure:2482: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2513,7 +2548,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2517: checking for $ac_word" >&5 +echo "configure:2552: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2732,6 +2767,7 @@ s%@YODL@%$YODL%g s%@YODL2HTML@%$YODL2HTML%g s%@YODL2LATEX@%$YODL2LATEX%g s%@YODL2MAN@%$YODL2MAN%g +s%@YODL2MSLESS@%$YODL2MSLESS%g s%@YODL2TEXINFO@%$YODL2TEXINFO%g s%@YODL2TXT@%$YODL2TXT%g s%@LIBOBJS@%$LIBOBJS%g -- 2.39.5