diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-06-02 10:12:43 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-06-02 10:12:43 +0000 |
commit | 623e43d956decd9e091d8b8b994c7b267f3ae98c (patch) | |
tree | 9a9bb833e3a2c5b095cd0a5dbc6ae040bf314bdb /Build/source/texk/lcdf-typetools | |
parent | e917463b8f4fe8ca0b416b56f5cc20b8125586d6 (diff) |
minor cleanup
git-svn-id: svn://tug.org/texlive/trunk@13574 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/lcdf-typetools')
-rw-r--r-- | Build/source/texk/lcdf-typetools/Makefile.am | 6 | ||||
-rw-r--r-- | Build/source/texk/lcdf-typetools/Makefile.in | 2 | ||||
-rw-r--r-- | Build/source/texk/lcdf-typetools/configure.ac.orig | 13 |
3 files changed, 9 insertions, 12 deletions
diff --git a/Build/source/texk/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am index 8034e462ddd..e74e6d2c33a 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.am +++ b/Build/source/texk/lcdf-typetools/Makefile.am @@ -90,11 +90,7 @@ versionize: .PHONY: srclinks rpm liblcdf libefont cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42 -## Required for integration into TeX Live build system -## -EXTRA_DIST += ac/withenable.ac - -## Eventually delete these files +## Original files from lcdf-typetools distribution ## EXTRA_DIST += Makefile.am.orig configure.ac.orig diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in index cb75574c721..f4b384241ad 100644 --- a/Build/source/texk/lcdf-typetools/Makefile.in +++ b/Build/source/texk/lcdf-typetools/Makefile.in @@ -302,7 +302,7 @@ EXTRA_DIST = ONEWS lcdf-typetools.spec include/lcdf/bezier.hh \ include/efont/t1mm.hh include/efont/t1rw.hh \ include/efont/t1unparser.hh include/efont/ttfcs.hh \ include/efont/ttfhead.hh glyphlist.txt texglyphlist.txt 7t.enc \ - ac/withenable.ac Makefile.am.orig configure.ac.orig + Makefile.am.orig configure.ac.orig all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/Build/source/texk/lcdf-typetools/configure.ac.orig b/Build/source/texk/lcdf-typetools/configure.ac.orig index 0c4ce548b0d..8e3b4557e4f 100644 --- a/Build/source/texk/lcdf-typetools/configure.ac.orig +++ b/Build/source/texk/lcdf-typetools/configure.ac.orig @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(NEWS) -AM_INIT_AUTOMAKE(lcdf-typetools, 2.69) +AM_INIT_AUTOMAKE(lcdf-typetools, 2.78) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE @@ -106,14 +106,15 @@ AC_ARG_ENABLE(mmafm, [ --disable-mmafm do not build the mmafm program], AC_ARG_ENABLE(mmpfb, [ --disable-mmpfb do not build the mmpfb program], :, enable_mmpfb=yes) AC_ARG_ENABLE(otfinfo, [ --disable-otfinfo do not build the otfinfo program], :, enable_otfinfo=yes) AC_ARG_ENABLE(otftotfm, [ --disable-otftotfm do not build the otftotfm program], :, enable_otftotfm=yes) -AC_ARG_ENABLE(t1lint, [ --disable-t1dotlessj do not build the t1dotlessj program], :, enable_t1dotlessj=yes) +AC_ARG_ENABLE(t1dotlessj, [ --disable-t1dotlessj do not build the t1dotlessj program], :, enable_t1dotlessj=yes) AC_ARG_ENABLE(t1lint, [ --disable-t1lint do not build the t1lint program], :, enable_t1lint=yes) +AC_ARG_ENABLE(t1rawafm, [ --disable-t1rawafm do not build the t1rawafm program], :, enable_t1dotlessj=yes) AC_ARG_ENABLE(t1reencode, [ --disable-t1reencode do not build the t1reencode program], :, enable_t1reencode=yes) AC_ARG_ENABLE(t1testpage, [ --disable-t1testpage do not build the t1testpage program], :, enable_t1testpage=yes) AC_ARG_ENABLE(ttftotype42, [ --disable-ttftotype42 do not build the ttftotype42 program], :, enable_ttftotype42=yes) SELECTED_SUBDIRS='' -for i in cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1reencode t1testpage ttftotype42; do +for i in cfftot1 mmafm mmpfb otfinfo otftotfm t1dotlessj t1lint t1rawafm t1reencode t1testpage ttftotype42; do y=`eval 'echo $enable_'"$i"` if test "x$y" != xno; then SELECTED_SUBDIRS="$SELECTED_SUBDIRS $i"; fi done @@ -233,7 +234,7 @@ fi AC_ARG_ENABLE(auto-cfftot1, [ --disable-auto-cfftot1 disable running cfftot1 from otftotfm], :, enable_auto_cfftot1=yes) AC_ARG_ENABLE(auto-t1dotlessj, [ --disable-auto-t1dotlessj disable running t1dotlessj from otftotfm], :, enable_auto_t1dotlessj=yes) -AC_ARG_ENABLE(auto-updmap, [ --disable-auto-updmap disable running updmap from otftotfm], :, enable_auto_updmap=yes) +AC_ARG_ENABLE(auto-updmap, [ --disable-auto-updmap disable running updmap from otftotfm], :, enable_auto_updmap=yes) if test "x$enable_auto_cfftot1" = xyes; then AC_DEFINE(HAVE_AUTO_CFFTOT1, 1, [Define to run cfftot1 automatically from otftotfm.]) @@ -260,7 +261,7 @@ AC_CACHE_CHECK([whether <new> works], ac_cv_good_new_hdr, if test "$ac_cv_good_new_hdr" = yes; then AC_DEFINE(HAVE_NEW_HDR, 1, [Define if <new> exists and works.]) fi -AC_CHECK_HEADERS(new.h) +AC_CHECK_HEADERS(new.h unistd.h) dnl @@ -481,4 +482,4 @@ dnl dnl Output dnl -AC_OUTPUT(Makefile liblcdf/Makefile libefont/Makefile cfftot1/Makefile mmafm/Makefile mmpfb/Makefile otfinfo/Makefile otftotfm/Makefile t1dotlessj/Makefile t1lint/Makefile t1reencode/Makefile t1testpage/Makefile ttftotype42/Makefile) +AC_OUTPUT(Makefile liblcdf/Makefile libefont/Makefile cfftot1/Makefile mmafm/Makefile mmpfb/Makefile otfinfo/Makefile otftotfm/Makefile t1dotlessj/Makefile t1lint/Makefile t1rawafm/Makefile t1reencode/Makefile t1testpage/Makefile ttftotype42/Makefile) |