From b1e0774cfe58ab5ca1f1ade42e4dc9c2496ca828 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 18 Apr 2005 21:31:24 +0000 Subject: [PATCH] SCons updates --- ChangeLog | 2 ++ Documentation/topdocs/SConscript | 2 +- SConstruct | 4 ++-- buildscripts/builder.py | 2 +- stepmake/aclocal.m4 | 40 ++++++++++++++++++++++++++++---- 5 files changed, 41 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index c56e1b001d..27ac10e736 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ 2005-04-18 Jan Nieuwenhuizen + * aclocal.m4: Massage package names. + * SCons updates. 2005-04-18 Han-Wen Nienhuys diff --git a/Documentation/topdocs/SConscript b/Documentation/topdocs/SConscript index 9de9dcb0c1..7ef165cd93 100644 --- a/Documentation/topdocs/SConscript +++ b/Documentation/topdocs/SConscript @@ -3,7 +3,7 @@ Import ('env', 'src_glob', 'install') tely = src_glob ('*.tely') -texi = src_glob ('*.texi') +texi = src_glob ('*.texi') + map (env.TEXI, tely) txt = map (env.TXT, texi) html = map (env.HTML, texi) diff --git a/SConstruct b/SConstruct index aeba869546..c515d9096f 100644 --- a/SConstruct +++ b/SConstruct @@ -884,7 +884,7 @@ def flatten (tree, lst): lst.append (i) return lst -if os.path.isdir ('$srcdir/CVS'): +if os.path.isdir ('%(srcdir)s/CVS' % vars ()): subdirs = flatten (cvs_dirs ('.'), []) else: # ugh @@ -905,7 +905,7 @@ if env['fast']\ 'mf', ] -if os.path.isdir ('$srcdir/CVS'): +if os.path.isdir ('%(srcdir)s/CVS' % vars ()): src_files = reduce (lambda x, y: x + y, map (cvs_files, subdirs)) else: src_files = ['foobar'] diff --git a/buildscripts/builder.py b/buildscripts/builder.py index 39d037b0af..b26a4e5fc9 100644 --- a/buildscripts/builder.py +++ b/buildscripts/builder.py @@ -243,7 +243,7 @@ env.Append (BUILDERS = {'OTF': otf}) # Specific builders env['DIFF_PY'] = '$srcdir/stepmake/bin/package-diff.py' -a = '$PYTHON $DIFF_PY $__verbose --outdir=${TARGET.dir}' +a = '$PYTHON $DIFF_PY $NO__verbose --outdir=${TARGET.dir}' patch = Builder (action = a, suffix = '.diff', src_suffix = '.tar.gz') env.Append (BUILDERS = {'PATCH': patch}) diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 71b2f9f097..88bed51790 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -994,12 +994,36 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [ ]) - AC_DEFUN(STEPMAKE_TEXMF_DIRS, [ + AC_ARG_ENABLE(tfm-path, + [ --enable-tfm-path=PATH set path of tex directories where tfm files live, + esp.: cmr10.tfm. Default: use kpsewhich], + [tfm_path=$enableval], + [tfm_path=auto] ) # ugh STEPMAKE_PROGS(KPSEWHICH, kpsewhich, OPTIONAL) - + AC_MSG_CHECKING(for tfm path) + + TFM_FONTS="cmr msam" + + if test "x$tfm_path" = xauto ; then + if test "x$KPSEWHICH" != "xno" ; then + for i in $TFM_FONTS; do + dir=`$KPSEWHICH tfm ${i}10.tfm` + TFM_PATH="$TFM_PATH `dirname $dir`" + done + else + STEPMAKE_WARN(Please specify where cmr10.tfm lives: + ./configure --enable-tfm-path=/usr/local/TeX/lib/tex/fonts) + fi + else + TFM_PATH=$tfm_path + fi + + TFM_PATH=`echo $TFM_PATH | tr ':' ' '` + AC_MSG_RESULT($TFM_PATH) + AC_SUBST(TFM_PATH) ]) @@ -1101,7 +1125,9 @@ AC_DEFUN(STEPMAKE_GTK2, [ AC_SUBST(GTK2_CFLAGS) AC_SUBST(GTK2_LIBS) else - r="lib$1-dev or $1-devel" + # UGR + # r="lib$1-dev or $1-devel" + r="libgtk+2.0-dev or gtk2-devel" ver="$(pkg-config --modversion $1)" STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) fi @@ -1123,7 +1149,9 @@ AC_DEFUN(STEPMAKE_PANGO, [ CPPFLAGS="$save_CPPFLAGS" LIBS="$save_LIBS" else - r="lib$1-dev or $1-devel" + # UGR + #r="lib$1-dev or $1-devel" + r="libpango1.0-dev or pango1.0-devel" ver="$(pkg-config --modversion $1)" STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) fi @@ -1148,7 +1176,9 @@ AC_DEFUN(STEPMAKE_PANGO_FT2, [ CPPFLAGS="$save_CPPFLAGS" LIBS="$save_LIBS" else - r="lib$1-dev or $1-devel" + # UGR + #r="lib$1-dev or $1-devel" + r="libpango1.0-dev or pango1.0-devel" ver="$(pkg-config --modversion $1)" STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) fi -- 2.39.5