diff options
| -rw-r--r-- | config.make.in | 5 | ||||
| -rw-r--r-- | configure.ac | 109 |
2 files changed, 0 insertions, 114 deletions
diff --git a/config.make.in b/config.make.in index fd9f53981a..e915a0b3cd 100644 --- a/config.make.in +++ b/config.make.in @@ -90,11 +90,6 @@ lilypond_omfdir = $(local_package_omfdir) webdir = $(lilypond_docdir)/html vimdir = $(lilypond_datadir)/vim - -NCSB_SOURCE_FILES = @NCSB_SOURCE_FILES@ -NCSB_DIR = @NCSB_DIR@ -HELV_SOURCE_FILES = @HELV_SOURCE_FILES@ -COUR_SOURCE_FILES = @COUR_SOURCE_FILES@ TEXGYRE_DIR = @TEXGYRE_DIR@ TEXGYRE_FILES = @TEXGYRE_FILES@ diff --git a/configure.ac b/configure.ac index 87b501bcb4..11ccebaef1 100644 --- a/configure.ac +++ b/configure.ac @@ -32,12 +32,6 @@ AC_ARG_ENABLE(guile2, [highly experimental GUILE 2 support. Default: off])], [GUILEv2=$enableval]) -AC_ARG_WITH(fonts-dir, - [AS_HELP_STRING([--with-fonts-dir=DIR], - [location of URW++ fonts.])], - [NCSB_DIR=$withval], - [NCSB_DIR=""]) - AC_ARG_WITH(texgyre-dir, [AS_HELP_STRING([--with-texgyre-dir=DIR], [location of TeX Gyre fonts.])], @@ -67,109 +61,6 @@ AC_SUBST(LINK_GXX_STATICALLY) STEPMAKE_COMPILE AC_CHECK_PROG(FCLIST, fc-list, fc-list) -AC_MSG_CHECKING([for Century Schoolbook L PFB files]) -AC_SUBST(NCSB_SOURCE_FILES) -AC_SUBST(NCSB_DIR) -if test "$NCSB_DIR" = ""; then - if test "$FCLIST" != ""; then - NCSB_FILE=`$FCLIST "Century Schoolbook L:foundry=urw:fontformat=Type 1:lang=ru" file \ - | head -n 1` - if test "$NCSB_FILE" != ""; then - NCSB_FILE=`echo $NCSB_FILE | sed 's/\(:.*\)$//g'` - NCSB_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $NCSB_FILE` - NCSB_DIR=`AS_DIRNAME($NCSB_FILE)` - fi - fi -fi -if test "$NCSB_DIR" != "" ; then - for f in c059013l.pfb c059016l.pfb c059033l.pfb c059036l.pfb; do - if test ! -f "$NCSB_DIR/$f"; then - MISSING_NCSB_SOURCE_FILES="$f $MISSING_NCSB_SOURCE_FILES" - else - if test "`grep Cyrillic "$NCSB_DIR/$f"`" = ""; then - INCOMPLETE_NCSB_SOURCE_FILES="$f $INCOMPLETE_NCSB_SOURCE_FILES" - else - NCSB_SOURCE_FILES="$NCSB_DIR/$f $NCSB_SOURCE_FILES" - fi - fi - done -fi -if test "$NCSB_DIR" = "" -o "$MISSING_NCSB_SOURCE_FILES" != "$INCOMPLETE_NCSB_SOURCE_FILES"; then - AC_MSG_RESULT(no) - STEPMAKE_ADD_ENTRY(REQUIRED,International Century Schoolbook L fonts) - if test "$NCSB_DIR" = ""; then - if test "$FCLIST" = ""; then - STEPMAKE_ADD_ENTRY(REQUIRED,'(install the fc-list utility from FontConfig, or use --with-fonts-dir)') - else - STEPMAKE_ADD_ENTRY(REQUIRED,'(make sure the fc-list utility can see them, or use --with-fonts-dir)') - fi - fi - if test "$MISSING_NCSB_SOURCE_FILES" != ""; then - STEPMAKE_ADD_ENTRY(REQUIRED,'(these files are missing: $MISSING_NCSB_SOURCE_FILES)') - fi - if test "$INCOMPLETE_NCSB_SOURCE_FILES" != ""; then - STEPMAKE_ADD_ENTRY(REQUIRED,'(these files do not contain Cyrillic characters: $INCOMPLETE_NCSB_SOURCE_FILES)') - fi -else - AC_MSG_RESULT(yes) -fi - -AC_MSG_CHECKING([for Nimbus Sans L (Helvetica) PFB files]) -AC_SUBST(HELV_SOURCE_FILES) -if test "$NCSB_DIR" != "" ; then - for f in n019003l.pfb n019004l.pfb n019023l.pfb n019024l.pfb; do - if test ! -f "$NCSB_DIR/$f"; then - MISSING_HELV_SOURCE_FILES="$f $MISSING_HELV_SOURCE_FILES" - else - if test "`grep Cyrillic "$NCSB_DIR/$f"`" = ""; then - INCOMPLETE_HELV_SOURCE_FILES="$f $INCOMPLETE_HELV_SOURCE_FILES" - else - HELV_SOURCE_FILES="$NCSB_DIR/$f $HELV_SOURCE_FILES" - fi - fi - done -fi -if test "$NCSB_DIR" = "" -o "$MISSING_HELV_SOURCE_FILES" != "$INCOMPLETE_HELV_SOURCE_FILES"; then - AC_MSG_RESULT(no) - STEPMAKE_ADD_ENTRY(REQUIRED,International Nimbus Sans L fonts) - if test "$MISSING_HELV_SOURCE_FILES" != ""; then - STEPMAKE_ADD_ENTRY(REQUIRED,'(these files are missing: $MISSING_HELV_SOURCE_FILES)') - fi - if test "$INCOMPLETE_HELV_SOURCE_FILES" != ""; then - STEPMAKE_ADD_ENTRY(REQUIRED,'(these files do not contain Cyrillic characters: $INCOMPLETE_HELV_SOURCE_FILES)') - fi -else - AC_MSG_RESULT(yes) -fi - -AC_MSG_CHECKING([for Nimbus Mono L (Courier) PFB files]) -AC_SUBST(COUR_SOURCE_FILES) -if test "$NCSB_DIR" != "" ; then - for f in n022003l.pfb n022004l.pfb n022023l.pfb n022024l.pfb; do - if test ! -f "$NCSB_DIR/$f"; then - MISSING_COUR_SOURCE_FILES="$f $MISSING_COUR_SOURCE_FILES" - else - if test "`grep Cyrillic "$NCSB_DIR/$f"`" = ""; then - INCOMPLETE_COUR_SOURCE_FILES="$f $INCOMPLETE_COUR_SOURCE_FILES" - else - COUR_SOURCE_FILES="$NCSB_DIR/$f $COUR_SOURCE_FILES" - fi - fi - done -fi -if test "$NCSB_DIR" = "" -o "$MISSING_COUR_SOURCE_FILES" != "$INCOMPLETE_COUR_SOURCE_FILES"; then - AC_MSG_RESULT(no) - STEPMAKE_ADD_ENTRY(REQUIRED,International Nimbus Mono L fonts) - if test "$MISSING_COUR_SOURCE_FILES" != ""; then - STEPMAKE_ADD_ENTRY(REQUIRED,'(these files are missing: $MISSING_COUR_SOURCE_FILES)') - fi - if test "$INCOMPLETE_COUR_SOURCE_FILES" != ""; then - STEPMAKE_ADD_ENTRY(REQUIRED,'(these files do not contain Cyrillic characters: $INCOMPLETE_COUR_SOURCE_FILES)') - fi -else - AC_MSG_RESULT(yes) -fi - AC_MSG_CHECKING([for TeX Gyre fonts OTF files]) AC_SUBST(TEXGYRE_DIR) AC_SUBST(TEXGYRE_FILES) |