diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-09-09 10:07:08 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-09-09 10:07:08 +0000 |
commit | e981cdbd1662ed82436259f1046987c5b7204f1a (patch) | |
tree | 031a0f1bd753e2495237b10de7d1ff6fe5a1a909 /Build/source/utils | |
parent | 3ad3db6624b55ad14658410f68ab6cb878904c7c (diff) |
Various updates of build system: Use AC_CONFIG_MACRO_DIRS instead of ACLOCAL_AMFLAGS,
Factor recursion into subdirs into .am fragment and m4 macros,
Avoid unnecessary use of Libtool,
Use z_const
git-svn-id: svn://tug.org/texlive/trunk@31606 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
-rw-r--r-- | Build/source/utils/ChangeLog | 12 | ||||
-rw-r--r-- | Build/source/utils/Makefile.am | 9 | ||||
-rw-r--r-- | Build/source/utils/Makefile.in | 9 | ||||
-rw-r--r-- | Build/source/utils/biber/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/utils/biber/Makefile.am | 3 | ||||
-rw-r--r-- | Build/source/utils/biber/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/utils/biber/configure.ac | 2 | ||||
-rwxr-xr-x | Build/source/utils/configure | 110 | ||||
-rw-r--r-- | Build/source/utils/configure.ac | 20 |
9 files changed, 38 insertions, 133 deletions
diff --git a/Build/source/utils/ChangeLog b/Build/source/utils/ChangeLog index b148d250a12..21fe6dd7268 100644 --- a/Build/source/utils/ChangeLog +++ b/Build/source/utils/ChangeLog @@ -1,3 +1,15 @@ +2013-09-03 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop ACLOCAL_AMFLAGS. + * configure.ac: Use AC_CONFIG_MACRO_DIRS. + Use KPSE_RECURSE_PROGS in ../m4/kpse-setup.m4 to recurse into + all Utils programs. + +2013-09-01 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Moved definition of cf_silent* from here ... + * ../am/recurse.am: ... to here + 2013-07-06 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am, configure.ac: Use am/recurse.am. diff --git a/Build/source/utils/Makefile.am b/Build/source/utils/Makefile.am index dd59231fc64..3f3107b14cc 100644 --- a/Build/source/utils/Makefile.am +++ b/Build/source/utils/Makefile.am @@ -3,18 +3,9 @@ ## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## -## Use 'aclocal --force' (for "computed m4_sinclude") -## -ACLOCAL_AMFLAGS = -I ../m4 --force - SUBDIRS = . $(MAKE_SUBDIRS) DIST_SUBDIRS = $(CONF_SUBDIRS) -cf_silent = $(cf_silent_@AM_V@) -cf_silent_ = $(cf_silent_@AM_DEFAULT_V@) -cf_silent_0 = --silent -cf_silent_1 = - # just in case a subdirectory has added directories dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in index c069d7ca9a6..07c2e9a72fd 100644 --- a/Build/source/utils/Makefile.in +++ b/Build/source/utils/Makefile.in @@ -393,13 +393,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../m4 --force SUBDIRS = . $(MAKE_SUBDIRS) DIST_SUBDIRS = $(CONF_SUBDIRS) -cf_silent = $(cf_silent_@AM_V@) -cf_silent_ = $(cf_silent_@AM_DEFAULT_V@) -cf_silent_0 = --silent -cf_silent_1 = recurse_this = utils/ recurse_top = ../ @@ -408,6 +403,10 @@ recurse_top = ../ # we append '--disable-build' so they can skip tests that would # fail because, e.g., some required libraries were not built. # Code inspired by automake's way to handle recursive targets. +cf_silent = $(cf_silent_@AM_V@) +cf_silent_ = $(cf_silent_@AM_DEFAULT_V@) +cf_silent_0 = --silent +cf_silent_1 = CONFIG_AUX = $(recurse_top)subsubdir-conf.cmd all: all-recursive diff --git a/Build/source/utils/biber/ChangeLog b/Build/source/utils/biber/ChangeLog index 3d003fe8915..e8e15021cbb 100644 --- a/Build/source/utils/biber/ChangeLog +++ b/Build/source/utils/biber/ChangeLog @@ -1,3 +1,8 @@ +2013-09-02 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Drop ACLOCAL_AMFLAGS. + * configure.ac: Use AC_CONFIG_MACRO_DIRS. + 2013-07-15 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am, README, configure.ac, m4/kpse-tl-platform.m4: diff --git a/Build/source/utils/biber/Makefile.am b/Build/source/utils/biber/Makefile.am index 17620693cc9..b0ad714a7e5 100644 --- a/Build/source/utils/biber/Makefile.am +++ b/Build/source/utils/biber/Makefile.am @@ -5,8 +5,7 @@ ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. -ACLOCAL_AMFLAGS = -I ../../m4 -I m4 - +## # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/utils/biber/Makefile.in b/Build/source/utils/biber/Makefile.in index f34fe74f5a7..1a7239e6bde 100644 --- a/Build/source/utils/biber/Makefile.in +++ b/Build/source/utils/biber/Makefile.in @@ -265,7 +265,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 -I m4 DISTCLEANFILES = config.force nodist_bin_SCRIPTS = $(BIBER_BINARY) diff --git a/Build/source/utils/biber/configure.ac b/Build/source/utils/biber/configure.ac index 2e7bb56bc89..322d9a9f83d 100644 --- a/Build/source/utils/biber/configure.ac +++ b/Build/source/utils/biber/configure.ac @@ -10,7 +10,7 @@ AC_INIT([Biber], [TeX Live], [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([../../texk/tests/TeXLive/TLConfig.pm]) AC_CONFIG_AUX_DIR([../../build-aux]) -AC_CONFIG_MACRO_DIR([../../m4]) +AC_CONFIG_MACRO_DIRS([../../m4 m4]) AM_INIT_AUTOMAKE([foreign]) AM_MAINTAINER_MODE diff --git a/Build/source/utils/configure b/Build/source/utils/configure index 3d1e052fd74..9e279fae535 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -3366,7 +3366,6 @@ $as_echo "$as_me: Assuming \`--enable-biber=$enable_biber'" >&6;} ;; esac - ## utils/m-tx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/m-tx/ ## configure options and TL libraries required for mtx # Check whether --enable-m-tx was given. @@ -3385,7 +3384,6 @@ $as_echo "$as_me: Assuming \`--enable-m-tx=$enable_m_tx'" >&6;} ;; esac - ## utils/pmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pmx/ ## configure options and TL libraries required for pmx # Check whether --enable-pmx was given. @@ -3404,7 +3402,6 @@ $as_echo "$as_me: Assuming \`--enable-pmx=$enable_pmx'" >&6;} ;; esac - ## utils/ps2eps/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ps2eps/ ## configure options and TL libraries required for ps2eps # Check whether --enable-ps2eps was given. @@ -3423,7 +3420,6 @@ $as_echo "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;} ;; esac - ## utils/psutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/psutils/ ## configure options and TL libraries required for psutils # Check whether --enable-psutils was given. @@ -3442,7 +3438,6 @@ $as_echo "$as_me: Assuming \`--enable-psutils=$enable_psutils'" >&6;} ;; esac - ## utils/t1utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/t1utils/ ## configure options and TL libraries required for t1utils # Check whether --enable-t1utils was given. @@ -3461,7 +3456,6 @@ $as_echo "$as_me: Assuming \`--enable-t1utils=$enable_t1utils'" >&6;} ;; esac - ## utils/texdoctk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/texdoctk/ ## configure options and TL libraries required for texdoctk # Check whether --enable-texdoctk was given. @@ -3480,7 +3474,6 @@ $as_echo "$as_me: Assuming \`--enable-texdoctk=$enable_texdoctk'" >&6;} ;; esac - ## utils/tpic2pdftex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/tpic2pdftex/ ## configure options and TL libraries required for tpic2pdftex # Check whether --enable-tpic2pdftex was given. @@ -3499,7 +3492,6 @@ $as_echo "$as_me: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&6;} ;; esac - ## utils/vlna/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/vlna/ ## configure options and TL libraries required for vlna # Check whether --enable-vlna was given. @@ -3518,7 +3510,6 @@ $as_echo "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;} ;; esac - ## utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/ ## configure options and TL libraries required for xindy # Check whether --enable-xindy was given. @@ -3591,7 +3582,6 @@ $as_echo "$as_me: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&6;} fi ;; esac - ## utils/xpdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xpdfopen/ ## configure options and TL libraries required for xpdfopen # Check whether --enable-xpdfopen was given. @@ -3624,7 +3614,6 @@ $as_echo "$as_me: Assuming \`--enable-xpdfopen=$enable_xpdfopen'" >&6;} esac - ## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ ## configure options and TL libraries required for web2c # Check whether --enable-web2c was given. @@ -3921,7 +3910,6 @@ if test "${enable_web_progs+set}" = set; then : enableval=$enable_web_progs; fi - ## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/ ## configure options and TL libraries required for afm2pl # Check whether --enable-afm2pl was given. @@ -3944,7 +3932,6 @@ test "x$enable_afm2pl" = xno || { need_kpathsea=yes } - ## texk/bibtex-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex-x/ ## configure options and TL libraries required for bibtex-x # Check whether --enable-bibtex-x was given. @@ -3993,7 +3980,6 @@ esac test "x$enable_bibtex_x:$enable_bibtexu" = xyes:yes && need_icu=yes - ## texk/chktex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/chktex/ ## configure options and TL libraries required for chktex # Check whether --enable-chktex was given. @@ -4016,7 +4002,6 @@ test "x$enable_chktex" = xno || { need_kpathsea=yes } - ## texk/cjkutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/cjkutils/ ## configure options and TL libraries required for cjkutils # Check whether --enable-cjkutils was given. @@ -4039,7 +4024,6 @@ test "x$enable_cjkutils" = xno || { need_kpathsea=yes } - ## texk/detex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/detex/ ## configure options and TL libraries required for detex # Check whether --enable-detex was given. @@ -4062,7 +4046,6 @@ test "x$enable_detex" = xno || { need_kpathsea=yes } - ## texk/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/devnag/ ## configure options and TL libraries required for devnag # Check whether --enable-devnag was given. @@ -4081,7 +4064,6 @@ $as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;} ;; esac - ## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/ ## configure options and TL libraries required for dtl # Check whether --enable-dtl was given. @@ -4104,7 +4086,6 @@ test "x$enable_dtl" = xno || { need_kpathsea=yes } - ## texk/dvi2tty/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvi2tty/ ## configure options and TL libraries required for dvi2tty # Check whether --enable-dvi2tty was given. @@ -4127,7 +4108,6 @@ test "x$enable_dvi2tty" = xno || { need_ptexenc=yes } - ## texk/dvidvi/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvidvi/ ## configure options and TL libraries required for dvidvi # Check whether --enable-dvidvi was given. @@ -4150,7 +4130,6 @@ test "x$enable_dvidvi" = xno || { need_kpathsea=yes } - ## texk/dviljk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviljk/ ## configure options and TL libraries required for dviljk # Check whether --enable-dviljk was given. @@ -4173,7 +4152,6 @@ test "x$enable_dviljk" = xno || { need_kpathsea=yes } - ## texk/dvipdf-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdf-x/ ## configure options and TL libraries required for dvipdf-x # Check whether --enable-dvipdf-x was given. @@ -4223,7 +4201,6 @@ esac test "x$enable_dvipdf_x:$enable_xdvipdf" = xyes:yes && need_freetype2=yes - ## texk/dvipdfm-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm-x/ ## configure options and TL libraries required for dvipdfm-x # Check whether --enable-dvipdfm-x was given. @@ -4273,7 +4250,6 @@ esac test "x$enable_dvipdfm_x:$enable_xdvipdfmx" = xyes:yes && need_freetype2=yes - ## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/ ## configure options and TL libraries required for dvipng # Check whether --enable-dvipng was given. @@ -4316,7 +4292,6 @@ if test "${with_gs+set}" = set; then : fi - ## texk/dvipos/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipos/ ## configure options and TL libraries required for dvipos # Check whether --enable-dvipos was given. @@ -4339,7 +4314,6 @@ test "x$enable_dvipos" = xno || { need_kpathsea=yes } - ## texk/dvipsk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipsk/ ## configure options and TL libraries required for dvipsk # Check whether --enable-dvipsk was given. @@ -4362,7 +4336,6 @@ test "x$enable_dvipsk" = xno || { need_kpathsea=yes } - ## texk/dvisvgm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ ## configure options and TL libraries required for dvisvgm # Check whether --enable-dvisvgm was given. @@ -4415,7 +4388,6 @@ if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5 fi - ## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/ ## configure options and TL libraries required for gsftopk # Check whether --enable-gsftopk was given. @@ -4438,7 +4410,6 @@ test "x$enable_gsftopk" = xno || { need_kpathsea=yes } - ## texk/lacheck/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lacheck/ ## configure options and TL libraries required for lacheck # Check whether --enable-lacheck was given. @@ -4457,7 +4428,6 @@ $as_echo "$as_me: Assuming \`--enable-lacheck=$enable_lacheck'" >&6;} ;; esac - ## texk/lcdf-typetools/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/ ## configure options and TL libraries required for lcdf-typetools # Check whether --enable-lcdf-typetools was given. @@ -4545,7 +4515,6 @@ if test "${enable_updmap+set}" = set; then : fi - ## texk/makeindexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makeindexk/ ## configure options and TL libraries required for makeindexk # Check whether --enable-makeindexk was given. @@ -4568,7 +4537,6 @@ test "x$enable_makeindexk" = xno || { need_kpathsea=yes } - ## texk/makejvf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makejvf/ ## configure options and TL libraries required for makejvf # Check whether --enable-makejvf was given. @@ -4591,7 +4559,6 @@ test "x$enable_makejvf" = xno || { need_ptexenc=yes } - ## texk/mendexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/mendexk/ ## configure options and TL libraries required for mendexk # Check whether --enable-mendexk was given. @@ -4614,7 +4581,6 @@ test "x$enable_mendexk" = xno || { need_ptexenc=yes } - ## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/ ## configure options and TL libraries required for ps2pkm # Check whether --enable-ps2pkm was given. @@ -4637,7 +4603,6 @@ test "x$enable_ps2pkm" = xno || { need_kpathsea=yes } - ## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/ ## configure options and TL libraries required for seetexk # Check whether --enable-seetexk was given. @@ -4660,7 +4625,6 @@ test "x$enable_seetexk" = xno || { need_kpathsea=yes } - ## texk/tex4htk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tex4htk/ ## configure options and TL libraries required for tex4htk # Check whether --enable-tex4htk was given. @@ -4683,7 +4647,6 @@ test "x$enable_tex4htk" = xno || { need_kpathsea=yes } - ## texk/ttf2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk/ ## configure options and TL libraries required for ttf2pk # Check whether --enable-ttf2pk was given. @@ -4707,7 +4670,6 @@ test "x$enable_ttf2pk" = xno || { need_freetype=yes } - ## texk/ttf2pk2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk2/ ## configure options and TL libraries required for ttf2pk # Check whether --enable-ttf2pk2 was given. @@ -4731,7 +4693,6 @@ test "x$enable_ttf2pk2" = xno || { need_freetype2=yes } - ## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/ ## configure options and TL libraries required for ttfdump # Check whether --enable-ttfdump was given. @@ -4750,7 +4711,6 @@ $as_echo "$as_me: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&6;} ;; esac - ## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/ ## configure options and TL libraries required for xdvik # Check whether --enable-xdvik was given. @@ -4796,7 +4756,6 @@ if test "${with_xdvi_x_toolkit+set}" = set; then : fi - ## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/ ## configure options and TL libraries required for texlive # Check whether --enable-texlive was given. @@ -4816,7 +4775,6 @@ $as_echo "$as_me: Assuming \`--enable-texlive=$enable_texlive'" >&6;} esac - ## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/ ## configure options and TL libraries required for harfbuzz @@ -4860,7 +4818,6 @@ test "x$need_harfbuzz" = xyes && { need_icu=yes } - ## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/ ## configure options and TL libraries required for icu (modified for XeTeX) @@ -4881,7 +4838,6 @@ $as_echo "$as_me: Assuming installed \`icu' headers and library" >&6;} ac_configure_args="$ac_configure_args '--with-system-icu=$with_system_icu'" fi - ## libs/teckit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/ ## configure options and TL libraries required for teckit @@ -4926,7 +4882,6 @@ test "x$need_teckit" = xyes && { need_zlib=yes } - ## libs/graphite2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/ ## configure options and TL libraries required for graphite2 @@ -4947,7 +4902,6 @@ $as_echo "$as_me: Assuming installed \`graphite2' headers and library" >&6;} ac_configure_args="$ac_configure_args '--with-system-graphite2=$with_system_graphite2'" fi - ## libs/zziplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zziplib/ ## configure options and TL libraries required for zziplib @@ -4982,7 +4936,6 @@ test "x$need_zziplib" = xyes && { need_zlib=yes } - ## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/ ## configure options and TL libraries required for xpdf @@ -5003,7 +4956,6 @@ $as_echo "$as_me: Assuming installed \`xpdf' headers and library" >&6;} ac_configure_args="$ac_configure_args '--with-system-xpdf=$with_system_xpdf'" fi - ## libs/poppler/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/poppler/ ## configure options and TL libraries required for poppler @@ -5038,7 +4990,6 @@ test "x$need_poppler" = xyes && { need_zlib=yes } - ## libs/cairo/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/cairo/ ## configure options and TL libraries required for cairo @@ -5073,7 +5024,6 @@ test "x$need_cairo" = xyes && { need_pixman=yes } - ## libs/pixman/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pixman/ ## configure options and TL libraries required for pixman @@ -5094,7 +5044,6 @@ $as_echo "$as_me: Assuming installed \`pixman' headers and library" >&6;} ac_configure_args="$ac_configure_args '--with-system-pixman=$with_system_pixman'" fi - ## libs/potrace/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/potrace/ ## configure options and TL libraries required for potrace @@ -5125,7 +5074,6 @@ $as_echo "$as_me: Assuming installed \`potrace' headers and library" >&6;} ac_configure_args="$ac_configure_args '--with-system-potrace=$with_system_potrace'" fi - ## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ ## configure options and TL libraries required for gd @@ -5179,7 +5127,6 @@ test "x$need_gd" = xyes && { need_freetype2=yes } - ## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/ ## configure options and TL libraries required for freetype2 @@ -5214,7 +5161,6 @@ test "x$need_freetype2" = xyes && { need_zlib=yes } - ## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/ ## configure options and TL libraries required for freetype @@ -5245,7 +5191,6 @@ $as_echo "$as_me: Assuming installed \`freetype' headers and library" >&6;} ac_configure_args="$ac_configure_args '--with-system-freetype=$with_system_freetype'" fi - ## libs/libpng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/ ## configure options and TL libraries required for libpng @@ -5280,11 +5225,9 @@ test "x$need_libpng" = xyes && { need_zlib=yes } - ## libs/lua52/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/lua52/ ## configure options and TL libraries required for lua52 - ## libs/zlib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/ ## configure options and TL libraries required for zlib @@ -5316,7 +5259,6 @@ $as_echo "$as_me: Assuming installed \`zlib' headers and library" >&6;} fi - ## texk/ptexenc/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/ ## configure options and TL libraries required for ptexenc @@ -5361,7 +5303,6 @@ test "x$need_ptexenc" = xyes && { need_kpathsea=yes } - ## texk/kpathsea/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/ ## configure options and TL libraries required for kpathsea @@ -5427,7 +5368,6 @@ fi - am__api_version='1.14' # Find a good install program. We prefer a C program (faster), @@ -6320,115 +6260,94 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Utils programs to build" >&5 $as_echo_n "checking for Utils programs to build... " >&6; } MAKE_SUBDIRS= CONF_SUBDIRS= - - - if test -x $srcdir/biber/configure; then - test "x$enable_biber" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS biber" + test "x$enable_biber" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS biber" CONF_SUBDIRS="$CONF_SUBDIRS biber" if false; then subdirs="$subdirs biber" fi fi - - if test -x $srcdir/m-tx/configure; then - test "x$enable_m_tx" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS m-tx" + test "x$enable_m_tx" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS m-tx" CONF_SUBDIRS="$CONF_SUBDIRS m-tx" if false; then subdirs="$subdirs m-tx" fi fi - - if test -x $srcdir/pmx/configure; then - test "x$enable_pmx" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS pmx" + test "x$enable_pmx" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS pmx" CONF_SUBDIRS="$CONF_SUBDIRS pmx" if false; then subdirs="$subdirs pmx" fi fi - - if test -x $srcdir/ps2eps/configure; then - test "x$enable_ps2eps" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS ps2eps" + test "x$enable_ps2eps" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ps2eps" CONF_SUBDIRS="$CONF_SUBDIRS ps2eps" if false; then subdirs="$subdirs ps2eps" fi fi - - if test -x $srcdir/psutils/configure; then - test "x$enable_psutils" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS psutils" + test "x$enable_psutils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS psutils" CONF_SUBDIRS="$CONF_SUBDIRS psutils" if false; then subdirs="$subdirs psutils" fi fi - - if test -x $srcdir/t1utils/configure; then - test "x$enable_t1utils" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS t1utils" + test "x$enable_t1utils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS t1utils" CONF_SUBDIRS="$CONF_SUBDIRS t1utils" if false; then subdirs="$subdirs t1utils" fi fi - - if test -x $srcdir/texdoctk/configure; then - test "x$enable_texdoctk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS texdoctk" + test "x$enable_texdoctk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS texdoctk" CONF_SUBDIRS="$CONF_SUBDIRS texdoctk" if false; then subdirs="$subdirs texdoctk" fi fi - - if test -x $srcdir/tpic2pdftex/configure; then - test "x$enable_tpic2pdftex" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS tpic2pdftex" + test "x$enable_tpic2pdftex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS tpic2pdftex" CONF_SUBDIRS="$CONF_SUBDIRS tpic2pdftex" if false; then subdirs="$subdirs tpic2pdftex" fi fi - - if test -x $srcdir/vlna/configure; then - test "x$enable_vlna" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS vlna" + test "x$enable_vlna" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS vlna" CONF_SUBDIRS="$CONF_SUBDIRS vlna" if false; then subdirs="$subdirs vlna" fi fi - - if test -x $srcdir/xindy/configure; then - test "x$enable_xindy" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS xindy" + test "x$enable_xindy" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xindy" CONF_SUBDIRS="$CONF_SUBDIRS xindy" if false; then subdirs="$subdirs xindy" fi fi - - if test -x $srcdir/xpdfopen/configure; then - test "x$enable_xpdfopen" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS xpdfopen" + test "x$enable_xpdfopen" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xpdfopen" CONF_SUBDIRS="$CONF_SUBDIRS xpdfopen" if false; then subdirs="$subdirs xpdfopen" @@ -6436,9 +6355,6 @@ if test -x $srcdir/xpdfopen/configure; then fi fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5 $as_echo "$MAKE_SUBDIRS" >&6; } diff --git a/Build/source/utils/configure.ac b/Build/source/utils/configure.ac index 712041c6480..8801b5440a7 100644 --- a/Build/source/utils/configure.ac +++ b/Build/source/utils/configure.ac @@ -11,7 +11,7 @@ AC_INIT([TeX Live utils], tex_live_version(), [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([../build-aux/missing]) AC_CONFIG_AUX_DIR([../build-aux]) -AC_CONFIG_MACRO_DIR([../m4]) +AC_CONFIG_MACRO_DIRS([../m4]) dnl See comment in ../configure.ac KPSE_SETUP([../]) @@ -20,23 +20,7 @@ KPSE_BASIC([utils]) AC_PROG_MKDIR_P -AC_MSG_CHECKING([for Utils programs to build]) -MAKE_SUBDIRS= -CONF_SUBDIRS= -KPSE_FOR_PKGS([utils], [ -if test -x $srcdir/Kpse_Pkg/configure; then - test "x$enable_[]Kpse_pkg" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS Kpse_Pkg" -dnl Cause 'make dist' to recurse into all subutils dirs - CONF_SUBDIRS="$CONF_SUBDIRS Kpse_Pkg" -dnl Cause 'configure -hr' and 'autoreconf' to recurse into all subutils dirs - if false; then - AC_CONFIG_SUBDIRS(Kpse_Pkg) - fi -fi -]) -AC_SUBST([MAKE_SUBDIRS]) -AC_SUBST([CONF_SUBDIRS]) -AC_MSG_RESULT([$MAKE_SUBDIRS]) +KPSE_RECURSE_PROGS([utils], [Utils]) AC_CONFIG_FILES([Makefile]) |