diff options
Diffstat (limited to 'Build/source/texk')
-rw-r--r-- | Build/source/texk/ChangeLog | 6 | ||||
-rwxr-xr-x | Build/source/texk/configure | 113 | ||||
-rw-r--r-- | Build/source/texk/configure.in | 34 | ||||
-rw-r--r-- | Build/source/texk/m4/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/m4/kpse_subdirs.m4 | 28 | ||||
-rw-r--r-- | Build/source/texk/withenable.ac | 94 |
6 files changed, 107 insertions, 173 deletions
diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog index 68b63bfe88d..f3781a6bfe9 100644 --- a/Build/source/texk/ChangeLog +++ b/Build/source/texk/ChangeLog @@ -1,3 +1,9 @@ +2008-02-21 Peter Breitenlohner <peb@mppmu.mpg.de> + + * withenable.ac kpse_texk_pkglist): m4_defined list of all + optional packages, used to generate --without-PKG options. + * configure.in: use kpse_texk_pkglist to select subdirs. + 2008-02-02 Peter Breitenlohner <peb@mppmu.mpg.de> Convert from autoconf-2.13 to autoconf-2.59+: diff --git a/Build/source/texk/configure b/Build/source/texk/configure index aa3ce895b92..17777ff2930 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -884,7 +884,6 @@ tetex tex4htk texlive ttf2pk -tth xdv2pdf xdvik xdvipdfmx' @@ -1481,35 +1480,35 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --without-afm2pl do not build the afm2pl package - --without-bibtex8 do not build the bibtex8 package - --without-cjkutils do not build the cjkutils package - --without-detex do not build the detex package - --without-devnag do not build the devnag package - --without-dtl do not build the dtl package - --without-dvi2tty do not build the dvi2tty package - --without-dvidvi do not build the dvidvi package - --without-dviljk do not build the dviljk package - --without-dvipdfm do not build the dvipdfm package - --without-dvipdfmx do not build the dvipdfmx package - --without-dvipng do not build the dvipng package - --without-dvipos do not build the dvipos package - --without-dvipsk do not build the dvipsk package - --without-gsftopk do not build the gsftopk package - --without-lacheck do not build the lacheck package - --without-lcdf-typetools do not build the lcdf-typetools package - --without-makeindexk do not build the makeindexk package - --without-musixflx do not build the musixflx package - --without-ps2pkm do not build the ps2pkm package - --without-seetexk do not build the seetexk package - --without-tetex do not build the tetex package - --without-tex4htk do not build the tex4htk package - --without-texlive do not build the texlive package - --without-ttf2pk do not build the ttf2pk package - --without-tth do not build the tth package - --without-xdvik do not build the xdvik package - --without-xdvipdfmx do not build the xdvipdfmx package - --without-xdv2pdf do not build the xdv2pdf package + --without-afm2pl do not build the afm2pl package + --without-bibtex8 do not build the bibtex8 package + --without-cjkutils do not build the cjkutils package + --without-detex do not build the detex package + --without-devnag do not build the devnag package + --without-dtl do not build the dtl package + --without-dvi2tty do not build the dvi2tty package + --without-dvidvi do not build the dvidvi package + --without-dviljk do not build the dviljk package + --without-dvipdfm do not build the dvipdfm package + --without-dvipdfmx do not build the dvipdfmx package + --without-dvipng do not build the dvipng package + --without-dvipos do not build the dvipos package + --without-dvipsk do not build the dvipsk package + --without-gsftopk do not build the gsftopk package + --without-lacheck do not build the lacheck package + --without-lcdf-typetools + do not build the lcdf-typetools package + --without-makeindexk do not build the makeindexk package + --without-musixflx do not build the musixflx package + --without-ps2pkm do not build the ps2pkm package + --without-seetexk do not build the seetexk package + --without-tetex do not build the tetex package + --without-tex4htk do not build the tex4htk package + --without-texlive do not build the texlive package + --without-ttf2pk do not build the ttf2pk package + --without-xdv2pdf do not build the xdv2pdf package + --without-xdvik do not build the xdvik package + --without-xdvipdfmx do not build the xdvipdfmx package --without-mktexmf-default do not run mktexmf if MF source missing --without-mktexpk-default do not run mktexpk if PK font missing --without-mktextfm-default do not run mktextfm if TFM file missing @@ -3414,180 +3413,150 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +# Options to avoid/include the packages in texk/. +# # Check whether --with-afm2pl was given. if test "${with_afm2pl+set}" = set; then withval=$with_afm2pl; fi - # Check whether --with-bibtex8 was given. if test "${with_bibtex8+set}" = set; then withval=$with_bibtex8; fi - # Check whether --with-cjkutils was given. if test "${with_cjkutils+set}" = set; then withval=$with_cjkutils; fi - # Check whether --with-detex was given. if test "${with_detex+set}" = set; then withval=$with_detex; fi - # Check whether --with-devnag was given. if test "${with_devnag+set}" = set; then withval=$with_devnag; fi - # Check whether --with-dtl was given. if test "${with_dtl+set}" = set; then withval=$with_dtl; fi - # Check whether --with-dvi2tty was given. if test "${with_dvi2tty+set}" = set; then withval=$with_dvi2tty; fi - # Check whether --with-dvidvi was given. if test "${with_dvidvi+set}" = set; then withval=$with_dvidvi; fi - # Check whether --with-dviljk was given. if test "${with_dviljk+set}" = set; then withval=$with_dviljk; fi - # Check whether --with-dvipdfm was given. if test "${with_dvipdfm+set}" = set; then withval=$with_dvipdfm; fi - # Check whether --with-dvipdfmx was given. if test "${with_dvipdfmx+set}" = set; then withval=$with_dvipdfmx; fi - # Check whether --with-dvipng was given. if test "${with_dvipng+set}" = set; then withval=$with_dvipng; fi - # Check whether --with-dvipos was given. if test "${with_dvipos+set}" = set; then withval=$with_dvipos; fi - # Check whether --with-dvipsk was given. if test "${with_dvipsk+set}" = set; then withval=$with_dvipsk; fi - # Check whether --with-gsftopk was given. if test "${with_gsftopk+set}" = set; then withval=$with_gsftopk; fi - # Check whether --with-lacheck was given. if test "${with_lacheck+set}" = set; then withval=$with_lacheck; fi - # Check whether --with-lcdf-typetools was given. if test "${with_lcdf_typetools+set}" = set; then withval=$with_lcdf_typetools; fi - # Check whether --with-makeindexk was given. if test "${with_makeindexk+set}" = set; then withval=$with_makeindexk; fi - # Check whether --with-musixflx was given. if test "${with_musixflx+set}" = set; then withval=$with_musixflx; fi - # Check whether --with-ps2pkm was given. if test "${with_ps2pkm+set}" = set; then withval=$with_ps2pkm; fi - # Check whether --with-seetexk was given. if test "${with_seetexk+set}" = set; then withval=$with_seetexk; fi - # Check whether --with-tetex was given. if test "${with_tetex+set}" = set; then withval=$with_tetex; fi - # Check whether --with-tex4htk was given. if test "${with_tex4htk+set}" = set; then withval=$with_tex4htk; fi - # Check whether --with-texlive was given. if test "${with_texlive+set}" = set; then withval=$with_texlive; fi - # Check whether --with-ttf2pk was given. if test "${with_ttf2pk+set}" = set; then withval=$with_ttf2pk; fi - -# Check whether --with-tth was given. -if test "${with_tth+set}" = set; then - withval=$with_tth; +# Check whether --with-xdv2pdf was given. +if test "${with_xdv2pdf+set}" = set; then + withval=$with_xdv2pdf; fi - # Check whether --with-xdvik was given. if test "${with_xdvik+set}" = set; then withval=$with_xdvik; fi - # Check whether --with-xdvipdfmx was given. if test "${with_xdvipdfmx+set}" = set; then withval=$with_xdvipdfmx; fi -# Check whether --with-xdv2pdf was given. -if test "${with_xdv2pdf+set}" = set; then - withval=$with_xdv2pdf; -fi - { echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 @@ -6284,7 +6253,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 6287 "configure"' > conftest.$ac_ext + echo '#line 6256 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6846,7 +6815,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:6849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:6818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -8787,7 +8756,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8790 "configure" +#line 8759 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -8885,7 +8854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8888 "configure" +#line 8857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9780,12 +9749,6 @@ if test -d $srcdir/ttf2pk; then subdirs="$subdirs ttf2pk" fi fi -if test -d $srcdir/tth; then - if test "x$with_tth" != xno; then - ESUBDIRS="$ESUBDIRS tth" - subdirs="$subdirs tth" - fi -fi if test -d $srcdir/xdv2pdf; then if test "x$with_xdv2pdf" != xno; then ESUBDIRS="$ESUBDIRS xdv2pdf" diff --git a/Build/source/texk/configure.in b/Build/source/texk/configure.in index 16039cb4dac..8c7cf884b9e 100644 --- a/Build/source/texk/configure.in +++ b/Build/source/texk/configure.in @@ -47,39 +47,11 @@ if test "x$with_x" = xno; then with_xdvik=no fi +dnl required subdirs AC_CONFIG_SUBDIRS([kpathsea web2c]) -KPSE_CONFIG_SUBDIRS([ - afm2pl - bibtex8 - cjkutils - detex - devnag - dtl - dvi2tty - dvidvi - dviljk - dvipdfm - dvipdfmx - dvipng - dvipos - dvipsk - gsftopk - lacheck - lcdf-typetools - makeindexk - musixflx - ps2pkm - seetexk - tetex - tex4htk - texlive - ttf2pk - tth - xdv2pdf - xdvik - xdvipdfmx -]) +dnl optional subdirs => ESUBDIRS +KPSE_CONFIG_SUBDIRS(kpse_texk_pkglist) KPSE_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/Build/source/texk/m4/ChangeLog b/Build/source/texk/m4/ChangeLog index d80afea885d..3a02bab78fb 100644 --- a/Build/source/texk/m4/ChangeLog +++ b/Build/source/texk/m4/ChangeLog @@ -1,3 +1,8 @@ +2008-02-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + * kpse_subdirs.m4 (KPSE_WITH_SUBDIRS): additional macro to + generate --without-PKG options for a list of packages. + 2008-02-21 Karl Berry <karl@tug.org> * kpse_asm.m4, kpse_cross.m4, kpse_inc.m4, kpse_mtim.m4, diff --git a/Build/source/texk/m4/kpse_subdirs.m4 b/Build/source/texk/m4/kpse_subdirs.m4 index fcbba079de1..4537b26824d 100644 --- a/Build/source/texk/m4/kpse_subdirs.m4 +++ b/Build/source/texk/m4/kpse_subdirs.m4 @@ -5,23 +5,34 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 + +# KPSE_WITH_SUBDIRS(PKGLIST) +# ----------------------- +# Specify optional packages to be built. For each PKG in PKGLIST expand +# AC_ARG_WITH([PKG], [ --without-PKG do not build the PKG package]) +# to produce standardized help messages. +AC_DEFUN([KPSE_WITH_SUBDIRS], +[AC_FOREACH([AC_Pkg], [$1], + [AC_ARG_WITH(AC_Pkg, + AS_HELP_STRING([--without-[]]AC_Pkg, [do not build the ]AC_Pkg[ package]))]) +]) # KPSE_CONFIG_SUBDIRS(PKGLIST, [DIR]) # ----------------------------------- # Specify optional subdirectories to be configured. -# First the shell variable ESUBDIRS initialize (to empty). Then for -# each PKG in PKGLIST, test if PKG (or optionally DIR/PKG) exists as -# subdirectory of $srcdir and the value of the shell variable with_PKG -# differs from "no"; if so append this subdirectoryi to the list of -# subdirectories to be configured and to the shell variable ESUBDIRS. +# First initialize the shell variable ESUBDIRS (to empty). Then for +# each PKG in PKGLIST, test if [DIR/]PKG exists as subdirectory of +# $srcdir and the value of the shell variable with_PKG is not "no"; +# if so append this subdirectory to the list of subdirectories to be +# configured and to the shell variable ESUBDIRS. # Finally ESUBDIRS is AC_SUBSTed. # # Examples: KPSE_CONFIG_SUBDIRS([dialog lcdf-typetools], [utils]) is # roughly equivalent to the shell code # ESUBDIRS= # test -d utils || mkdir utils -# for pkg in $PKGS; do +# for pkg in dialog lcdf-typetools; do # if test -d $srcdir/utils/$pkg; then # if eval "test \"`echo '$with_'${pkg}|sed 's/-/_/g'`\" != no"; then # ESUBDIRS="$ESUBDIRS utils/$pkg" @@ -32,7 +43,7 @@ # AC_SUBST(ESUBDIRS) # whereas KPSE_CONFIG_SUBDIRS([afm2pl bibtex8]) corresponds to # ESUBDIRS= -# for pkg in $PKGS; do +# for pkg in afm2pl bibtex8; do # if test -d $srcdir/utils/$pkg; then # if eval "test \"x`echo '$with_'${pkg}`\" != xno"; then # ESUBDIRS="$ESUBDIRS $pkg" @@ -46,7 +57,6 @@ # an M4 loop and therefore M4 variables (i.e., shell literals) are # passed as arguments to AC_CONFIG_SUBDIRS, as required by modern # versions of Autoconf and Automake. - AC_DEFUN([KPSE_CONFIG_SUBDIRS], [ESUBDIRS= m4_ifval([$2], [test -d $2 || mkdir $2]) diff --git a/Build/source/texk/withenable.ac b/Build/source/texk/withenable.ac index b6297f51ab4..64b858c7fb3 100644 --- a/Build/source/texk/withenable.ac +++ b/Build/source/texk/withenable.ac @@ -1,60 +1,38 @@ dnl withenable.ac: --with and --enable options. +dnl +dnl list of optional packages in texk/, i.e., subdirs of texk/ +dnl +m4_define([kpse_texk_pkglist], [ +afm2pl +bibtex8 +cjkutils +detex +devnag +dtl +dvi2tty +dvidvi +dviljk +dvipdfm +dvipdfmx +dvipng +dvipos +dvipsk +gsftopk +lacheck +lcdf-typetools +makeindexk +musixflx +ps2pkm +seetexk +tetex +tex4htk +texlive +ttf2pk +xdv2pdf +xdvik +xdvipdfmx +])dnl -AC_ARG_WITH([afm2pl], - [ --without-afm2pl do not build the afm2pl package]) -AC_ARG_WITH([bibtex8], - [ --without-bibtex8 do not build the bibtex8 package]) -AC_ARG_WITH([cjkutils], - [ --without-cjkutils do not build the cjkutils package]) -AC_ARG_WITH([detex], - [ --without-detex do not build the detex package]) -AC_ARG_WITH([devnag], - [ --without-devnag do not build the devnag package]) -AC_ARG_WITH([dtl], - [ --without-dtl do not build the dtl package]) -AC_ARG_WITH([dvi2tty], - [ --without-dvi2tty do not build the dvi2tty package]) -AC_ARG_WITH([dvidvi], - [ --without-dvidvi do not build the dvidvi package]) -AC_ARG_WITH([dviljk], - [ --without-dviljk do not build the dviljk package]) -AC_ARG_WITH([dvipdfm], - [ --without-dvipdfm do not build the dvipdfm package]) -AC_ARG_WITH([dvipdfmx], - [ --without-dvipdfmx do not build the dvipdfmx package]) -AC_ARG_WITH([dvipng], - [ --without-dvipng do not build the dvipng package]) -AC_ARG_WITH([dvipos], - [ --without-dvipos do not build the dvipos package]) -AC_ARG_WITH([dvipsk], - [ --without-dvipsk do not build the dvipsk package]) -AC_ARG_WITH([gsftopk], - [ --without-gsftopk do not build the gsftopk package]) -AC_ARG_WITH([lacheck], - [ --without-lacheck do not build the lacheck package]) -AC_ARG_WITH([lcdf-typetools], - [ --without-lcdf-typetools do not build the lcdf-typetools package]) -AC_ARG_WITH([makeindexk], - [ --without-makeindexk do not build the makeindexk package]) -AC_ARG_WITH([musixflx], - [ --without-musixflx do not build the musixflx package]) -AC_ARG_WITH([ps2pkm], - [ --without-ps2pkm do not build the ps2pkm package]) -AC_ARG_WITH([seetexk], - [ --without-seetexk do not build the seetexk package]) -AC_ARG_WITH([tetex], - [ --without-tetex do not build the tetex package]) -AC_ARG_WITH([tex4htk], - [ --without-tex4htk do not build the tex4htk package]) -AC_ARG_WITH([texlive], - [ --without-texlive do not build the texlive package]) -AC_ARG_WITH([ttf2pk], - [ --without-ttf2pk do not build the ttf2pk package]) -AC_ARG_WITH([tth], - [ --without-tth do not build the tth package]) -AC_ARG_WITH([xdvik], - [ --without-xdvik do not build the xdvik package]) -AC_ARG_WITH([xdvipdfmx], - [ --without-xdvipdfmx do not build the xdvipdfmx package]) -AC_ARG_WITH([xdv2pdf], - [ --without-xdv2pdf do not build the xdv2pdf package]) +# Options to avoid/include the packages in texk/. +# +KPSE_WITH_SUBDIRS(kpse_texk_pkglist) |