diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-03-25 10:27:56 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-03-25 10:27:56 +0000 |
commit | 14fdf58582eb34614c899048041260830bf11319 (patch) | |
tree | 24c257e172a5759d4653886820e0debc19a79e75 /Build/source/utils | |
parent | 1d49a87a191295313dd1fdbce07dfb18ddd65bfc (diff) |
new build system: update
git-svn-id: svn://tug.org/texlive/trunk@12515 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
-rw-r--r-- | Build/source/utils/Makefile.in | 2 | ||||
-rwxr-xr-x | Build/source/utils/configure | 46 | ||||
-rw-r--r-- | Build/source/utils/dialog/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/utils/dialog/Makefile.in | 2 |
4 files changed, 50 insertions, 2 deletions
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in index 5e4bf5e59f1..d9687fda05e 100644 --- a/Build/source/utils/Makefile.in +++ b/Build/source/utils/Makefile.in @@ -67,6 +67,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-pkgs.m4 \ $(top_srcdir)/../texk/dviljk/ac/withenable.ac \ $(top_srcdir)/../texk/dvipdfm/ac/withenable.ac \ $(top_srcdir)/../texk/dvipdfmx/ac/withenable.ac \ + $(top_srcdir)/../texk/dvipng/ac/withenable.ac \ $(top_srcdir)/../texk/dvipos/ac/withenable.ac \ $(top_srcdir)/../texk/dvipsk/ac/withenable.ac \ $(top_srcdir)/../texk/gsftopk/ac/withenable.ac \ @@ -81,6 +82,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-pkgs.m4 \ $(top_srcdir)/../texk/ttf2pk/ac/withenable.ac \ $(top_srcdir)/../texk/ttfdump/ac/withenable.ac \ $(top_srcdir)/../texk/xdv2pdf/ac/withenable.ac \ + $(top_srcdir)/../texk/xdvik/ac/withenable.ac \ $(top_srcdir)/../texk/xdvipdfmx/ac/withenable.ac \ $(top_srcdir)/../texk/kpathsea/ac/withenable.ac \ $(top_srcdir)/../texk/kpathsea/ac/web2c.ac \ diff --git a/Build/source/utils/configure b/Build/source/utils/configure index 044d20fb37e..dc1dd7bd6d2 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -718,6 +718,7 @@ enable_dvidvi enable_dviljk enable_dvipdfm enable_dvipdfmx +enable_dvipng enable_dvipos enable_dvipsk enable_gsftopk @@ -743,6 +744,7 @@ enable_tex4htk enable_ttf2pk enable_ttfdump enable_xdv2pdf +enable_xdvik enable_xdvipdfmx with_system_kpathsea with_kpathsea_includes @@ -1460,6 +1462,7 @@ Optional Features: --disable-dviljk do not build the dviljk package --disable-dvipdfm do not build the dvipdfm package --disable-dvipdfmx do not build the dvipdfmx package + --disable-dvipng do not build the dvipng package --disable-dvipos do not build the dvipos package --disable-dvipsk do not build the dvipsk package --disable-gsftopk do not build the gsftopk package @@ -1488,6 +1491,7 @@ Optional Features: --disable-ttf2pk do not build the ttf2pk package --disable-ttfdump do not build the ttfdump package --disable-xdv2pdf do not build the xdv2pdf package + --disable-xdvik do not build the xdvik package --disable-xdvipdfmx do not build the xdvipdfmx package --disable-mktexmf-default do not run mktexmf if MF source missing --disable-mktexpk-default do not run mktexpk if PK font missing @@ -2549,6 +2553,28 @@ test "x$enable_dvipdfmx" = xno || { } +## texk/dvipng/ac/withenable.ac +## configure options and TL libraries required for dvipng +# Check whether --enable-dvipng was given. +if test "${enable_dvipng+set}" = set; then + enableval=$enable_dvipng; +fi +case $enable_dvipng in #( + yes|no);; #( + *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-dvipng'" >&5 +$as_echo "$as_me: Assuming \`--enable-dvipng'" >&6;} + enable_dvipng=yes + ac_configure_args="$ac_configure_args '--enable-dvipng'";; +esac + +test "x$enable_dvipng" = xno || { + need_kpathsea=yes + need_freetype2=yes + need_gd=yes + need_t1lib=yes +} + + ## texk/dvipos/ac/withenable.ac ## configure options and TL libraries required for dvipos # Check whether --enable-dvipos was given. @@ -2854,6 +2880,26 @@ test "x$enable_xdv2pdf" = xno || { } +## texk/xdvik/ac/withenable.ac +## configure options and TL libraries required for xdvik +# Check whether --enable-xdvik was given. +if test "${enable_xdvik+set}" = set; then + enableval=$enable_xdvik; +fi +case $enable_xdvik in #( + yes|no);; #( + *) { $as_echo "$as_me:$LINENO: Assuming \`--enable-xdvik'" >&5 +$as_echo "$as_me: Assuming \`--enable-xdvik'" >&6;} + enable_xdvik=yes + ac_configure_args="$ac_configure_args '--enable-xdvik'";; +esac + +test "x$enable_xdvik" = xno || { + need_kpathsea=yes + need_t1lib=yes +} + + ## texk/xdvipdfmx/ac/withenable.ac ## configure options and TL libraries required for xdvipdfmx # Check whether --enable-xdvipdfmx was given. diff --git a/Build/source/utils/dialog/Makefile.am b/Build/source/utils/dialog/Makefile.am index 17b44a8aa3b..c1d01e5c3ab 100644 --- a/Build/source/utils/dialog/Makefile.am +++ b/Build/source/utils/dialog/Makefile.am @@ -26,7 +26,7 @@ EXTRA_DIST = $(DIALOG_TREE) ## in case of an SVN repository dist-hook: - rm -rf `find $(distdir)/$(ZLIB_TREE) -name .svn` + rm -rf `find $(distdir)/$(DIALOG_TREE) -name .svn` if build diff --git a/Build/source/utils/dialog/Makefile.in b/Build/source/utils/dialog/Makefile.in index 6bc63f0baf4..bcdfacccf40 100644 --- a/Build/source/utils/dialog/Makefile.in +++ b/Build/source/utils/dialog/Makefile.in @@ -512,7 +512,7 @@ uninstall-man: uninstall-man1 dist-hook: - rm -rf `find $(distdir)/$(ZLIB_TREE) -name .svn` + rm -rf `find $(distdir)/$(DIALOG_TREE) -name .svn` @build_TRUE@$(DIALOG_BUILD)/dialog$(EXEEXT): @build_TRUE@ cd $(DIALOG_BUILD) && $(MAKE) $(AM_MAKEFLAGS) all |