diff options
45 files changed, 2599 insertions, 1623 deletions
diff --git a/Build/source/texk/dvipng/ChangeLog.TL b/Build/source/texk/dvipng/ChangeLog.TL index a9ba125f2ec..882578501c7 100644 --- a/Build/source/texk/dvipng/ChangeLog.TL +++ b/Build/source/texk/dvipng/ChangeLog.TL @@ -1,5 +1,34 @@ Changes for teTeX / TeX Live. +2009-06-12 Peter Breitenlohner <peb@mppmu.mpg.de> + + * help/Makefile.am: do not even try to rebuild doc/dvipng.help + unless dvipng$(EXEEXT) has been rebuilt. + +2009-06-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + Avoid warnings when compiling with 'gcc --Wmissing-prototypes'. + * color.c (NewColor, LoadColornameFile, ClearXColorPrologue, + LoadXColorPrologue): declare as static. + * draw.c (DrawPage): declare as static. + * dvi.c (DVIInit, SkipPage, InitPage, DelPageList): declare as + static. + * enc.c (InitEncoding): declare as static. + * font.c (ActualFactor, kpse_find_t1_or_tt, FontFind, DoneFont): + declare as static. + * fontmap.c (newword, find_format, SearchPSFontMap, + ReadPSFontMap): declare as static. + * ft.c (UnLoadFT): declare as static. + * papersiz.c (myatodim): declare as static. + * pk.c (getnyb, pk_packed_num, skip_specials, UnLoadPK): declare + as static. + * ppagelist.c (ListPage): declare as static. + * set.c (ChangeColor): declare as static. + * sfd.c (ReadSubfont): declare as static. + * special.c (PSCodeInit, writepscode, ps2png, rescale, + newpsheader): declare as static. + * t1.c (UnLoadT1): declare as static. + 2009-03-25 Peter Breitenlohner <peb@mppmu.mpg.de> * dvipng-1.12-patches (new): patches applied to dvipng-1.12. diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am index e4363a484e4..7f6af504800 100644 --- a/Build/source/texk/dvipng/Makefile.am +++ b/Build/source/texk/dvipng/Makefile.am @@ -30,8 +30,19 @@ ACLOCAL_AMFLAGS = -I ../../m4 -I m4 INCLUDES = $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(GD_INCLUDES) INCLUDES += $(T1LIB_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) -AM_CPPFLAGS = +AM_CFLAGS = $(WARNING_CFLAGS) +DVIPS = dvips -Ppdf + +TEXI2HTML = texi2html + +# In order that `make distcheck' succeeds, we must not attempt to rebuild +# dvipng.info if dvipng.help has not changed, Thus we delegate rebuilding +# dvipng.help and dvipng.info, if necessary, to subdirectories. +SUBDIRS = . help doc + +## #################################### The program +## bin_PROGRAMS = dvipng dvipng_SOURCES = \ @@ -81,77 +92,49 @@ LDADD += $(T1LIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) ## Rebuild libz @ZLIB_RULE@ -info_TEXINFOS = dvipng.texi -dvipng_TEXINFOS = readme.texi install.texi macros.texi dvipng.help - -dist_man1_MANS = dvipng.1 -dvipng.1: dvipng.texi readme.texi - $(srcdir)/texi2pod.pl -D man $(srcdir)/dvipng.texi | \ - sed -es/@//g -es/previewlatex/preview-latex/g -es/{}//g > dvipng.pod - pod2man --center="User commands" --release="$(PACKAGE_STRING)" \ - dvipng.pod > dvipng.1 - rm dvipng.pod - -## Make sure INSTALL and README exist -## -EXTRA_DIST = ChangeLog.0 ChangeLog.TL INSTALL README RELEASE - -INSTALL: install.texi - -$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ - -D rawfile --no-headers --no-validate --no-number-sections \ - -o $@ $< - -README: readme.texi - -$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ - -D rawfile --no-headers --no-validate --no-number-sections \ - -o $@ $< - -dist_noinst_SCRIPTS = texi2pod.pl - if have_gif - install-exec-hook: cd $(DESTDIR)$(bindir) && \ rm -f dvigif$(EXEEXT) && \ $(LN_S) dvipng$(EXEEXT) dvigif$(EXEEXT) - -install-data-hook: - cd $(DESTDIR)$(man1dir) && \ - rm -f dvigif.1 && \ - $(LN_S) dvipng.1 dvigif.1 - uninstall-hook: rm -f $(DESTDIR)$(bindir)/dvigif$(EXEEXT) - rm -f $(DESTDIR)$(man1dir)/dvigif.1 - endif have_gif -## Not yet used +## #################################### The test ## -EXTRA_DIST += test_dvipng.tex +test: test_dvipng.dvi dvipng$(EXEEXT) + ./dvipng -T tight -strict test_dvipng + echo View the result e.g. with xv test_dvipng\*.png -## Not used -## -EXTRA_DIST += miktex.h miktex.mak +test_dvipng.dvi: test_dvipng.tex + latex $(srcdir)/test_dvipng.tex + +TESTS = dvipng.test + +EXTRA_DIST = dvipng.test test_dvipng.tex -## Patches applied to dvipng-$(DVIPNG_VERSION) distribution +CLEANFILES = missfont.log test_dvipng.aux test_dvipng.dvi test_dvipng.log test_dvipng*.png + +## #################################### Maintainer targets +## +## Make sure INSTALL and README exist ## -EXTRA_DIST += dvipng-$(DVIPNG_VERSION)-patches +EXTRA_DIST += ChangeLog.0 INSTALL README RELEASE -## Original files from dvipng-$(DVIPNG_VERSION) +## Not used ## -EXTRA_DIST += \ - Makefile.in-$(DVIPNG_VERSION) \ - aclocal.m4-$(DVIPNG_VERSION) \ - configure.ac-$(DVIPNG_VERSION) +EXTRA_DIST += miktex.h miktex.mak -## Eventually use these macro files +## #################################### Build as part of the TeX Live tree ## -EXTRA_DIST += m4/gs-device.m4 +EXTRA_DIST += ChangeLog.TL -## Eventually delete these files +## Patches applied to the dvipng-1.12 distribution ## -EXTRA_DIST += Makefile.in.orig acinclude.m4.orig configure.ac.orig +EXTRA_DIST += dvipng-1.12-patches -EXTRA_DIST += Makefile.am.demo Makefile.in.work configure.ac.demo configure.ac.work +## Original files from the dvipng distribution +## +EXTRA_DIST += Makefile.in.orig aclocal.m4.orig configure.ac.orig diff --git a/Build/source/texk/dvipng/Makefile.am.demo b/Build/source/texk/dvipng/Makefile.am.demo deleted file mode 100644 index 34cd6377e3f..00000000000 --- a/Build/source/texk/dvipng/Makefile.am.demo +++ /dev/null @@ -1,112 +0,0 @@ -# Makefile.am - -#************************************************************************ -# -# Part of the dvipng distribution -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA. -# -# Copyright (C) 2002-2005 Jan-Åke Larsson -# -#************************************************************************ - -AUTOMAKE_OPTIONS = foreign - -ACLOCAL_AMFLAGS = -I m4 - -dist_man1_MANS = dvipng.1 -dvipng.1: dvipng.texi readme.texi - $(srcdir)/texi2pod.pl -D man $(srcdir)/dvipng.texi | \ - sed -es/@//g -es/previewlatex/preview-latex/g -es/{}//g > dvipng.pod - pod2man --center="User commands" --release="$(PACKAGE_STRING)" \ - dvipng.pod > dvipng.1 - rm dvipng.pod - -info_TEXINFOS = dvipng.texi -dvipng_TEXINFOS = readme.texi install.texi macros.texi help.texi -help.texi: dvipng - -./dvipng | \ - sed -e's/ (dvipng) / /' -e's,/lt-dvipng ,/dvipng ,' \ - -e's,^This is .*/dvipng ,This is ./dvipng ,' \ - -e's,^Usage: .*/dvipng ,Usage: ./dvipng ,' > help.tmp - ( test -r help.texi && diff help.tmp help.texi ) \ - || cp help.tmp help.texi - rm -f help.tmp - -EXTRA_DIST = ChangeLog.0 RELEASE miktex.h miktex.mak test_dvipng.tex \ - texi2pod.pl - -INSTALL: install.texi - -$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ - -D rawfile --no-headers --no-validate --no-number-sections \ - -I$(srcdir) $(srcdir)/install.texi --output $(srcdir)/INSTALL - -README: readme.texi - -$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ - -D rawfile --no-headers --no-validate --no-number-sections \ - -I$(srcdir) $(srcdir)/readme.texi --output $(srcdir)/README - -bin_PROGRAMS = dvipng -dvipng_SOURCES = dvipng.c color.c draw.c dvi.c font.c misc.c pk.c \ - set.c special.c papersiz.c ppagelist.c vf.c -if USE_T1 -dvipng_SOURCES += t1.c -endif USE_T1 -if USE_FT2 -dvipng_SOURCES += sfd.c ft.c enc.c fontmap.c tfm.c -else !USE_FT2 -if USE_T1 -dvipng_SOURCES += enc.c fontmap.c tfm.c -endif USE_T1 -endif !USE_FT2 - -# Use $(KPATHSEA_CPPFLAGS) etc. as part of AM_CPPFLAGS or prog_am_lt_CPPFLAGS, -# not as part of CPPFLAGS -- CPPFLAGS is for the user. -AM_CPPFLAGS = $(KPATHSEA_CPPFLAGS) $(ZLIB_CPPFLAGS) $(T1LIB_CPPFLAGS) \ - $(LIBPNG_CPPFLAGS) $(FREETYPE2_CPPFLAGS) $(GD_CPPFLAGS) - -# Use $(KPATHSEA_LDADD) etc. as part of LDADD or prog_am_lt_LDADD -LDADD = $(GD_LDADD) $(FREETYPE2_LDADD) $(LIBPNG_LDADD) \ - $(T1LIB_LDADD) $(ZLIB_LDADD) $(KPATHSEA_LDADD) - -dvipng_DEPENDENCIES = $(KPATHSEA_DEPS) $(ZLIB_DEPS) $(T1LIB_DEPS) \ - $(LIBPNG_DEPS) $(FREETYPE2_DEPS) - -noinst_HEADERS = commands.h dvipng.h - -if WITH_DVIGIF -install-exec-hook: - (cd $(DESTDIR)$(bindir) && rm -f dvigif && $(LN_S) dvipng dvigif) - -install-data-hook: - (cd $(DESTDIR)$(man1dir) && rm -f dvigif.1 && $(LN_S) dvipng.1 dvigif.1) - -uninstall-hook: - rm -f $(DESTDIR)$(bindir)/dvigif $(DESTDIR)$(man1dir)/dvigif.1 - -else !WITH_DVIGIF -install-exec-hook: -install-data-hook: -uninstall-hook: -endif !WITH_DVIGIF - -TESTS = test_dvipng - -CLEANFILES = test_dvipng.log test_dvipng.aux test_dvipng.dvi test_dvipng*.png - -# Do not create dvipng.info for distribution (depends on configure options). -dist-info: -DISTCLEANFILES = dvipng.info* help.texi diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in index c5c85166d26..0e61e9008d2 100644 --- a/Build/source/texk/dvipng/Makefile.in +++ b/Build/source/texk/dvipng/Makefile.in @@ -15,7 +15,6 @@ @SET_MAKE@ - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -40,16 +39,14 @@ bin_PROGRAMS = dvipng$(EXEEXT) @have_ft2_TRUE@am__append_2 = ft.c sfd.c @have_ft2_or_t1_TRUE@am__append_3 = enc.c fontmap.c tfm.c subdir = . -DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \ - $(dist_noinst_SCRIPTS) $(dvipng_TEXINFOS) \ +DIST_COMMON = README $(am__configure_deps) \ $(srcdir)/../../build-aux/config.guess \ $(srcdir)/../../build-aux/config.sub \ $(srcdir)/../../build-aux/depcomp \ $(srcdir)/../../build-aux/install-sh \ $(srcdir)/../../build-aux/ltmain.sh \ $(srcdir)/../../build-aux/missing \ - $(srcdir)/../../build-aux/mkinstalldirs \ - $(srcdir)/../../build-aux/texinfo.tex $(srcdir)/Makefile.am \ + $(srcdir)/../../build-aux/mkinstalldirs $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure ../../build-aux/config.guess \ ../../build-aux/config.sub ../../build-aux/depcomp \ @@ -58,13 +55,15 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \ ../../build-aux/texinfo.tex ../../build-aux/ylwrap COPYING \ COPYING.LESSER ChangeLog INSTALL ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/makeinfo.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \ + $(top_srcdir)/m4/makeinfo.m4 \ $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ $(top_srcdir)/../../m4/kpse-gd-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ $(top_srcdir)/../../m4/kpse-t1lib-flags.m4 \ + $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltoptions.m4 \ @@ -80,8 +79,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/../../build-aux/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" \ - "$(DESTDIR)$(man1dir)" +am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am__dvipng_SOURCES_DIST = color.c commands.h draw.c dvi.c dvipng.c \ dvipng.h font.c misc.c papersiz.c pk.c ppagelist.c set.c \ @@ -98,7 +96,6 @@ am_dvipng_OBJECTS = color.$(OBJEXT) draw.$(OBJEXT) dvi.$(OBJEXT) \ dvipng_OBJECTS = $(am_dvipng_OBJECTS) dvipng_LDADD = $(LDADD) am__DEPENDENCIES_1 = -SCRIPTS = $(dist_noinst_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles @@ -114,45 +111,23 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(dvipng_SOURCES) DIST_SOURCES = $(am__dvipng_SOURCES_DIST) -INFO_DEPS = $(srcdir)/dvipng.info -TEXINFO_TEX = $(top_srcdir)/../../build-aux/texinfo.tex -am__TEXINFO_TEX_DIR = $(top_srcdir)/../../build-aux -DVIS = dvipng.dvi -PDFS = dvipng.pdf -PSS = dvipng.ps -HTMLS = dvipng.html -TEXINFOS = dvipng.texi -TEXI2DVI = texi2dvi -TEXI2PDF = $(TEXI2DVI) --pdf --batch -MAKEINFOHTML = $(MAKEINFO) --html -AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) -DVIPS = dvips -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -man1dir = $(mandir)/man1 -NROFF = nroff -MANS = $(dist_man1_MANS) +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags +am__tty_colors = \ +red=; grn=; lgn=; blu=; std= +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -160,6 +135,31 @@ am__remove_distdir = \ { test ! -d "$(distdir)" \ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ && rm -fr "$(distdir)"; }; } +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print @@ -183,7 +183,6 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ -DVIPNG_VERSION = @DVIPNG_VERSION@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -198,6 +197,7 @@ GD_DEPEND = @GD_DEPEND@ GD_INCLUDES = @GD_INCLUDES@ GD_LIBS = @GD_LIBS@ GREP = @GREP@ +GS = @GS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_INFO = @INSTALL_INFO@ @@ -207,6 +207,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KPATHSEA_DEPEND = @KPATHSEA_DEPEND@ KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@ KPATHSEA_LIBS = @KPATHSEA_LIBS@ +KPSEWHICH = @KPSEWHICH@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -244,6 +245,7 @@ T1LIB_DEPEND = @T1LIB_DEPEND@ T1LIB_INCLUDES = @T1LIB_INCLUDES@ T1LIB_LIBS = @T1LIB_LIBS@ VERSION = @VERSION@ +WARNING_CFLAGS = @WARNING_CFLAGS@ ZLIB_DEPEND = @ZLIB_DEPEND@ ZLIB_INCLUDES = @ZLIB_INCLUDES@ ZLIB_LIBS = @ZLIB_LIBS@ @@ -329,7 +331,14 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -I m4 INCLUDES = $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(GD_INCLUDES) \ $(T1LIB_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) -AM_CPPFLAGS = +AM_CFLAGS = $(WARNING_CFLAGS) +DVIPS = dvips -Ppdf +TEXI2HTML = texi2html + +# In order that `make distcheck' succeeds, we must not attempt to rebuild +# dvipng.info if dvipng.help has not changed, Thus we delegate rebuilding +# dvipng.help and dvipng.info, if necessary, to subdirectories. +SUBDIRS = . help doc dvipng_SOURCES = color.c commands.h draw.c dvi.c dvipng.c dvipng.h \ font.c misc.c papersiz.c pk.c ppagelist.c set.c special.c vf.c \ $(am__append_1) $(am__append_2) $(am__append_3) @@ -337,22 +346,16 @@ dvipng_DEPENDENCIES = $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) \ $(GD_DEPEND) $(T1LIB_DEPEND) $(LIBPNG_DEPEND) $(ZLIB_DEPEND) LDADD = $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(GD_LIBS) $(T1LIB_LIBS) \ $(LIBPNG_LIBS) $(ZLIB_LIBS) -info_TEXINFOS = dvipng.texi -dvipng_TEXINFOS = readme.texi install.texi macros.texi dvipng.help -dist_man1_MANS = dvipng.1 -EXTRA_DIST = ChangeLog.0 ChangeLog.TL INSTALL README RELEASE \ - test_dvipng.tex miktex.h miktex.mak \ - dvipng-$(DVIPNG_VERSION)-patches Makefile.in-$(DVIPNG_VERSION) \ - aclocal.m4-$(DVIPNG_VERSION) configure.ac-$(DVIPNG_VERSION) \ - m4/gs-device.m4 Makefile.in.orig acinclude.m4.orig \ - configure.ac.orig Makefile.am.demo Makefile.in.work \ - configure.ac.demo configure.ac.work -dist_noinst_SCRIPTS = texi2pod.pl +TESTS = dvipng.test +EXTRA_DIST = dvipng.test test_dvipng.tex ChangeLog.0 INSTALL README \ + RELEASE miktex.h miktex.mak ChangeLog.TL dvipng-1.12-patches \ + Makefile.in.orig aclocal.m4.orig configure.ac.orig +CLEANFILES = missfont.log test_dvipng.aux test_dvipng.dvi test_dvipng.log test_dvipng*.png all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-am + $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -.SUFFIXES: .c .dvi .html .info .lo .o .obj .pdf .ps .texi +.SUFFIXES: .c .lo .o .obj am--refresh: @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @@ -506,186 +509,75 @@ clean-libtool: distclean-libtool: -rm -f libtool config.lt -.texi.info: - restore=: && backupdir="$(am__leading_dot)am$$$$" && \ - am__cwd=`pwd` && $(am__cd) $(srcdir) && \ - rm -rf $$backupdir && mkdir $$backupdir && \ - if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ - for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ - if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ - done; \ - else :; fi && \ - cd "$$am__cwd"; \ - if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ - -o $@ $<; \ - then \ - rc=0; \ - $(am__cd) $(srcdir); \ - else \ - rc=$$?; \ - $(am__cd) $(srcdir) && \ - $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ - fi; \ - rm -rf $$backupdir; exit $$rc - -.texi.dvi: - TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ - MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ - $(TEXI2DVI) $< - -.texi.pdf: - TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ - MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ - $(TEXI2PDF) $< - -.texi.html: - rm -rf $(@:.html=.htp) - if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ - -o $(@:.html=.htp) $<; \ - then \ - rm -rf $@; \ - if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ - mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \ - else \ - if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ - rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ - exit 1; \ - fi -$(srcdir)/dvipng.info: dvipng.texi $(dvipng_TEXINFOS) -dvipng.dvi: dvipng.texi $(dvipng_TEXINFOS) -dvipng.pdf: dvipng.texi $(dvipng_TEXINFOS) -dvipng.html: dvipng.texi $(dvipng_TEXINFOS) -.dvi.ps: - TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ - $(DVIPS) -o $@ $< - -uninstall-dvi-am: - @$(NORMAL_UNINSTALL) - @list='$(DVIS)'; test -n "$(dvidir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \ - rm -f "$(DESTDIR)$(dvidir)/$$f"; \ - done - -uninstall-html-am: - @$(NORMAL_UNINSTALL) - @list='$(HTMLS)'; test -n "$(htmldir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \ - rm -rf "$(DESTDIR)$(htmldir)/$$f"; \ - done - -uninstall-info-am: - @$(PRE_UNINSTALL) - @if test -d '$(DESTDIR)$(infodir)' && \ - (install-info --version && \ - install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ - list='$(INFO_DEPS)'; \ - for file in $$list; do \ - relfile=`echo "$$file" | sed 's|^.*/||'`; \ - echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \ - if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \ - then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi; \ - done; \ - else :; fi - @$(NORMAL_UNINSTALL) - @list='$(INFO_DEPS)'; \ - for file in $$list; do \ - relfile=`echo "$$file" | sed 's|^.*/||'`; \ - relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \ - (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \ - echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \ - rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \ - else :; fi); \ - done - -uninstall-pdf-am: - @$(NORMAL_UNINSTALL) - @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \ - rm -f "$(DESTDIR)$(pdfdir)/$$f"; \ - done - -uninstall-ps-am: - @$(NORMAL_UNINSTALL) - @list='$(PSS)'; test -n "$(psdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \ - rm -f "$(DESTDIR)$(psdir)/$$f"; \ - done - -dist-info: $(INFO_DEPS) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - list='$(INFO_DEPS)'; \ - for base in $$list; do \ - case $$base in \ - $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ esac; \ - if test -f $$base; then d=.; else d=$(srcdir); fi; \ - base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \ - for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \ - if test -f $$file; then \ - relfile=`expr "$$file" : "$$d/\(.*\)"`; \ - test -f "$(distdir)/$$relfile" || \ - cp -p $$file "$(distdir)/$$relfile"; \ - else :; fi; \ - done; \ - done - -mostlyclean-aminfo: - -rm -rf dvipng.aux dvipng.cp dvipng.cps dvipng.fn dvipng.ky dvipng.log \ - dvipng.pg dvipng.tmp dvipng.toc dvipng.tp dvipng.tps \ - dvipng.vr - -clean-aminfo: - -test -z "dvipng.dvi dvipng.pdf dvipng.ps dvipng.html" \ - || rm -rf dvipng.dvi dvipng.pdf dvipng.ps dvipng.html - -maintainer-clean-aminfo: - @list='$(INFO_DEPS)'; for i in $$list; do \ - i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \ - echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \ - rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \ - done -install-man1: $(dist_man1_MANS) - @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - } | while read p; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; echo "$$p"; \ - done | \ - sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ - sed 'N;N;s,\n, ,g' | { \ - list=; while read file base inst; do \ - if test "$$base" = "$$inst"; then list="$$list $$file"; else \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ done; \ - for i in $$list; do echo "$$i"; done | $(am__base_list) | \ - while read files; do \ - test -z "$$files" || { \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ - done; } - -uninstall-man1: - @$(NORMAL_UNINSTALL) - @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \ - files=`{ for i in $$list; do echo "$$i"; done; \ - } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -697,10 +589,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) set x; \ here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ @@ -719,7 +624,7 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ fi; \ fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -739,20 +644,99 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + $(am__tty_colors); \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + col=$$red; res=XPASS; \ + ;; \ + *) \ + col=$$grn; res=PASS; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + col=$$lgn; res=XFAIL; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + col=$$red; res=FAIL; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + col=$$blu; res=SKIP; \ + fi; \ + echo "$${col}$$res$${std}: $$tst"; \ + done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ + All=""; \ + else \ + tests="tests"; \ + All="All "; \ + fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="$$All$$all $$tests passed"; \ + else \ + if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ + banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all $$tests failed"; \ + else \ + if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ + banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + if test "$$skip" -eq 1; then \ + skipped="($$skip test was not run)"; \ + else \ + skipped="($$skip tests were not run)"; \ + fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + if test "$$failed" -eq 0; then \ + echo "$$grn$$dashes"; \ + else \ + echo "$$red$$dashes"; \ + fi; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ + echo "$$dashes$$std"; \ + test "$$failed" -eq 0; \ else :; fi + +distdir: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -784,9 +768,34 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-info + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done -test -n "$(am__skip_mode_fix)" \ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ @@ -902,21 +911,23 @@ distcleancheck: distclean $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am -check: check-am -all-am: Makefile $(INFO_DEPS) $(PROGRAMS) $(SCRIPTS) $(MANS) config.h -installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \ + $(MAKE) $(AM_MAKEFLAGS) check-TESTS +check: check-recursive +all-am: Makefile $(PROGRAMS) config.h +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(bindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-am +installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ @@ -925,6 +936,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -934,189 +946,104 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." @have_gif_FALSE@install-exec-hook: -@have_gif_FALSE@install-data-hook: @have_gif_FALSE@uninstall-hook: -clean: clean-am +clean: clean-recursive -clean-am: clean-aminfo clean-binPROGRAMS clean-generic clean-libtool \ - mostlyclean-am +clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am -distclean: distclean-am +distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags -dvi: dvi-am +dvi: dvi-recursive -dvi-am: $(DVIS) +dvi-am: -html: html-am +html: html-recursive -html-am: $(HTMLS) +html-am: -info: info-am +info: info-recursive -info-am: $(INFO_DEPS) +info-am: -install-data-am: install-info-am install-man - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook -install-dvi: install-dvi-am +install-data-am: + +install-dvi: install-dvi-recursive + +install-dvi-am: -install-dvi-am: $(DVIS) - @$(NORMAL_INSTALL) - test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)" - @list='$(DVIS)'; test -n "$(dvidir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \ - done install-exec-am: install-binPROGRAMS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-exec-hook -install-html: install-html-am +install-html: install-html-recursive -install-html-am: $(HTMLS) - @$(NORMAL_INSTALL) - test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" - @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \ - for p in $$list; do \ - if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ - $(am__strip_dir) \ - if test -d "$$d$$p"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ - $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ - echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ - $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ - else \ - list2="$$list2 $$d$$p"; \ - fi; \ - done; \ - test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ - done; } -install-info: install-info-am - -install-info-am: $(INFO_DEPS) - @$(NORMAL_INSTALL) - test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)" - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ - for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - esac; \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ - file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \ - for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \ - $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ - if test -f $$ifile; then \ - echo "$$ifile"; \ - else : ; fi; \ - done; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done - @$(POST_INSTALL) - @if (install-info --version && \ - install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ - list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ - for file in $$list; do \ - relfile=`echo "$$file" | sed 's|^.*/||'`; \ - echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\ - install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ - done; \ - else : ; fi -install-man: install-man1 +install-html-am: -install-pdf: install-pdf-am +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: -install-pdf-am: $(PDFS) - @$(NORMAL_INSTALL) - test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)" - @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done -install-ps: install-ps-am - -install-ps-am: $(PSS) - @$(NORMAL_INSTALL) - test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)" - @list='$(PSS)'; test -n "$(psdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done installcheck-am: -maintainer-clean: maintainer-clean-am +maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache -rm -rf ./$(DEPDIR) -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-aminfo \ - maintainer-clean-generic +maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive -mostlyclean-am: mostlyclean-aminfo mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool -pdf: pdf-am +pdf: pdf-recursive -pdf-am: $(PDFS) +pdf-am: -ps: ps-am +ps: ps-recursive -ps-am: $(PSS) +ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-dvi-am uninstall-html-am \ - uninstall-info-am uninstall-man uninstall-pdf-am \ - uninstall-ps-am +uninstall-am: uninstall-binPROGRAMS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook -uninstall-man: uninstall-man1 - -.MAKE: all install-am install-data-am install-exec-am install-strip \ - uninstall-am - -.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-aminfo clean-binPROGRAMS clean-generic clean-libtool \ - ctags dist dist-all dist-bzip2 dist-gzip dist-info dist-lzma \ +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \ + ctags-recursive install-am install-exec-am install-strip \ + tags-recursive uninstall-am + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-TESTS check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool ctags \ + ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzma \ dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-binPROGRAMS install-data \ - install-data-am install-data-hook install-dvi install-dvi-am \ - install-exec install-exec-am install-exec-hook install-html \ - install-html-am install-info install-info-am install-man \ - install-man1 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-aminfo \ - maintainer-clean-generic mostlyclean mostlyclean-aminfo \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-exec-hook install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-dvi-am uninstall-hook \ - uninstall-html-am uninstall-info-am uninstall-man \ - uninstall-man1 uninstall-pdf-am uninstall-ps-am + pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-hook @KPATHSEA_RULE@ @@ -1125,36 +1052,20 @@ uninstall-man: uninstall-man1 @T1LIB_RULE@ @LIBPNG_RULE@ @ZLIB_RULE@ -dvipng.1: dvipng.texi readme.texi - $(srcdir)/texi2pod.pl -D man $(srcdir)/dvipng.texi | \ - sed -es/@//g -es/previewlatex/preview-latex/g -es/{}//g > dvipng.pod - pod2man --center="User commands" --release="$(PACKAGE_STRING)" \ - dvipng.pod > dvipng.1 - rm dvipng.pod - -INSTALL: install.texi - -$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ - -D rawfile --no-headers --no-validate --no-number-sections \ - -o $@ $< - -README: readme.texi - -$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ - -D rawfile --no-headers --no-validate --no-number-sections \ - -o $@ $< @have_gif_TRUE@install-exec-hook: @have_gif_TRUE@ cd $(DESTDIR)$(bindir) && \ @have_gif_TRUE@ rm -f dvigif$(EXEEXT) && \ @have_gif_TRUE@ $(LN_S) dvipng$(EXEEXT) dvigif$(EXEEXT) - -@have_gif_TRUE@install-data-hook: -@have_gif_TRUE@ cd $(DESTDIR)$(man1dir) && \ -@have_gif_TRUE@ rm -f dvigif.1 && \ -@have_gif_TRUE@ $(LN_S) dvipng.1 dvigif.1 - @have_gif_TRUE@uninstall-hook: @have_gif_TRUE@ rm -f $(DESTDIR)$(bindir)/dvigif$(EXEEXT) -@have_gif_TRUE@ rm -f $(DESTDIR)$(man1dir)/dvigif.1 + +test: test_dvipng.dvi dvipng$(EXEEXT) + ./dvipng -T tight -strict test_dvipng + echo View the result e.g. with xv test_dvipng\*.png + +test_dvipng.dvi: test_dvipng.tex + latex $(srcdir)/test_dvipng.tex # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/texk/dvipng/Makefile.in-1.12 b/Build/source/texk/dvipng/Makefile.in-1.12 deleted file mode 100644 index 0e2ce2eaa00..00000000000 --- a/Build/source/texk/dvipng/Makefile.in-1.12 +++ /dev/null @@ -1,168 +0,0 @@ -# Makefile is generated by 'configure' from Makefile.in - -#************************************************************************ -# -# Part of the dvipng distribution -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/>. -# -# Copyright (C) 2002-2008 Jan-Åke Larsson -# -#************************************************************************ - -PACKAGE_STRING="@PACKAGE_STRING@" - -CC = @CC@ -CFLAGS = @CFLAGS@ -Wall -CPPFLAGS = @CPPFLAGS@ -I. -LN_S = @LN_S@ - -LIBS = @LIBS@ -LDFLAGS = @LDFLAGS@ - -srcdir = @srcdir@ -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -infodir = @infodir@ -mandir = @mandir@ -DESTDIR= -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = $(srcdir)/mkinstalldirs - -MAKEINFO=@MAKEINFO@ @MAKEINFO_MACROS@ -INSTALL_INFO=@INSTALL_INFO@ -TEX=tex -TEXIDVI=texi2dvi -TEXIHTML=texi2html -DVIPS=dvips -TEXIFILES = dvipng.texi readme.texi install.texi macros.texi dvipng.help - -objects = dvipng.o color.o draw.o dvi.o font.o misc.o pk.o \ - set.o special.o papersiz.o ppagelist.o \ - vf.o @PSFONTS_O@ - -all: dvipng docs - -install: @INSTALL_BIN_TARGET@ @INSTALL_BIN_TARGET@-docs - -####################################### The program - -dvipng: $(objects) - $(CC) $(LDFLAGS) $(objects) -o dvipng $(LIBS) - -$(objects): dvipng.h commands.h config.h - -install-dvipng: dvipng - -$(MKINSTALLDIRS) $(DESTDIR)$(bindir) - $(INSTALL) dvipng $(DESTDIR)$(bindir) - -install-dvigif: install-dvipng - (cd $(DESTDIR)$(bindir) && rm -f dvigif && $(LN_S) dvipng dvigif) - -####################################### The documentation - -docs: dvipng.dvi dvipng.info - -dvipng.dvi: $(TEXIFILES) - -$(TEXIDVI) -I $(srcdir) $(srcdir)/dvipng.texi - -dvipng.ps: dvipng.dvi - $(DVIPS) -Ppdf dvipng.dvi - -dvipng.info: $(TEXIFILES) dvipng.help - -$(MAKEINFO) -I$(srcdir) $(srcdir)/dvipng.texi - -dvipng.help: dvipng - -./dvipng > dvipng.tmp - ( test -r dvipng.help && diff dvipng.tmp dvipng.help ) \ - || cp dvipng.tmp dvipng.help - rm -f dvipng.tmp - -www: $(TEXIFILES) dvipng.help - texi2html -split chapter -nosec-nav -subdir html \ - -I $(srcdir) $(srcdir)/dvipng.texi - (cd html; for i in *; do \ - sed -e "s/Jan-A/Jan-\Å\;/g" $$i > ../www/$$i; \ - done) - cp www/dvipng.html www/index.html - rm -rf html - -dvipng_mono.html: $(TEXIFILES) dvipng.help - texi2html --monolithic -nomenu -nosec_nav -o dvipng_mono.html \ - -I $(srcdir) $(srcdir)/dvipng.texi - -install-docs: docs - -$(MKINSTALLDIRS) $(DESTDIR)$(infodir) - for x in dvipng.info* ; do \ - $(INSTALL_DATA) $$x $(DESTDIR)$(infodir) ; \ - done - -$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) dvipng.info - -$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1 - $(INSTALL_DATA) $(srcdir)/dvipng.1 $(DESTDIR)$(mandir)/man1 - -install-dvipng-docs: install-docs - -install-dvigif-docs: install-docs - (cd $(DESTDIR)$(mandir)/man1 && rm -f dvigif.1 && $(LN_S) dvipng.1 dvigif.1) - -####################################### The test - -test: test_dvipng.dvi dvipng - ./dvipng -T tight -strict test_dvipng - echo View the result e.g. with xv test_dvipng\*.png - -test_dvipng.dvi: test_dvipng.tex - latex $(srcdir)/test_dvipng.tex - -####################################### The cleaning up - -clean: - rm -f *.o dvipng *.help *.info* *dvipng.dvi *.aux *.log - rm -f *dvipng.ps *.cp *.fn *.ky *~ \#*\# \ - *.tp *.vr *.pg *.toc *.tp *.bak *.cps *.kys *.tps \ - *.fns *.vrs *.pgs *.html *.tmp - -distclean: clean - rm -f Makefile - rm -f config.status config.log config.cache c-auto.h - -####################################### Maintainer targets - -INSTALL: install.texi - -$(MAKEINFO) -D rawfile --no-headers --no-validate \ - --no-number-sections \ - -I$(srcdir) $(srcdir)/install.texi --output INSTALL - -README: readme.texi - -$(MAKEINFO) -D rawfile --no-headers --no-validate \ - --no-number-sections \ - -I$(srcdir) $(srcdir)/readme.texi --output README - -dvipng.1: dvipng.texi readme.texi - texi2pod.pl -D man $(srcdir)/dvipng.texi | \ - sed -es/@//g -es/previewlatex/preview-latex/g -es/{}//g > dvipng.pod - pod2man --center="User commands" --release=$(PACKAGE_STRING)\ - dvipng.pod > dvipng.1 - rm dvipng.pod - -dist: INSTALL README dvipng.1 distclean - -# SunOS make suffix rule wierdness -.cps.h: - diff --git a/Build/source/texk/dvipng/Makefile.in.orig b/Build/source/texk/dvipng/Makefile.in.orig index 5889f504fc0..0e2ce2eaa00 100644 --- a/Build/source/texk/dvipng/Makefile.in.orig +++ b/Build/source/texk/dvipng/Makefile.in.orig @@ -1,9 +1,5 @@ # Makefile is generated by 'configure' from Makefile.in -# Adapted for dvipng-1.9 / teTeX by Thomas Esser. -# Adapted for dvipng-1.10 / TeX live by Peter Breitenlohner. -# All settings here are our fault, don't blame the dvipng maintainers for it. - #************************************************************************ # # Part of the dvipng distribution @@ -28,48 +24,12 @@ PACKAGE_STRING="@PACKAGE_STRING@" -@SET_MAKE@ - -FREETYPE2DIR = ../../libs/freetype2 -FREETYPE2SRCDIR = $(srcdir)/$(FREETYPE2DIR) -FREETYPE2CPPFLAGS = @FREETYPE2CPPFLAGS@ -FREETYPE2DEP = @FREETYPE2DEP@ -LDFREETYPE2 = @LDFREETYPE2@ - -GDDIR=../../libs/gd -GDSRCDIR=$(srcdir)/$(GDDIR) -GDCPPFLAGS = @GDCPPFLAGS@ -GDDEP = @GDDEP@ -LDGD = @LDGD@ - -LIBT1DIR=../../libs/t1lib -LIBT1SRCDIR=$(srcdir)/$(LIBT1DIR) -LIBT1CPPFLAGS = @LIBT1CPPFLAGS@ -LIBT1DEP = @LIBT1DEP@ -LDLIBT1 = @LDLIBT1@ - -LIBPNGDIR=../../libs/libpng -LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR) -LIBPNGCPPFLAGS = @LIBPNGCPPFLAGS@ -LIBPNGDEP = @LIBPNGDEP@ -LDLIBPNG = @LDLIBPNG@ - -ZLIBDIR=../../libs/zlib -ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR) -ZLIBCPPFLAGS = @ZLIBCPPFLAGS@ -ZLIBDEP = @ZLIBDEP@ -LDZLIB = @LDZLIB@ - -lib_cppflags = $(GDCPPFLAGS) $(FREETYPE2CPPFLAGS) $(LIBT1CPPFLAGS) \ - $(LIBPNGCPPFLAGS) $(ZLIBCPPFLAGS) -I.. -I$(srcdir)/.. -lib_libs = $(LDGD) $(LDFREETYPE2) $(LDLIBT1) $(LDLIBPNG) $(LDZLIB) - CC = @CC@ CFLAGS = @CFLAGS@ -Wall -CPPFLAGS = @CPPFLAGS@ -I. $(lib_cppflags) +CPPFLAGS = @CPPFLAGS@ -I. LN_S = @LN_S@ -LIBS = $(lib_libs) @LIBS@ +LIBS = @LIBS@ LDFLAGS = @LDFLAGS@ srcdir = @srcdir@ @@ -128,8 +88,7 @@ dvipng.ps: dvipng.dvi dvipng.info: $(TEXIFILES) dvipng.help -$(MAKEINFO) -I$(srcdir) $(srcdir)/dvipng.texi -dvipng.help: misc.c - $(MAKE) dvipng +dvipng.help: dvipng -./dvipng > dvipng.tmp ( test -r dvipng.help && diff dvipng.tmp dvipng.help ) \ || cp dvipng.tmp dvipng.help @@ -150,10 +109,10 @@ dvipng_mono.html: $(TEXIFILES) dvipng.help install-docs: docs -$(MKINSTALLDIRS) $(DESTDIR)$(infodir) - for x in $(srcdir)/dvipng.info* ; do \ + for x in dvipng.info* ; do \ $(INSTALL_DATA) $$x $(DESTDIR)$(infodir) ; \ done - -$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(srcdir)/dvipng.info + -$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) dvipng.info -$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1 $(INSTALL_DATA) $(srcdir)/dvipng.1 $(DESTDIR)$(mandir)/man1 diff --git a/Build/source/texk/dvipng/Makefile.in.work b/Build/source/texk/dvipng/Makefile.in.work deleted file mode 100644 index c4cf3c5426c..00000000000 --- a/Build/source/texk/dvipng/Makefile.in.work +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************ - -CFLAGS = @CFLAGS@ -Wall - -TEXIHTML=texi2html - -all: dvipng docs - -####################################### The documentation - -docs: dvipng.dvi dvipng.info - -dvipng.dvi: $(TEXIFILES) - -$(TEXIDVI) -I $(srcdir) $(srcdir)/dvipng.texi - -dvipng.ps: dvipng.dvi - $(DVIPS) -Ppdf dvipng.dvi - -dvipng.info: $(TEXIFILES) dvipng.help - -$(MAKEINFO) -I$(srcdir) $(srcdir)/dvipng.texi - -dvipng.help: dvipng - -./dvipng > dvipng.tmp - ( test -r dvipng.help && diff dvipng.tmp dvipng.help ) \ - || cp dvipng.tmp dvipng.help - rm -f dvipng.tmp - -www: $(TEXIFILES) dvipng.help - texi2html -split chapter -nosec-nav -subdir html \ - -I $(srcdir) $(srcdir)/dvipng.texi - (cd html; for i in *; do \ - sed -e "s/Jan-A/Jan-\Å\;/g" $$i > ../www/$$i; \ - done) - cp www/dvipng.html www/index.html - rm -rf html - -dvipng_mono.html: $(TEXIFILES) dvipng.help - texi2html --monolithic -nomenu -nosec_nav -o dvipng_mono.html \ - -I $(srcdir) $(srcdir)/dvipng.texi - -####################################### The test - -test: test_dvipng.dvi dvipng - ./dvipng -T tight -strict test_dvipng - echo View the result e.g. with xv test_dvipng\*.png - -test_dvipng.dvi: test_dvipng.tex - latex $(srcdir)/test_dvipng.tex - -####################################### Maintainer targets - -dist: INSTALL README dvipng.1 distclean - -# SunOS make suffix rule wierdness -.cps.h: - diff --git a/Build/source/texk/dvipng/acinclude.m4.orig b/Build/source/texk/dvipng/acinclude.m4.orig deleted file mode 100644 index 8c2c9eab9df..00000000000 --- a/Build/source/texk/dvipng/acinclude.m4.orig +++ /dev/null @@ -1,77 +0,0 @@ -# acinclude.m4 extracted from aclocal.m4 of dvipng release 1.10. - -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -dnl -dnl MAKEINFO_CHECK_MACRO( MACRO, [ACTION-IF-FOUND -dnl [, ACTION-IF-NOT-FOUND]]) -dnl -AC_DEFUN([MAKEINFO_CHECK_MACRO], -[if test -n "$MAKEINFO" -a "$makeinfo" != ":"; then - AC_MSG_CHECKING([for @$1{}]) - echo \\\\input texinfo > conftest.texi - echo @$1{test} >> conftest.texi - if $MAKEINFO conftest.texi > /dev/null 2> /dev/null; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - ifelse([$3], , :, [$3]) - fi - rm -f conftest.texi conftest.info -fi -]) - -dnl -dnl MAKEINFO_CHECK_MACROS( MACRO ... [, ACTION-IF-FOUND -dnl [, ACTION-IF-NOT-FOUND]]) -dnl -AC_DEFUN([MAKEINFO_CHECK_MACROS], -[for ac_macro in $1; do - MAKEINFO_CHECK_MACRO($ac_macro, $2, - [MAKEINFO_MACROS="-D no-$ac_macro $MAKEINFO_MACROS" - $3])dnl - done -AC_SUBST(MAKEINFO_MACROS) -]) - - -dnl -dnl Check devices for GS -dnl AC_GS_HAS_DEVICE(DEVICE,ACTION-IF-FAILED) -dnl -AC_DEFUN([AC_GS_HAS_DEVICE], - [AC_MSG_CHECKING([whether $GS has the $1 device]) - if $GS -h | grep $1 >/dev/null; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - $2 - fi -]) - -dnl -dnl GS_CHECK_DEVICES -dnl -AC_DEFUN([GS_CHECK_DEVICES], - [GS_WARN="" - AC_GS_HAS_DEVICE(pngalpha, - [GS_WARN="Your EPS inclusions will be cropped to the - boundingbox, and rendered on an opaque background. - Upgrade GhostScript to avoid this." - AC_GS_HAS_DEVICE(png16m, - [GS_WARN="Your EPS inclusions may not work. - Upgrade/install GhostScript to avoid this."])]) - if test -n "$GS_WARN"; then - AC_MSG_WARN([$GS_WARN]) - fi -]) diff --git a/Build/source/texk/dvipng/aclocal.m4 b/Build/source/texk/dvipng/aclocal.m4 index 1c3941966dc..a7725766726 100644 --- a/Build/source/texk/dvipng/aclocal.m4 +++ b/Build/source/texk/dvipng/aclocal.m4 @@ -989,6 +989,7 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/gs-device.m4]) m4_include([m4/makeinfo.m4]) m4_include([../../m4/kpse-common.m4]) m4_include([../../m4/kpse-freetype2-flags.m4]) @@ -996,6 +997,7 @@ m4_include([../../m4/kpse-gd-flags.m4]) m4_include([../../m4/kpse-kpathsea-flags.m4]) m4_include([../../m4/kpse-libpng-flags.m4]) m4_include([../../m4/kpse-t1lib-flags.m4]) +m4_include([../../m4/kpse-warnings.m4]) m4_include([../../m4/kpse-zlib-flags.m4]) m4_include([../../m4/libtool.m4]) m4_include([../../m4/ltoptions.m4]) diff --git a/Build/source/texk/dvipng/aclocal.m4-1.12 b/Build/source/texk/dvipng/aclocal.m4.orig index 0cd4eddf92e..0cd4eddf92e 100644 --- a/Build/source/texk/dvipng/aclocal.m4-1.12 +++ b/Build/source/texk/dvipng/aclocal.m4.orig diff --git a/Build/source/texk/dvipng/color.c b/Build/source/texk/dvipng/color.c index 5d3a23ab37b..f3430ca616d 100644 --- a/Build/source/texk/dvipng/color.c +++ b/Build/source/texk/dvipng/color.c @@ -54,7 +54,7 @@ void initcolor() cstack[1].blue=0; } -struct colorname * NewColor(char* prefix, int nprefix, +static struct colorname * NewColor(char* prefix, int nprefix, char* name, int nname, char* model, int nmodel, char* values, int nvalues) @@ -92,7 +92,7 @@ struct colorname * NewColor(char* prefix, int nprefix, #define FINDPSNAMEEND(s,n) n=0; while(s<max && *s!='{') { s++; n++; } #define BLANKCOMMAS(s) -struct colorname* LoadColornameFile(char* filename) +static struct colorname* LoadColornameFile(char* filename) { struct colorname *list=NULL,*tmp=NULL; char *filepath,*pos,*max; @@ -165,7 +165,7 @@ struct colorname* LoadColornameFile(char* filename) return(list); } -void ClearXColorPrologue(void) +static void ClearXColorPrologue(void) { struct colorname *next; while (xcp) { @@ -199,7 +199,7 @@ void InitXColorPrologue(char* name) strcpy(xcpname,name); } -struct colorname* LoadXColorPrologue(void) +static struct colorname* LoadXColorPrologue(void) { struct colorname *list=NULL,*tmp=NULL; char *filepath,*pos,*max; diff --git a/Build/source/texk/dvipng/config.h.in b/Build/source/texk/dvipng/config.h.in index 5a2c42edf82..f8b9b0d5248 100644 --- a/Build/source/texk/dvipng/config.h.in +++ b/Build/source/texk/dvipng/config.h.in @@ -14,6 +14,15 @@ /* Define as 1 to get the debug (-d) option. */ #undef DEBUG +/* The environment setting for $SELFAUTODIR */ +#undef ENV_SELFAUTODIR + +/* The environment setting for $SELFAUTOLOC */ +#undef ENV_SELFAUTOLOC + +/* The environment setting for $SELFAUTOPARENT */ +#undef ENV_SELFAUTOPARENT + /* Define as the path to GhostScript. */ #undef GS_PATH diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index e5af34f4b5f..447989bc2c1 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -789,7 +789,6 @@ ac_includes_default="\ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS -DVIPNG_VERSION have_gif_FALSE have_gif_TRUE have_ft2_or_t1_FALSE @@ -823,11 +822,14 @@ KPATHSEA_RULE KPATHSEA_DEPEND KPATHSEA_LIBS KPATHSEA_INCLUDES +KPSEWHICH INSTALL_INFO AM_MAKEINFOFLAGS POW_LIB LIBOBJS ALLOCA +GS +WARNING_CFLAGS CPP OTOOL64 OTOOL @@ -947,9 +949,11 @@ enable_dependency_tracking with_gnu_ld enable_libtool_lock enable_largefile +enable_compiler_warnings enable_debug enable_timing with_gs +enable_selfauto_set with_system_kpathsea with_kpathsea_includes with_kpathsea_libdir @@ -1616,8 +1620,20 @@ Optional Features: --enable-dependency-tracking do not reject slow dependency extractors --disable-libtool-lock avoid locking (might break parallel builds) --disable-largefile omit support for large files + --enable-compiler-warnings=[no|min|yes|max] + Turn on compiler warnings [default: yes if + maintainer-mode, min otherwise] --disable-debug Compile without debug (-d) option --enable-timing Output execution time of dvipng + --enable-selfauto-set This option will make the final binary explicitly + set the $SELFAUTO... variables to make it look as + dvipng is installed in the main texmf tree, even if + it isn't. This is necessary when texmf.cnf only uses + $SELFAUTO... variables and dvipng is not installed + in the texmf tree. Otherwise, dvipng may not be able + to find virtual fonts, or psfonts.map. To find out, + first build the binary and do 'make test'. If the + test fails, you need this switch. Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -2143,6 +2159,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +# Common code for all programs using libkpathsea. am__api_version='1.11' # Find a good install program. We prefer a C program (faster), @@ -4393,13 +4410,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4396: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4413: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4399: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4416: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4402: output\"" >&5) + (eval echo "\"\$as_me:4419: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5605,7 +5622,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5608 "configure"' > conftest.$ac_ext + echo '#line 5625 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6960,6 +6977,21 @@ fi done +# Check whether --enable-compiler-warnings was given. +if test "${enable_compiler_warnings+set}" = set; then + enableval=$enable_compiler_warnings; +fi +case $enable_compiler_warnings in + no | min | yes | max) : ;; + *) if test "x$enable_maintainer_mode" = xyes; then + enable_compiler_warnings=yes +else + enable_compiler_warnings=min +fi + ;; +esac + + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output @@ -7551,11 +7583,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7554: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7586: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7558: \$? = $ac_status" >&5 + echo "$as_me:7590: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7890,11 +7922,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7893: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7925: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7897: \$? = $ac_status" >&5 + echo "$as_me:7929: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7995,11 +8027,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7998: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8030: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8002: \$? = $ac_status" >&5 + echo "$as_me:8034: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8050,11 +8082,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8053: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8085: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8057: \$? = $ac_status" >&5 + echo "$as_me:8089: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10850,7 +10882,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10853 "configure" +#line 10885 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10946,7 +10978,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10949 "configure" +#line 10981 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12949,8 +12981,44 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi +{ $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 +$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } +if test "${kpse_cv_warning_cflags+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "x$enable_compiler_warnings" = xno; then + kpse_cv_warning_cflags= +elif test "x$GCC" = xyes; then + kpse_cv_warning_cflags="-Wall -Wunused" + if test "x$enable_compiler_warnings" != xmin; then + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wmissing-prototypes -Wmissing-declarations" + case `$CC -dumpversion` in + 3.4.* | 4.*) kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; +esac + + if test "x$enable_compiler_warnings" != xyes; then + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wimplicit -Wparentheses -Wreturn-type" + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wswitch -Wtrigraphs -Wshadow -Wpointer-arith" + kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings" + case `$CC -dumpversion` in + 3.4.* | 4.*) kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; +esac + + fi + fi +else + : # FIXME: warning flags for non-gcc compilers +fi +fi +{ $as_echo "$as_me:$LINENO: result: $kpse_cv_warning_cflags" >&5 +$as_echo "$kpse_cv_warning_cflags" >&6; } +WARNING_CFLAGS=$kpse_cv_warning_cflags + + + +# Configure options for dvipng also shown at the TeX Live top-level. ## texk/dvipng/ac/dvipng.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/ ## configure options for dvipng # Check whether --enable-debug was given. @@ -12988,12 +13056,137 @@ _ACEOF fi +# Checks for programs. +# For a native TeX Live build '--with-gs' is ignored. +if test "x$enable_native_texlive_build" = xyes; then + with_gs= +fi + +case $with_gs in + "" | yes | no) # Extract the first word of "gs", so it can be a program name with args. +set dummy gs; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_GS+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$GS"; then + ac_cv_prog_GS="$GS" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_GS="gs" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +GS=$ac_cv_prog_GS +if test -n "$GS"; then + { $as_echo "$as_me:$LINENO: result: $GS" >&5 +$as_echo "$GS" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + ;; + *) # Extract the first word of ""$with_gs"", so it can be a program name with args. +set dummy "$with_gs"; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GS+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $GS in + [\\/]* | ?:[\\/]*) + ac_cv_path_GS="$GS" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GS="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +GS=$ac_cv_path_GS +if test -n "$GS"; then + { $as_echo "$as_me:$LINENO: result: $GS" >&5 +$as_echo "$GS" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + ;; +esac + +if test -n "$GS"; then + GS_WARN= +{ $as_echo "$as_me:$LINENO: checking whether $GS has the pngalpha device" >&5 +$as_echo_n "checking whether $GS has the pngalpha device... " >&6; } +if $GS -h | grep pngalpha >/dev/null; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + GS_WARN="Your EPS inclusions will be cropped to the + boundingbox, and rendered on an opaque background. + Upgrade GhostScript to avoid this." + { $as_echo "$as_me:$LINENO: checking whether $GS has the png16m device" >&5 +$as_echo_n "checking whether $GS has the png16m device... " >&6; } +if $GS -h | grep png16m >/dev/null; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + GS_WARN="Your EPS inclusions may not work. + Upgrade/install GhostScript to avoid this." +fi + +fi + +if test -n "$GS_WARN"; then + { $as_echo "$as_me:$LINENO: WARNING: $GS_WARN" >&5 +$as_echo "$as_me: WARNING: $GS_WARN" >&2;} +fi + +else + { $as_echo "$as_me:$LINENO: WARNING: Cannot find GhostScript in your PATH" >&5 +$as_echo "$as_me: WARNING: Cannot find GhostScript in your PATH" >&2;} + GS=gs +fi + cat >>confdefs.h <<_ACEOF -#define GS_PATH "gs" +#define GS_PATH "$GS" _ACEOF +# Checks for libraries. { $as_echo "$as_me:$LINENO: checking for library containing pow" >&5 $as_echo_n "checking for library containing pow... " >&6; } if test "${ac_cv_search_pow+set}" = set; then @@ -13169,6 +13362,7 @@ if test "$ac_res" != no; then fi +# Checks for header files. { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } if test "${ac_cv_header_stdc+set}" = set; then @@ -13860,6 +14054,7 @@ _ACEOF fi +# Checks for typedefs, structures, and compiler characteristics. { $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } if test "${ac_cv_c_const+set}" = set; then @@ -14369,6 +14564,7 @@ _ACEOF esac +# Checks for library functions. # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! { $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5 @@ -16606,6 +16802,7 @@ done fi +# Documentation-related checks. # Extract the first word of "makeinfo", so it can be a program name with args. set dummy makeinfo; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -16710,6 +16907,131 @@ fi +# SELFAUTO +# When dvipng is built as part of the TeX Live tree, the option +# '--enable-texlive-build' is automatically passed from the top-level. +# In that case we silently assume '--disable-selfauto-set'. +test "x$enable_texlive_build" = xyes && enable_selfauto_set=no +# Check whether --enable-selfauto-set was given. +if test "${enable_selfauto_set+set}" = set; then + enableval=$enable_selfauto_set; if test "$enableval" = yes ; then + { $as_echo "$as_me:$LINENO: checking for \$SELFAUTOLOC" >&5 +$as_echo_n "checking for \$SELFAUTOLOC... " >&6; } + SELFAUTOLOC=`kpsewhich -expand-var=\\\$SELFAUTOLOC` + +cat >>confdefs.h <<_ACEOF +#define ENV_SELFAUTOLOC "SELFAUTOLOC=$SELFAUTOLOC" +_ACEOF + + { $as_echo "$as_me:$LINENO: result: $SELFAUTOLOC" >&5 +$as_echo "$SELFAUTOLOC" >&6; } + { $as_echo "$as_me:$LINENO: checking for \$SELFAUTODIR" >&5 +$as_echo_n "checking for \$SELFAUTODIR... " >&6; } + SELFAUTODIR=`kpsewhich -expand-var=\\\$SELFAUTODIR` + +cat >>confdefs.h <<_ACEOF +#define ENV_SELFAUTODIR "SELFAUTODIR=$SELFAUTODIR" +_ACEOF + + { $as_echo "$as_me:$LINENO: result: $SELFAUTODIR" >&5 +$as_echo "$SELFAUTODIR" >&6; } + { $as_echo "$as_me:$LINENO: checking for \$SELFAUTOPARENT" >&5 +$as_echo_n "checking for \$SELFAUTOPARENT... " >&6; } + SELFAUTOPARENT=`kpsewhich -expand-var=\\\$SELFAUTOPARENT` + +cat >>confdefs.h <<_ACEOF +#define ENV_SELFAUTOPARENT "SELFAUTOPARENT=$SELFAUTOPARENT" +_ACEOF + + { $as_echo "$as_me:$LINENO: result: $SELFAUTOPARENT" >&5 +$as_echo "$SELFAUTOPARENT" >&6; } + fi +else + { $as_echo "$as_me:$LINENO: checking for texmf.cnf" >&5 +$as_echo_n "checking for texmf.cnf... " >&6; } + TEXMF_CNF=`kpsewhich texmf.cnf` + { $as_echo "$as_me:$LINENO: result: $TEXMF_CNF" >&5 +$as_echo "$TEXMF_CNF" >&6; } + # Extract the first word of "kpsewhich", so it can be a program name with args. +set dummy kpsewhich; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_KPSEWHICH+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $KPSEWHICH in + [\\/]* | ?:[\\/]*) + ac_cv_path_KPSEWHICH="$KPSEWHICH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_KPSEWHICH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +KPSEWHICH=$ac_cv_path_KPSEWHICH +if test -n "$KPSEWHICH"; then + { $as_echo "$as_me:$LINENO: result: $KPSEWHICH" >&5 +$as_echo "$KPSEWHICH" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + { $as_echo "$as_me:$LINENO: checking for psfonts.map" >&5 +$as_echo_n "checking for psfonts.map... " >&6; } + cp $KPSEWHICH . + PSFONTS_MAP=`./kpsewhich psfonts.map` + rm -f ./kpsewhich + if test -n "$PSFONTS_MAP"; then + { $as_echo "$as_me:$LINENO: result: $PSFONTS_MAP" >&5 +$as_echo "$PSFONTS_MAP" >&6; } + else + { $as_echo "$as_me:$LINENO: result: not found from outside the texmf tree" >&5 +$as_echo "not found from outside the texmf tree" >&6; } + { $as_echo "$as_me:$LINENO: checking for \$SELFAUTO in texmf.cnf" >&5 +$as_echo_n "checking for \$SELFAUTO in texmf.cnf... " >&6; } + if grep SELFAUTO "$TEXMF_CNF" > /dev/null 2> /dev/null; then + { $as_echo "$as_me:$LINENO: result: yes +*************************************************************** +texmf.cnf is using \$SELFAUTO... variables. If you are going to +install dvipng outside the texmf tree, you may need to use +--enable-selfauto-set. To find out, do 'make ; make test'. If the test +is unsuccessful, add the mentioned switch and rebuild. +***************************************************************" >&5 +$as_echo "yes +*************************************************************** +texmf.cnf is using \$SELFAUTO... variables. If you are going to +install dvipng outside the texmf tree, you may need to use +--enable-selfauto-set. To find out, do 'make ; make test'. If the test +is unsuccessful, add the mentioned switch and rebuild. +***************************************************************" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi + fi +fi + + +# We have to check properties of libraries, either installed (system) +# libraries or unistalled (possibly libtool) ones from the TeX Live tree. +# Thus we can not use, e.g., AC_CHECK_LIB(LIB, FUNCTION) + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -18334,7 +18656,7 @@ ${top_builddir}/../../libs/gd/gd.h: fi - +# Checks for more libraries. kpse_save_CPPFLAGS=$CPPFLAGS kpse_save_LIBS=$LIBS @@ -18772,6 +19094,8 @@ fi fi +# We need enc, cmap, and sfd formats. +# Introduced together with opentype format (Dec 2003). { $as_echo "$as_me:$LINENO: checking whether kpathsea declares the kpse_opentype_format" >&5 $as_echo_n "checking whether kpathsea declares the kpse_opentype_format... " >&6; } if test "${kpse_cv_have_opentype_format+set}" = set; then @@ -19058,6 +19382,7 @@ else fi +# Checks for more header files. @@ -19376,6 +19701,7 @@ fi done +# Checks for more library functions. @@ -19496,9 +19822,6 @@ CPPFLAGS=$kpse_save_CPPFLAGS LIBS=$kpse_save_LIBS -DVIPNG_VERSION=1.12 - - { $as_echo "$as_me:$LINENO: result: ** Configuration summary for $PACKAGE_STRING: @@ -19547,7 +19870,7 @@ $as_echo " ac_config_headers="$ac_config_headers config.h" -ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files Makefile help/Makefile doc/Makefile" cat >confcache <<\_ACEOF @@ -20472,6 +20795,8 @@ do "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;; + "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} diff --git a/Build/source/texk/dvipng/configure.ac-1.12 b/Build/source/texk/dvipng/configure.ac-1.12 deleted file mode 100644 index 509591c93ba..00000000000 --- a/Build/source/texk/dvipng/configure.ac-1.12 +++ /dev/null @@ -1,227 +0,0 @@ -# configure.ac - -#************************************************************************ -# -# Part of the dvipng distribution -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/>. -# -# Copyright (C) 2002-2009 Jan-Åke Larsson -# -#************************************************************************ - -# Process this file with autoconf to produce a configure script. -AC_INIT([dvipng], [1.12], [dvipng@nongnu.org]) -AC_CONFIG_SRCDIR([dvipng.c]) - -AC_ARG_ENABLE(debug, - AC_HELP_STRING([--disable-debug],[Compile without debug (-d) option]), - [ if test "$enableval" = yes ; then - AC_DEFINE(DEBUG, 1, [Define as 1 to get the debug (-d) option.]) - fi ], - [ enable_debug="yes"; - AC_DEFINE(DEBUG, 1, [Define as 1 to get the debug (-d) option.])]) -AC_ARG_ENABLE(timing, - AC_HELP_STRING([--enable-timing],[Output execution time of dvipng]), - [ if test "$enableval" = yes ; then - AC_DEFINE(TIMING, 1, [Define as 1 to get execution time output.]) - fi ]) - -# Checks for programs. -AC_SET_MAKE -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_LN_S -AC_ARG_WITH(gs, - AC_HELP_STRING([--with-gs=/PATH/TO/gs],[Hard-wire the location of GhostScript]), - [if test "x$withval" != xno ; then - AC_PATH_PROG(GS,["$withval"]) - AC_DEFINE_UNQUOTED(GS_PATH, "$GS", [Define as the path to GhostScript.]) - GS_CHECK_DEVICES - fi], - [AC_CHECK_PROG(GS,gs,gs) - AC_DEFINE_UNQUOTED(GS_PATH, "gs", [Define as the path to GhostScript.]) - if test -n "$GS"; then - GS_CHECK_DEVICES - else - AC_MSG_WARN([Cannot find GhostScript in your PATH]) - fi -]) - -# Checks for libraries. -AC_CHECK_LIB(m, pow) -AC_CHECK_LIB(z, deflate) -AC_CHECK_LIB(gen, basename) -AC_CHECK_LIB([png], [png_read_image],, - [AC_MSG_ERROR([cannot find/use libpng])]) -AC_CHECK_LIB([gd], [gdImageCreate],, - [AC_MSG_ERROR([cannot find/use libgd -This drawing library can be downloaded at http://www.boutell.com/gd])]) -AC_CHECK_LIB([kpathsea], [kpse_set_progname],, - AC_MSG_ERROR([cannot find/use libkpathsea])) -AC_CHECK_LIB([t1], [T1_InitLib]) -PSFONTS_O="" -if test "$ac_cv_lib_t1_T1_InitLib" = yes; then - PSFONTS_O="t1.o" -fi -AC_SUBST(PSFONTS_O) - -# Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS([gd.h png.h kpathsea/kpathsea.h],, - [AC_MSG_ERROR([cannot find/use $ac_header])]) -AC_CHECK_HEADERS([t1lib.h]) -AC_CHECK_FT2(,[CFLAGS="$FT2_CFLAGS $CFLAGS" - LIBS="$FT2_LIBS $LIBS" - PSFONTS_O="$PSFONTS_O sfd.o ft.o" - AC_DEFINE(HAVE_FT2, 1, [Define to 1 if you have freetype2]) - ac_have_freetype2="yes"], - [ac_have_freetype2="no"]) -if test -n "$PSFONTS_O"; then - PSFONTS_O="$PSFONTS_O enc.o fontmap.o tfm.o" -fi -AC_HEADER_SYS_WAIT -AC_HEADER_TIME -AC_HEADER_STDBOOL -AC_CHECK_HEADERS([fcntl.h sys/time.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_TYPE_PID_T -AC_TYPE_SIZE_T -if test "$ac_cv_header_inttypes_h" = "yes"; then - # Sometimes we want to use gcc -ansi -pedantic as a portability test - # The typedef of int64_t is not in the system header file in that - # case. Then, #define int64_t as "long long", which is non-ansi, but - # is present in most modern compilers. Using a #define rather than a - # typedef can be a problem, but in dvipng int64_t is only used as - # typecast, and there are no problems. autoconf 2.13 equivalent: - # AC_CHECK_TYPE(int64_t, long long) - # AC_CHECK_TYPE(uint64_t, unsigned long long) - AC_CHECK_TYPE([int64_t],, - [AC_DEFINE_UNQUOTED([int64_t], [long long], - [Define to `long long' if - <inttypes.h> does not define it.])]) - AC_CHECK_TYPE([uint64_t],, - [AC_DEFINE_UNQUOTED([uint64_t], [unsigned long long], - [Define to `unsigned long long' if - <inttypes.h> does not define it.])]) -fi -AC_HAS_KPSE_ENC_FORMATS - - -# Checks for library functions. -AC_FUNC_ALLOCA -AC_FUNC_FORK -AC_FUNC_MALLOC -AC_FUNC_MMAP -AC_FUNC_STRTOD -AC_FUNC_VPRINTF -AC_CHECK_FUNCS([dup2 memset munmap pow putenv strchr strrchr strtol strstr]) -if test "$enable_timing" = "yes"; then - AC_CHECK_FUNCS([ftime gettimeofday]) -fi -AC_CHECK_FUNCS([gdImageCreateTrueColor gdImageCreateFromJpeg gdImagePngEx gdImageCreateFromPngPtr gdImageGif FT_Library_Version]) -if test "$ac_cv_func_gdImageGif" = "yes"; then - INSTALL_BIN_TARGET="install-dvigif" -else - INSTALL_BIN_TARGET="install-dvipng" -fi -AC_SUBST(INSTALL_BIN_TARGET) - -# Documentation-related checks -AC_PATH_PROG(MAKEINFO, makeinfo, :) -MAKEINFO_CHECK_MACROS(acronym env option) -AC_PATH_PROG(INSTALL_INFO, install-info, :, $PATH /usr/sbin /sbin) - -# SELFAUTO -AC_ARG_ENABLE(selfauto-set, - AC_HELP_STRING([--enable-selfauto-set], - [This option will make the final binary explicitly set the - $SELFAUTO... variables to make it look as dvipng is installed in the - main texmf tree, even if it isn't. This is necessary when texmf.cnf - only uses $SELFAUTO... variables and dvipng is not installed in the - texmf tree. Otherwise, dvipng may not be able to find virtual - fonts, or psfonts.map. To find out, first build the binary and do - 'make test'. If the test fails, you need this switch.]), - [ if test "$enableval" = yes ; then - AC_MSG_CHECKING([for \$SELFAUTOLOC]) - SELFAUTOLOC=`kpsewhich -expand-var=\\\$SELFAUTOLOC` - AC_DEFINE_UNQUOTED(ENV_SELFAUTOLOC,["SELFAUTOLOC=$SELFAUTOLOC"], - [The environment setting for $SELFAUTOLOC]) - AC_MSG_RESULT([$SELFAUTOLOC]) - AC_MSG_CHECKING([for \$SELFAUTODIR]) - SELFAUTODIR=`kpsewhich -expand-var=\\\$SELFAUTODIR` - AC_DEFINE_UNQUOTED(ENV_SELFAUTODIR,["SELFAUTODIR=$SELFAUTODIR"], - [The environment setting for $SELFAUTODIR]) - AC_MSG_RESULT([$SELFAUTODIR]) - AC_MSG_CHECKING([for \$SELFAUTOPARENT]) - SELFAUTOPARENT=`kpsewhich -expand-var=\\\$SELFAUTOPARENT` - AC_DEFINE_UNQUOTED(ENV_SELFAUTOPARENT,["SELFAUTOPARENT=$SELFAUTOPARENT"], - [The environment setting for $SELFAUTOPARENT]) - AC_MSG_RESULT([$SELFAUTOPARENT]) - fi ], - [AC_MSG_CHECKING([for texmf.cnf]) - TEXMF_CNF=`kpsewhich texmf.cnf` - AC_MSG_RESULT([$TEXMF_CNF]) - AC_PATH_PROG(KPSEWHICH, kpsewhich) - AC_MSG_CHECKING([for psfonts.map]) - cp $KPSEWHICH . - PSFONTS_MAP=`./kpsewhich psfonts.map` - rm -f ./kpsewhich - if test -n "$PSFONTS_MAP"; then - AC_MSG_RESULT([$PSFONTS_MAP]) - else - AC_MSG_RESULT([not found from outside the texmf tree]) - AC_MSG_CHECKING([for \$SELFAUTO in texmf.cnf]) - if grep SELFAUTO "$TEXMF_CNF" > /dev/null 2> /dev/null; then - AC_MSG_RESULT([yes -*************************************************************** -texmf.cnf is using \$SELFAUTO... variables. If you are going to -install dvipng outside the texmf tree, you may need to use ---enable-selfauto-set. To find out, do 'make ; make test'. If the test -is unsuccessful, add the mentioned switch and rebuild. -***************************************************************]) - else - AC_MSG_RESULT([no]) - fi - fi]) - -AC_MSG_RESULT([ -** Configuration summary for $PACKAGE_STRING: - - The -d (debug) switch is enabled: $enable_debug - Your gd is new enough (>=2.0) to enable - the --truecolor switch, full alpha - transparency, proper rescaling of - included bitmaps, and jpeg inclusion: $ac_cv_func_gdImageCreateTrueColor - Your gd has jpeg inclusion enabled: $ac_cv_func_gdImageCreateFromJpeg - Your gd is new enough (>=2.0.12) to - enable transparent backgrounds for EPS - inclusion and the -z (compression) - switch: $ac_cv_func_gdImagePngEx - Your gd is new enough (>=2.0.21) to - allow image creation from memory $ac_cv_func_gdImageCreateFromPngPtr - Your gd is new enough (>=2.0.28) to - enable gif inclusion and output - (dvigif): $ac_cv_func_gdImageGif - FreeType font rendering available: $ac_have_freetype2 - Support for subfonts (CJK-LaTeX): $ac_have_freetype2 - T1lib font rendering available: $ac_cv_lib_t1_T1_InitLib -]) - -AC_CONFIG_HEADER([config.h]) -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/dvipng/configure.ac.demo b/Build/source/texk/dvipng/configure.ac.demo deleted file mode 100644 index 952d52a3c03..00000000000 --- a/Build/source/texk/dvipng/configure.ac.demo +++ /dev/null @@ -1,174 +0,0 @@ -# -*- Autoconf -*- -# configure.ac -# Process this file with autoconf to produce a configure script. - -#************************************************************************ -# -# Part of the dvipng distribution -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301 USA. -# -# Copyright (C) 2002-2006 Jan-Åke Larsson -# -#************************************************************************ - -AC_PREREQ(2.60) -AC_INIT([dvipng-demo], [1.9], [dvipng@nongnu.org]) -AC_CONFIG_AUX_DIR([cf]) -AC_CONFIG_SRCDIR([dvipng.c]) -AC_CONFIG_HEADERS([config.h]) - -AM_INIT_AUTOMAKE[]dnl using automake - -AC_ARG_ENABLE(debug, - AC_HELP_STRING([--disable-debug],[Compile without debug (-d) option]), - [ if test "$enableval" = yes ; then - AC_DEFINE(DEBUG, 1, [Define as 1 to get the debug (-d) option.]) - fi ], - [ enable_debug="yes"; - AC_DEFINE(DEBUG, 1, [Define as 1 to get the debug (-d) option.])]) -AC_ARG_ENABLE(timing, - AC_HELP_STRING([--enable-timing],[Output execution time of dvipng]), - [ if test "$enableval" = yes ; then - AC_DEFINE(TIMING, 1, [Define as 1 to get execution time output.]) - fi ]) - -# Checks for programs. -AC_SET_MAKE -AC_PROG_CC -AC_PROG_INSTALL - -AC_PROG_LIBTOOL[]dnl using libtool to link executables - -AC_ARG_WITH(gs, - AC_HELP_STRING([--with-gs=/PATH/TO/gs],[Hard-wire the location of GhostScript]), - [if test "x$withval" = xno ; then - GS=no - else - AC_PATH_PROG(GS,["$withval"]) - fi], - [AC_CHECK_PROG(GS,gs,gs) - if test -z "$GS"; then - GS="gs" - AC_MSG_WARN([Cannot find GhostScript in your PATH]) - fi -]) -AC_DEFINE_UNQUOTED(GS_PATH, "$GS", [Define as the path to GhostScript.]) -GS_WARN="" -xx_GS_HAS_DEVICE(pngalpha, - [GS_WARN="Your EPS inclusions will be cropped to the - boundingbox, and rendered on an opaque background. - Upgrade GhostScript to avoid this." - xx_GS_HAS_DEVICE(png16m, - [GS_WARN="Your EPS inclusions may not work. - Upgrade/install GhostScript to avoid this."])]) -if test -n "$GS_WARN"; then - AC_MSG_WARN([$GS_WARN]) -fi - -# Checks for libraries and header files. -AC_SEARCH_LIBS([pow], [m]) -AC_SEARCH_LIBS([basename], [gen]) - -KPSE_INIT([dvipng])[]dnl initialize kpathsea.m4 -ENABLE_TETEX_BUILD[]dnl Kpathsea is required -KPSE_CHECK_ZLIB[]dnl Zlib is required (sorry, Libpng requires Zlib) -KPSE_CHECK_LIBPNG[]dnl Libpng is required -dnl KPSE_CHECK_FREETYPE2[]dnl Freetype2 is required -KPSE_WITH_FREETYPE2[]dnl Freetype2 is optional -KPSE_CHECK_GD[]dnl Gd is required -KPSE_WITH_T1LIB[]dnl T1lib is optional - -AM_CONDITIONAL([USE_T1], [test "$have_t1lib" = yes]) -AM_CONDITIONAL([USE_FT2], [test "$have_freetype2" = yes]) - -AC_HEADER_STDC -AC_HEADER_SYS_WAIT -AC_HEADER_TIME -AC_HEADER_STDBOOL -AC_CHECK_HEADERS([fcntl.h sys/time.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_TYPE_PID_T -AC_TYPE_SIZE_T -if test "$ac_cv_header_inttypes_h" = "yes"; then - # Sometimes we want to use gcc -ansi -pedantic as a portability test - # The typedef of int64_t is not in the system header file in that - # case. Then, #define int64_t as "long long", which is non-ansi, but - # is present in most modern compilers. Using a #define rather than a - # typedef can be a problem, but in dvipng int64_t is only used as - # typecast, and there are no problems. autoconf 2.13 equivalent: - # AC_CHECK_TYPE(int64_t, long long) - # AC_CHECK_TYPE(uint64_t, unsigned long long) - AC_CHECK_TYPE([int64_t],, - [AC_DEFINE_UNQUOTED([int64_t], [long long], - [Define to `long long' if - <inttypes.h> does not define it.])]) - AC_CHECK_TYPE([uint64_t],, - [AC_DEFINE_UNQUOTED([uint64_t], [unsigned long long], - [Define to `unsigned long long' if - <inttypes.h> does not define it.])]) -fi - - -# Checks for library functions. -AC_FUNC_ALLOCA -AC_FUNC_FORK -AC_FUNC_MALLOC -AC_FUNC_MMAP -AC_FUNC_STRTOD -AC_FUNC_VPRINTF -AC_CHECK_FUNCS([dup2 memset munmap pow putenv strchr strrchr strtol strstr]) -if test "$enable_timing" = "yes"; then - AC_CHECK_FUNCS([ftime gettimeofday]) -fi -KPSE_CHECK_FUNCS([gdImageCreateTrueColor gdImagePngEx gdImageGif gdImageJpeg FT_Library_Version]) -AM_CONDITIONAL([WITH_DVIGIF], [test "$ac_cv_func_gdImageGif" = yes]) - -# Documentation-related checks -AC_PATH_PROG(MAKEINFO, makeinfo, :) -MAKEINFO_CHECK_MACROS(acronym env option) -AC_PATH_PROG(INSTALL_INFO, install-info, :, $PATH /usr/sbin /sbin) - -KPSE_SELFAUTO[]dnl handle SELFAUTO variables. -AC_SUBST([TEXMFMAIN]) -AC_SUBST([enable_selfauto_set]) - -AC_MSG_RESULT([ -** Configuration summary for $PACKAGE_STRING: - - The -d (debug) switch is enabled: $enable_debug - Your gd is new enough (>=2.0) to enable - the --truecolor switch, full alpha - transparency, and proper rescaling of - included bitmaps: $ac_cv_func_gdImageCreateTrueColor - Your gd was built with jpeg inclusion: $ac_cv_func_gdImageJpeg - Your gd is new enough (>=2.0.12) to - enable transparent backgrounds for EPS - inclusion and the -z (compression) - switch: $ac_cv_func_gdImagePngEx - Your gd is new enough (>=2.0.28) to - enable gif inclusion and output - (dvigif): $ac_cv_func_gdImageGif - FreeType font rendering available: $have_freetype2 - Support for subfonts (CJK-LaTeX): $have_freetype2 - T1lib font rendering available: $have_t1lib -]) - -AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([test_dvipng], [chmod a+x test_dvipng]) -AC_OUTPUT diff --git a/Build/source/texk/dvipng/configure.ac.orig b/Build/source/texk/dvipng/configure.ac.orig index da5aaf0a479..509591c93ba 100644 --- a/Build/source/texk/dvipng/configure.ac.orig +++ b/Build/source/texk/dvipng/configure.ac.orig @@ -1,9 +1,5 @@ # configure.ac -# Adapted for dvipng-1.9 / teTeX by Thomas Esser. -# Adapted for dvipng-1.10 / TeX live by Peter Breitenlohner. -# All settings here are our fault, don't blame the dvipng maintainers for it. - #************************************************************************ # # Part of the dvipng distribution @@ -22,12 +18,12 @@ # License along with this program. If not, see # <http://www.gnu.org/licenses/>. # -# Copyright (C) 2002-2008 Jan-Åke Larsson +# Copyright (C) 2002-2009 Jan-Åke Larsson # #************************************************************************ # Process this file with autoconf to produce a configure script. -AC_INIT([dvipng], [1.11], [dvipng@nongnu.org]) +AC_INIT([dvipng], [1.12], [dvipng@nongnu.org]) AC_CONFIG_SRCDIR([dvipng.c]) AC_ARG_ENABLE(debug, @@ -44,123 +40,100 @@ AC_ARG_ENABLE(timing, fi ]) # Checks for programs. -AC_PROG_MAKE_SET +AC_SET_MAKE AC_PROG_CC AC_PROG_INSTALL AC_PROG_LN_S AC_ARG_WITH(gs, AC_HELP_STRING([--with-gs=/PATH/TO/gs],[Hard-wire the location of GhostScript]), - [if test "x$withval" = xno ; then - GS=no - else + [if test "x$withval" != xno ; then AC_PATH_PROG(GS,["$withval"]) + AC_DEFINE_UNQUOTED(GS_PATH, "$GS", [Define as the path to GhostScript.]) GS_CHECK_DEVICES fi], [AC_CHECK_PROG(GS,gs,gs) + AC_DEFINE_UNQUOTED(GS_PATH, "gs", [Define as the path to GhostScript.]) if test -n "$GS"; then GS_CHECK_DEVICES else - GS="gs" AC_MSG_WARN([Cannot find GhostScript in your PATH]) fi ]) -AC_DEFINE_UNQUOTED(GS_PATH, "$GS", [Define as the path to GhostScript.]) -ac_cv_lib_t1_T1_InitLib=yes +# Checks for libraries. +AC_CHECK_LIB(m, pow) +AC_CHECK_LIB(z, deflate) +AC_CHECK_LIB(gen, basename) +AC_CHECK_LIB([png], [png_read_image],, + [AC_MSG_ERROR([cannot find/use libpng])]) +AC_CHECK_LIB([gd], [gdImageCreate],, + [AC_MSG_ERROR([cannot find/use libgd +This drawing library can be downloaded at http://www.boutell.com/gd])]) +AC_CHECK_LIB([kpathsea], [kpse_set_progname],, + AC_MSG_ERROR([cannot find/use libkpathsea])) +AC_CHECK_LIB([t1], [T1_InitLib]) PSFONTS_O="" if test "$ac_cv_lib_t1_T1_InitLib" = yes; then PSFONTS_O="t1.o" fi AC_SUBST(PSFONTS_O) -ac_have_freetype2="yes" # we have ft2 -if test "$ac_have_freetype2" = yes; then - # Have to set compiler and linker flags in Makefile.in, it seems. +# Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS([gd.h png.h kpathsea/kpathsea.h],, + [AC_MSG_ERROR([cannot find/use $ac_header])]) +AC_CHECK_HEADERS([t1lib.h]) +AC_CHECK_FT2(,[CFLAGS="$FT2_CFLAGS $CFLAGS" + LIBS="$FT2_LIBS $LIBS" PSFONTS_O="$PSFONTS_O sfd.o ft.o" AC_DEFINE(HAVE_FT2, 1, [Define to 1 if you have freetype2]) - AC_DEFINE(HAVE_FT_LIBRARY_VERSION) -fi - + ac_have_freetype2="yes"], + [ac_have_freetype2="no"]) if test -n "$PSFONTS_O"; then PSFONTS_O="$PSFONTS_O enc.o fontmap.o tfm.o" fi -AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_HEADER_TIME AC_HEADER_STDBOOL -AC_CHECK_HEADERS([inttypes.h fcntl.h sys/time.h]) +AC_CHECK_HEADERS([fcntl.h sys/time.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_TYPE_PID_T AC_TYPE_SIZE_T - -#if test "$ac_cv_header_inttypes_h" = yes; then +if test "$ac_cv_header_inttypes_h" = "yes"; then # Sometimes we want to use gcc -ansi -pedantic as a portability test # The typedef of int64_t is not in the system header file in that # case. Then, #define int64_t as "long long", which is non-ansi, but # is present in most modern compilers. Using a #define rather than a - # typedef can be a problem, but in dvipng int64_t only is used as - # typecast, and there are no problems. + # typedef can be a problem, but in dvipng int64_t is only used as + # typecast, and there are no problems. autoconf 2.13 equivalent: + # AC_CHECK_TYPE(int64_t, long long) + # AC_CHECK_TYPE(uint64_t, unsigned long long) + AC_CHECK_TYPE([int64_t],, + [AC_DEFINE_UNQUOTED([int64_t], [long long], + [Define to `long long' if + <inttypes.h> does not define it.])]) + AC_CHECK_TYPE([uint64_t],, + [AC_DEFINE_UNQUOTED([uint64_t], [unsigned long long], + [Define to `unsigned long long' if + <inttypes.h> does not define it.])]) +fi +AC_HAS_KPSE_ENC_FORMATS -# MY_CHECK_TYPE(int64_t, long long) -# MY_CHECK_TYPE(uint64_t, unsigned long long) -#fi # Checks for library functions. AC_FUNC_ALLOCA +AC_FUNC_FORK +AC_FUNC_MALLOC AC_FUNC_MMAP +AC_FUNC_STRTOD AC_FUNC_VPRINTF AC_CHECK_FUNCS([dup2 memset munmap pow putenv strchr strrchr strtol strstr]) if test "$enable_timing" = "yes"; then AC_CHECK_FUNCS([ftime gettimeofday]) fi - -AC_SEARCH_LIBS([pow], [m]) -AC_SEARCH_LIBS([basename], [gen]) - -# Documentation-related checks -AC_PATH_PROG(MAKEINFO, makeinfo, :) -MAKEINFO_CHECK_MACROS(acronym env option) -AC_PATH_PROG(INSTALL_INFO, install-info, :, $PATH /usr/sbin /sbin) - -sinclude(../../libs/zlib/withenable.ac) -sinclude(../../libs/zlib/zlib.ac) -sinclude(../../libs/libpng/withenable.ac) -sinclude(../../libs/libpng/libpng.ac) -sinclude(../../libs/t1lib/withenable.ac) -sinclude(../../libs/t1lib/t1lib.ac) -sinclude(../../libs/freetype2/withenable.ac) -sinclude(../../libs/freetype2/freetype2.ac) -sinclude(../../libs/gd/withenable.ac) -sinclude(../../libs/gd/gd.ac) -sinclude(../kpathsea/withenable.ac) - -if test "$with_system_freetype2" = yes; then - OLD_LIBS=$LIBS - LIBS="$LDFREETYPE2 $LIBS" - AC_CHECK_FUNCS([FT_Library_Version]) - LIBS=$OLD_LIBS -else - AC_DEFINE([HAVE_FT_LIBRARY_VERSION]) -fi - -if test "$with_system_gd" = yes; then - OLD_LIBS=$LIBS - LIBS="$LDGD $LIBS" - AC_CHECK_FUNCS([gdImageCreateTrueColor gdImageCreateFromJpeg gdImagePngEx gdImageCreateFromPngPtr gdImageGif]) - LIBS=$OLD_LIBS -else - AC_DEFINE([HAVE_GDIMAGECREATETRUECOLOR]) - AC_DEFINE([HAVE_GDIMAGEPNGEX]) - AC_DEFINE([HAVE_GDIMAGECREATEFROMPNGPTR]) - ac_cv_func_gdImageGif=yes - AC_DEFINE([HAVE_GDIMAGEGIF]) -fi - -AC_DEFINE([HAVE_GD_H]) -AC_DEFINE([HAVE_LIBGD]) - +AC_CHECK_FUNCS([gdImageCreateTrueColor gdImageCreateFromJpeg gdImagePngEx gdImageCreateFromPngPtr gdImageGif FT_Library_Version]) if test "$ac_cv_func_gdImageGif" = "yes"; then INSTALL_BIN_TARGET="install-dvigif" else @@ -168,49 +141,87 @@ else fi AC_SUBST(INSTALL_BIN_TARGET) -AC_DEFINE([HAVE_T1LIB_H], 1, - [Define to 1 if you have the <t1lib.h> header file.]) -AC_DEFINE([HAVE_LIBT1], 1, - [Define to 1 if you have the `t1' library (-lt1).]) - -AC_DEFINE([HAVE_PNG_H], 1, - [Define to 1 if you have the <png.h> header file.]) -AC_DEFINE([HAVE_LIBPNG], 1, - [Define to 1 if you have the `png' library (-lpng).]) - -AC_DEFINE([HAVE_LIBZ]) - -# Allow shared or static libkpathsea -LIBS="-L../kpathsea/.libs -lkpathsea $LIBS" -AC_DEFINE([HAVE_KPATHSEA_KPATHSEA_H], 1, - [Define to 1 if you have the <kpathsea/kpathsea.h> header file.]) -AC_DEFINE([HAVE_KPSE_ENC_FORMATS], 1, - [Define to 1 if your kpathsea has kpse_enc_format.]) -AC_DEFINE([HAVE_LIBKPATHSEA], 1, - [Define to 1 if you have the `kpathsea' library (-lkpathsea).]) +# Documentation-related checks +AC_PATH_PROG(MAKEINFO, makeinfo, :) +MAKEINFO_CHECK_MACROS(acronym env option) +AC_PATH_PROG(INSTALL_INFO, install-info, :, $PATH /usr/sbin /sbin) -# -# Check for ApplicationServices framework (Mac OS X) -# -AC_DEFUN([AC_HAS_APP_SERVICES], [ - _cppflags=$CPPFLAGS _ldflags=$LDFLAGS - AC_MSG_CHECKING([for Mac OS X ApplicationServices framework]) - AC_TRY_COMPILE( - [ -#include <ApplicationServices/ApplicationServices.h> - ], [ -ATSFontRef fontRef; - ], - [ AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_APP_SERVICES, 1, [Define if you have ApplicationServices (Mac OS X)]) - LIBS="$LIBS -framework ApplicationServices" - ], - [ AC_MSG_RESULT(no) ] - ) +# SELFAUTO +AC_ARG_ENABLE(selfauto-set, + AC_HELP_STRING([--enable-selfauto-set], + [This option will make the final binary explicitly set the + $SELFAUTO... variables to make it look as dvipng is installed in the + main texmf tree, even if it isn't. This is necessary when texmf.cnf + only uses $SELFAUTO... variables and dvipng is not installed in the + texmf tree. Otherwise, dvipng may not be able to find virtual + fonts, or psfonts.map. To find out, first build the binary and do + 'make test'. If the test fails, you need this switch.]), + [ if test "$enableval" = yes ; then + AC_MSG_CHECKING([for \$SELFAUTOLOC]) + SELFAUTOLOC=`kpsewhich -expand-var=\\\$SELFAUTOLOC` + AC_DEFINE_UNQUOTED(ENV_SELFAUTOLOC,["SELFAUTOLOC=$SELFAUTOLOC"], + [The environment setting for $SELFAUTOLOC]) + AC_MSG_RESULT([$SELFAUTOLOC]) + AC_MSG_CHECKING([for \$SELFAUTODIR]) + SELFAUTODIR=`kpsewhich -expand-var=\\\$SELFAUTODIR` + AC_DEFINE_UNQUOTED(ENV_SELFAUTODIR,["SELFAUTODIR=$SELFAUTODIR"], + [The environment setting for $SELFAUTODIR]) + AC_MSG_RESULT([$SELFAUTODIR]) + AC_MSG_CHECKING([for \$SELFAUTOPARENT]) + SELFAUTOPARENT=`kpsewhich -expand-var=\\\$SELFAUTOPARENT` + AC_DEFINE_UNQUOTED(ENV_SELFAUTOPARENT,["SELFAUTOPARENT=$SELFAUTOPARENT"], + [The environment setting for $SELFAUTOPARENT]) + AC_MSG_RESULT([$SELFAUTOPARENT]) + fi ], + [AC_MSG_CHECKING([for texmf.cnf]) + TEXMF_CNF=`kpsewhich texmf.cnf` + AC_MSG_RESULT([$TEXMF_CNF]) + AC_PATH_PROG(KPSEWHICH, kpsewhich) + AC_MSG_CHECKING([for psfonts.map]) + cp $KPSEWHICH . + PSFONTS_MAP=`./kpsewhich psfonts.map` + rm -f ./kpsewhich + if test -n "$PSFONTS_MAP"; then + AC_MSG_RESULT([$PSFONTS_MAP]) + else + AC_MSG_RESULT([not found from outside the texmf tree]) + AC_MSG_CHECKING([for \$SELFAUTO in texmf.cnf]) + if grep SELFAUTO "$TEXMF_CNF" > /dev/null 2> /dev/null; then + AC_MSG_RESULT([yes +*************************************************************** +texmf.cnf is using \$SELFAUTO... variables. If you are going to +install dvipng outside the texmf tree, you may need to use +--enable-selfauto-set. To find out, do 'make ; make test'. If the test +is unsuccessful, add the mentioned switch and rebuild. +***************************************************************]) + else + AC_MSG_RESULT([no]) + fi + fi]) + +AC_MSG_RESULT([ +** Configuration summary for $PACKAGE_STRING: + + The -d (debug) switch is enabled: $enable_debug + Your gd is new enough (>=2.0) to enable + the --truecolor switch, full alpha + transparency, proper rescaling of + included bitmaps, and jpeg inclusion: $ac_cv_func_gdImageCreateTrueColor + Your gd has jpeg inclusion enabled: $ac_cv_func_gdImageCreateFromJpeg + Your gd is new enough (>=2.0.12) to + enable transparent backgrounds for EPS + inclusion and the -z (compression) + switch: $ac_cv_func_gdImagePngEx + Your gd is new enough (>=2.0.21) to + allow image creation from memory $ac_cv_func_gdImageCreateFromPngPtr + Your gd is new enough (>=2.0.28) to + enable gif inclusion and output + (dvigif): $ac_cv_func_gdImageGif + FreeType font rendering available: $ac_have_freetype2 + Support for subfonts (CJK-LaTeX): $ac_have_freetype2 + T1lib font rendering available: $ac_cv_lib_t1_T1_InitLib ]) -AC_HAS_APP_SERVICES - -AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_HEADER([config.h]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/Build/source/texk/dvipng/configure.ac.work b/Build/source/texk/dvipng/configure.ac.work deleted file mode 100644 index ed645fa2a89..00000000000 --- a/Build/source/texk/dvipng/configure.ac.work +++ /dev/null @@ -1,91 +0,0 @@ -# configure.ac - -# Process this file with autoconf to produce a configure script. -AC_INIT([dvipng], [1.12], [dvipng@nongnu.org]) -AC_CONFIG_SRCDIR([dvipng.c]) - - -# Checks for programs. -AC_SET_MAKE -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_LN_S -AC_ARG_WITH(gs, - AC_HELP_STRING([--with-gs=/PATH/TO/gs],[Hard-wire the location of GhostScript]), - [if test "x$withval" != xno ; then - AC_PATH_PROG(GS,["$withval"]) - AC_DEFINE_UNQUOTED(GS_PATH, "$GS", [Define as the path to GhostScript.]) - GS_CHECK_DEVICES - fi], - [AC_CHECK_PROG(GS,gs,gs) - AC_DEFINE_UNQUOTED(GS_PATH, "gs", [Define as the path to GhostScript.]) - if test -n "$GS"; then - GS_CHECK_DEVICES - else - AC_MSG_WARN([Cannot find GhostScript in your PATH]) - fi -]) - -# Checks for libraries. - -# Checks for header files. - -# Checks for typedefs, structures, and compiler characteristics. - -# Checks for library functions. - -# Documentation-related checks - -# SELFAUTO -AC_ARG_ENABLE(selfauto-set, - AC_HELP_STRING([--enable-selfauto-set], - [This option will make the final binary explicitly set the - $SELFAUTO... variables to make it look as dvipng is installed in the - main texmf tree, even if it isn't. This is necessary when texmf.cnf - only uses $SELFAUTO... variables and dvipng is not installed in the - texmf tree. Otherwise, dvipng may not be able to find virtual - fonts, or psfonts.map. To find out, first build the binary and do - 'make test'. If the test fails, you need this switch.]), - [ if test "$enableval" = yes ; then - AC_MSG_CHECKING([for \$SELFAUTOLOC]) - SELFAUTOLOC=`kpsewhich -expand-var=\\\$SELFAUTOLOC` - AC_DEFINE_UNQUOTED(ENV_SELFAUTOLOC,["SELFAUTOLOC=$SELFAUTOLOC"], - [The environment setting for $SELFAUTOLOC]) - AC_MSG_RESULT([$SELFAUTOLOC]) - AC_MSG_CHECKING([for \$SELFAUTODIR]) - SELFAUTODIR=`kpsewhich -expand-var=\\\$SELFAUTODIR` - AC_DEFINE_UNQUOTED(ENV_SELFAUTODIR,["SELFAUTODIR=$SELFAUTODIR"], - [The environment setting for $SELFAUTODIR]) - AC_MSG_RESULT([$SELFAUTODIR]) - AC_MSG_CHECKING([for \$SELFAUTOPARENT]) - SELFAUTOPARENT=`kpsewhich -expand-var=\\\$SELFAUTOPARENT` - AC_DEFINE_UNQUOTED(ENV_SELFAUTOPARENT,["SELFAUTOPARENT=$SELFAUTOPARENT"], - [The environment setting for $SELFAUTOPARENT]) - AC_MSG_RESULT([$SELFAUTOPARENT]) - fi ], - [AC_MSG_CHECKING([for texmf.cnf]) - TEXMF_CNF=`kpsewhich texmf.cnf` - AC_MSG_RESULT([$TEXMF_CNF]) - AC_PATH_PROG(KPSEWHICH, kpsewhich) - AC_MSG_CHECKING([for psfonts.map]) - cp $KPSEWHICH . - PSFONTS_MAP=`./kpsewhich psfonts.map` - rm -f ./kpsewhich - if test -n "$PSFONTS_MAP"; then - AC_MSG_RESULT([$PSFONTS_MAP]) - else - AC_MSG_RESULT([not found from outside the texmf tree]) - AC_MSG_CHECKING([for \$SELFAUTO in texmf.cnf]) - if grep SELFAUTO "$TEXMF_CNF" > /dev/null 2> /dev/null; then - AC_MSG_RESULT([yes -*************************************************************** -texmf.cnf is using \$SELFAUTO... variables. If you are going to -install dvipng outside the texmf tree, you may need to use ---enable-selfauto-set. To find out, do 'make ; make test'. If the test -is unsuccessful, add the mentioned switch and rebuild. -***************************************************************]) - else - AC_MSG_RESULT([no]) - fi - fi]) - diff --git a/Build/source/texk/dvipng/doc/Makefile.am b/Build/source/texk/dvipng/doc/Makefile.am new file mode 100644 index 00000000000..0753c9c460a --- /dev/null +++ b/Build/source/texk/dvipng/doc/Makefile.am @@ -0,0 +1,61 @@ +## Makefile.am for the TeX Live subdirectory texk/dvipng/doc/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. +# +## #################################### Documentation +## +info_TEXINFOS = dvipng.texi +dvipng_TEXINFOS = readme.texi install.texi macros.texi dvipng.help + +dist_noinst_SCRIPTS = texi2pod.pl + +dist_man1_MANS = dvipng.1 +dvipng.1: dvipng.texi readme.texi + $(srcdir)/texi2pod.pl -D man $(srcdir)/dvipng.texi | \ + sed -es/@//g -es/previewlatex/preview-latex/g -es/{}//g > dvipng.pod + pod2man --center="User commands" --release="$(PACKAGE_STRING)" \ + dvipng.pod > dvipng.1 + rm dvipng.pod + +www: dvipng.texi $(dvipng_TEXINFOS) + $(mkdir_p) www + $(TEXI2HTML) -split chapter -nosec-nav -subdir html \ + -I $(srcdir) $(srcdir)/dvipng.texi + (cd html; for i in *; do \ + sed -e "s/Jan-A/Jan-\Å\;/g" $$i > ../www/$$i; \ + done) + cp www/dvipng.html www/index.html + rm -rf html + +dvipng_mono.html: dvipng.texi $(dvipng_TEXINFOS) + $(TEXI2HTML) --monolithic -nomenu -nosec_nav -o dvipng_mono.html \ + -I $(srcdir) $(srcdir)/dvipng.texi + +distclean-local: + rm -rf www + rm -f dvipng_mono.html + +if have_gif +install-data-hook: + cd $(DESTDIR)$(man1dir) && \ + rm -f dvigif.1 && \ + $(LN_S) dvipng.1 dvigif.1 +uninstall-hook: + rm -f $(DESTDIR)$(man1dir)/dvigif.1 +endif have_gif + +## #################################### Maintainer targets +## +am-local: ../INSTALL ../README RELEASE + +../INSTALL: install.texi + -$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -D rawfile --no-headers --no-validate --no-number-sections \ + -o $@ $< + +../README: readme.texi + -$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -D rawfile --no-headers --no-validate --no-number-sections \ + -o $@ $< + diff --git a/Build/source/texk/dvipng/doc/Makefile.in b/Build/source/texk/dvipng/doc/Makefile.in new file mode 100644 index 00000000000..e31e9676632 --- /dev/null +++ b/Build/source/texk/dvipng/doc/Makefile.in @@ -0,0 +1,769 @@ +# Makefile.in generated by automake 1.11 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = doc +DIST_COMMON = $(dist_man1_MANS) $(dist_noinst_SCRIPTS) \ + $(dvipng_TEXINFOS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \ + $(top_srcdir)/m4/makeinfo.m4 \ + $(top_srcdir)/../../m4/kpse-common.m4 \ + $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ + $(top_srcdir)/../../m4/kpse-gd-flags.m4 \ + $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../../m4/kpse-t1lib-flags.m4 \ + $(top_srcdir)/../../m4/kpse-warnings.m4 \ + $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ + $(top_srcdir)/../../m4/libtool.m4 \ + $(top_srcdir)/../../m4/ltoptions.m4 \ + $(top_srcdir)/../../m4/ltsugar.m4 \ + $(top_srcdir)/../../m4/ltversion.m4 \ + $(top_srcdir)/../../m4/lt~obsolete.m4 \ + $(top_srcdir)/ac/dvipng.ac $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/../../build-aux/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +SCRIPTS = $(dist_noinst_SCRIPTS) +SOURCES = +DIST_SOURCES = +INFO_DEPS = $(srcdir)/dvipng.info +TEXINFO_TEX = $(top_srcdir)/../../build-aux/texinfo.tex +am__TEXINFO_TEX_DIR = $(top_srcdir)/../../build-aux +DVIS = dvipng.dvi +PDFS = dvipng.pdf +PSS = dvipng.ps +HTMLS = dvipng.html +TEXINFOS = dvipng.texi +TEXI2DVI = texi2dvi +TEXI2PDF = $(TEXI2DVI) --pdf --batch +MAKEINFOHTML = $(MAKEINFO) --html +AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) +DVIPS = dvips +am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +man1dir = $(mandir)/man1 +NROFF = nroff +MANS = $(dist_man1_MANS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMTAR = @AMTAR@ +AM_MAKEINFOFLAGS = @AM_MAKEINFOFLAGS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ +FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ +FREETYPE2_LIBS = @FREETYPE2_LIBS@ +FT2_CONFIG = @FT2_CONFIG@ +GD_DEPEND = @GD_DEPEND@ +GD_INCLUDES = @GD_INCLUDES@ +GD_LIBS = @GD_LIBS@ +GREP = @GREP@ +GS = @GS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_INFO = @INSTALL_INFO@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KPATHSEA_DEPEND = @KPATHSEA_DEPEND@ +KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@ +KPATHSEA_LIBS = @KPATHSEA_LIBS@ +KPSEWHICH = @KPSEWHICH@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBPNG_DEPEND = @LIBPNG_DEPEND@ +LIBPNG_INCLUDES = @LIBPNG_INCLUDES@ +LIBPNG_LIBS = @LIBPNG_LIBS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POW_LIB = @POW_LIB@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +T1LIB_DEPEND = @T1LIB_DEPEND@ +T1LIB_INCLUDES = @T1LIB_INCLUDES@ +T1LIB_LIBS = @T1LIB_LIBS@ +VERSION = @VERSION@ +WARNING_CFLAGS = @WARNING_CFLAGS@ +ZLIB_DEPEND = @ZLIB_DEPEND@ +ZLIB_INCLUDES = @ZLIB_INCLUDES@ +ZLIB_LIBS = @ZLIB_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# +info_TEXINFOS = dvipng.texi +dvipng_TEXINFOS = readme.texi install.texi macros.texi dvipng.help +dist_noinst_SCRIPTS = texi2pod.pl +dist_man1_MANS = dvipng.1 +all: all-am + +.SUFFIXES: +.SUFFIXES: .dvi .html .info .pdf .ps .texi +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign doc/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +.texi.info: + restore=: && backupdir="$(am__leading_dot)am$$$$" && \ + am__cwd=`pwd` && $(am__cd) $(srcdir) && \ + rm -rf $$backupdir && mkdir $$backupdir && \ + if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ + for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ + if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ + done; \ + else :; fi && \ + cd "$$am__cwd"; \ + if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -o $@ $<; \ + then \ + rc=0; \ + $(am__cd) $(srcdir); \ + else \ + rc=$$?; \ + $(am__cd) $(srcdir) && \ + $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ + fi; \ + rm -rf $$backupdir; exit $$rc + +.texi.dvi: + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ + $(TEXI2DVI) $< + +.texi.pdf: + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ + $(TEXI2PDF) $< + +.texi.html: + rm -rf $(@:.html=.htp) + if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -o $(@:.html=.htp) $<; \ + then \ + rm -rf $@; \ + if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ + mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \ + else \ + if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ + rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ + exit 1; \ + fi +$(srcdir)/dvipng.info: dvipng.texi $(dvipng_TEXINFOS) +dvipng.dvi: dvipng.texi $(dvipng_TEXINFOS) +dvipng.pdf: dvipng.texi $(dvipng_TEXINFOS) +dvipng.html: dvipng.texi $(dvipng_TEXINFOS) +.dvi.ps: + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + $(DVIPS) -o $@ $< + +uninstall-dvi-am: + @$(NORMAL_UNINSTALL) + @list='$(DVIS)'; test -n "$(dvidir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \ + rm -f "$(DESTDIR)$(dvidir)/$$f"; \ + done + +uninstall-html-am: + @$(NORMAL_UNINSTALL) + @list='$(HTMLS)'; test -n "$(htmldir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \ + rm -rf "$(DESTDIR)$(htmldir)/$$f"; \ + done + +uninstall-info-am: + @$(PRE_UNINSTALL) + @if test -d '$(DESTDIR)$(infodir)' && \ + (install-info --version && \ + install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ + list='$(INFO_DEPS)'; \ + for file in $$list; do \ + relfile=`echo "$$file" | sed 's|^.*/||'`; \ + echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \ + if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \ + then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi; \ + done; \ + else :; fi + @$(NORMAL_UNINSTALL) + @list='$(INFO_DEPS)'; \ + for file in $$list; do \ + relfile=`echo "$$file" | sed 's|^.*/||'`; \ + relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \ + (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \ + echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \ + rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \ + else :; fi); \ + done + +uninstall-pdf-am: + @$(NORMAL_UNINSTALL) + @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pdfdir)/$$f"; \ + done + +uninstall-ps-am: + @$(NORMAL_UNINSTALL) + @list='$(PSS)'; test -n "$(psdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \ + rm -f "$(DESTDIR)$(psdir)/$$f"; \ + done + +dist-info: $(INFO_DEPS) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + list='$(INFO_DEPS)'; \ + for base in $$list; do \ + case $$base in \ + $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ + esac; \ + if test -f $$base; then d=.; else d=$(srcdir); fi; \ + base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \ + for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \ + if test -f $$file; then \ + relfile=`expr "$$file" : "$$d/\(.*\)"`; \ + test -f "$(distdir)/$$relfile" || \ + cp -p $$file "$(distdir)/$$relfile"; \ + else :; fi; \ + done; \ + done + +mostlyclean-aminfo: + -rm -rf dvipng.aux dvipng.cp dvipng.cps dvipng.fn dvipng.ky dvipng.log \ + dvipng.pg dvipng.tmp dvipng.toc dvipng.tp dvipng.tps \ + dvipng.vr + +clean-aminfo: + -test -z "dvipng.dvi dvipng.pdf dvipng.ps dvipng.html" \ + || rm -rf dvipng.dvi dvipng.pdf dvipng.ps dvipng.html + +maintainer-clean-aminfo: + @list='$(INFO_DEPS)'; for i in $$list; do \ + i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \ + echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \ + rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \ + done +install-man1: $(dist_man1_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" + @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \ + { for i in $$list; do echo "$$i"; done; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ + fi; \ + done; \ + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ + done; } + +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + test -z "$$files" || { \ + echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @list='$(MANS)'; if test -n "$$list"; then \ + list=`for p in $$list; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ + if test -n "$$list" && \ + grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ + echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ + echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ + echo " typically \`make maintainer-clean' will remove them" >&2; \ + exit 1; \ + else :; fi; \ + else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-info +check-am: all-am +check: check-am +all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(MANS) +installdirs: + for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +@have_gif_FALSE@install-data-hook: +@have_gif_FALSE@uninstall-hook: +clean: clean-am + +clean-am: clean-aminfo clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-local + +dvi: dvi-am + +dvi-am: $(DVIS) + +html: html-am + +html-am: $(HTMLS) + +info: info-am + +info-am: $(INFO_DEPS) + +install-data-am: install-info-am install-man + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook +install-dvi: install-dvi-am + +install-dvi-am: $(DVIS) + @$(NORMAL_INSTALL) + test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)" + @list='$(DVIS)'; test -n "$(dvidir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \ + done +install-exec-am: + +install-html: install-html-am + +install-html-am: $(HTMLS) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" + @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \ + for p in $$list; do \ + if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ + $(am__strip_dir) \ + if test -d "$$d$$p"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ + $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ + echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ + else \ + list2="$$list2 $$d$$p"; \ + fi; \ + done; \ + test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ + done; } +install-info: install-info-am + +install-info-am: $(INFO_DEPS) + @$(NORMAL_INSTALL) + test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ + for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + esac; \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \ + for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \ + $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ + if test -f $$ifile; then \ + echo "$$ifile"; \ + else : ; fi; \ + done; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done + @$(POST_INSTALL) + @if (install-info --version && \ + install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ + list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ + for file in $$list; do \ + relfile=`echo "$$file" | sed 's|^.*/||'`; \ + echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\ + install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ + done; \ + else : ; fi +install-man: install-man1 + +install-pdf: install-pdf-am + +install-pdf-am: $(PDFS) + @$(NORMAL_INSTALL) + test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)" + @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done +install-ps: install-ps-am + +install-ps-am: $(PSS) + @$(NORMAL_INSTALL) + test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)" + @list='$(PSS)'; test -n "$(psdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-aminfo \ + maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-aminfo mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: $(PDFS) + +ps: ps-am + +ps-am: $(PSS) + +uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \ + uninstall-man uninstall-pdf-am uninstall-ps-am + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook +uninstall-man: uninstall-man1 + +.MAKE: install-am install-data-am install-strip uninstall-am + +.PHONY: all all-am check check-am clean clean-aminfo clean-generic \ + clean-libtool dist-info distclean distclean-generic \ + distclean-libtool distclean-local distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-data-hook install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-man1 \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-aminfo \ + maintainer-clean-generic mostlyclean mostlyclean-aminfo \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-dvi-am uninstall-hook \ + uninstall-html-am uninstall-info-am uninstall-man \ + uninstall-man1 uninstall-pdf-am uninstall-ps-am + +dvipng.1: dvipng.texi readme.texi + $(srcdir)/texi2pod.pl -D man $(srcdir)/dvipng.texi | \ + sed -es/@//g -es/previewlatex/preview-latex/g -es/{}//g > dvipng.pod + pod2man --center="User commands" --release="$(PACKAGE_STRING)" \ + dvipng.pod > dvipng.1 + rm dvipng.pod + +www: dvipng.texi $(dvipng_TEXINFOS) + $(mkdir_p) www + $(TEXI2HTML) -split chapter -nosec-nav -subdir html \ + -I $(srcdir) $(srcdir)/dvipng.texi + (cd html; for i in *; do \ + sed -e "s/Jan-A/Jan-\Å\;/g" $$i > ../www/$$i; \ + done) + cp www/dvipng.html www/index.html + rm -rf html + +dvipng_mono.html: dvipng.texi $(dvipng_TEXINFOS) + $(TEXI2HTML) --monolithic -nomenu -nosec_nav -o dvipng_mono.html \ + -I $(srcdir) $(srcdir)/dvipng.texi + +distclean-local: + rm -rf www + rm -f dvipng_mono.html + +@have_gif_TRUE@install-data-hook: +@have_gif_TRUE@ cd $(DESTDIR)$(man1dir) && \ +@have_gif_TRUE@ rm -f dvigif.1 && \ +@have_gif_TRUE@ $(LN_S) dvipng.1 dvigif.1 +@have_gif_TRUE@uninstall-hook: +@have_gif_TRUE@ rm -f $(DESTDIR)$(man1dir)/dvigif.1 + +am-local: ../INSTALL ../README RELEASE + +../INSTALL: install.texi + -$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -D rawfile --no-headers --no-validate --no-number-sections \ + -o $@ $< + +../README: readme.texi + -$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + -D rawfile --no-headers --no-validate --no-number-sections \ + -o $@ $< + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/Build/source/texk/dvipng/dvipng.1 b/Build/source/texk/dvipng/doc/dvipng.1 index 7bc3889a947..4cb549ebeb5 100644 --- a/Build/source/texk/dvipng/dvipng.1 +++ b/Build/source/texk/dvipng/doc/dvipng.1 @@ -132,7 +132,7 @@ .\" ======================================================================== .\" .IX Title "DVIPNG 1" -.TH DVIPNG 1 "2009-02-23" "dvipng 1.12" "User commands" +.TH DVIPNG 1 "2009-06-07" "dvipng 1.12" "User commands" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/Build/source/texk/dvipng/dvipng.help b/Build/source/texk/dvipng/doc/dvipng.help index ea97f477526..7beed0f8981 100644 --- a/Build/source/texk/dvipng/dvipng.help +++ b/Build/source/texk/dvipng/doc/dvipng.help @@ -1,4 +1,4 @@ -This is ./dvipng 1.11 Copyright 2002-2008 Jan-Ake Larsson +This is ./dvipng 1.12 Copyright 2002-2008 Jan-Ake Larsson Usage: ./dvipng [OPTION]... FILENAME[.dvi] Options are chosen to be similar to dvips' options where possible: diff --git a/Build/source/texk/dvipng/dvipng.info b/Build/source/texk/dvipng/doc/dvipng.info index 731713a7518..7e25b004068 100644 --- a/Build/source/texk/dvipng/dvipng.info +++ b/Build/source/texk/dvipng/doc/dvipng.info @@ -1,4 +1,4 @@ -This is dvipng.info, produced by makeinfo version 4.12 from dvipng.texi. +This is dvipng.info, produced by makeinfo version 4.13 from dvipng.texi. INFO-DIR-SECTION TeX START-INFO-DIR-ENTRY @@ -326,7 +326,7 @@ File: dvipng.info, Node: Option summary, Next: Option details, Up: Command-li Here is a handy summary of the options; it is printed out when you run dvipng with no arguments or with the standard `--help' option. - This is ./dvipng 1.11 Copyright 2002-2008 Jan-Ake Larsson + This is ./dvipng 1.12 Copyright 2002-2008 Jan-Ake Larsson Usage: ./dvipng [OPTION]... FILENAME[.dvi] Options are chosen to be similar to dvips' options where possible: diff --git a/Build/source/texk/dvipng/dvipng.texi b/Build/source/texk/dvipng/doc/dvipng.texi index 6b4c6a99df3..6b4c6a99df3 100644 --- a/Build/source/texk/dvipng/dvipng.texi +++ b/Build/source/texk/dvipng/doc/dvipng.texi diff --git a/Build/source/texk/dvipng/install.texi b/Build/source/texk/dvipng/doc/install.texi index c58f9af6013..c58f9af6013 100644 --- a/Build/source/texk/dvipng/install.texi +++ b/Build/source/texk/dvipng/doc/install.texi diff --git a/Build/source/texk/dvipng/macros.texi b/Build/source/texk/dvipng/doc/macros.texi index 3c90a59eb15..3c90a59eb15 100644 --- a/Build/source/texk/dvipng/macros.texi +++ b/Build/source/texk/dvipng/doc/macros.texi diff --git a/Build/source/texk/dvipng/readme.texi b/Build/source/texk/dvipng/doc/readme.texi index 378333376ae..378333376ae 100644 --- a/Build/source/texk/dvipng/readme.texi +++ b/Build/source/texk/dvipng/doc/readme.texi diff --git a/Build/source/texk/dvipng/texi2pod.pl b/Build/source/texk/dvipng/doc/texi2pod.pl index 9c6d8cc2792..9c6d8cc2792 100755 --- a/Build/source/texk/dvipng/texi2pod.pl +++ b/Build/source/texk/dvipng/doc/texi2pod.pl diff --git a/Build/source/texk/dvipng/draw.c b/Build/source/texk/dvipng/draw.c index 4e91c5f9e93..699fdae9f90 100644 --- a/Build/source/texk/dvipng/draw.c +++ b/Build/source/texk/dvipng/draw.c @@ -284,7 +284,7 @@ void EndVFMacro(void) } -void DrawPage(dviunits hoffset, dviunits voffset) +static void DrawPage(dviunits hoffset, dviunits voffset) /* To be used after having read BOP and will exit cleanly when * encountering EOP. */ diff --git a/Build/source/texk/dvipng/dvi.c b/Build/source/texk/dvipng/dvi.c index 24814dbc3e4..a6dfc20fc51 100644 --- a/Build/source/texk/dvipng/dvi.c +++ b/Build/source/texk/dvipng/dvi.c @@ -56,7 +56,7 @@ static unsigned char fgetc_follow(FILE* fp) return (unsigned char)got; } -void DVIInit(struct dvi_data* dvi) +static void DVIInit(struct dvi_data* dvi) { int k; unsigned char* pre; @@ -277,7 +277,7 @@ uint32_t CommandLength(unsigned char* command) return(length); } -void SkipPage(struct dvi_data* dvi) +static void SkipPage(struct dvi_data* dvi) { /* Skip present page */ unsigned char* command; @@ -307,7 +307,7 @@ void SkipPage(struct dvi_data* dvi) DEBUG_PRINT(DEBUG_DVI,("SKIP CMD:\t%s", dvi_commands[*command])); } -struct page_list* InitPage(struct dvi_data* dvi) +static struct page_list* InitPage(struct dvi_data* dvi) { /* Find page start, return pointer to page_list entry if found */ struct page_list* tpagelistp=NULL; @@ -428,7 +428,7 @@ struct page_list* FindPage(struct dvi_data* dvi, int32_t pagenum, bool abspage) } -void DelPageList(struct dvi_data* dvi) +static void DelPageList(struct dvi_data* dvi) { struct page_list* temp; diff --git a/Build/source/texk/dvipng/dvipng-1.12-patches b/Build/source/texk/dvipng/dvipng-1.12-patches index 084678b57ca..edb933c19e6 100644 --- a/Build/source/texk/dvipng/dvipng-1.12-patches +++ b/Build/source/texk/dvipng/dvipng-1.12-patches @@ -184,3 +184,356 @@ diff -ur dvipng-1.12/tfm.c dvipng/tfm.c # include <alloca.h> #endif +Index: color.c +=================================================================== +--- color.c (revision 13607) ++++ color.c (working copy) +@@ -54,7 +54,7 @@ + cstack[1].blue=0; + } + +-struct colorname * NewColor(char* prefix, int nprefix, ++static struct colorname * NewColor(char* prefix, int nprefix, + char* name, int nname, + char* model, int nmodel, + char* values, int nvalues) +@@ -92,7 +92,7 @@ + #define FINDPSNAMEEND(s,n) n=0; while(s<max && *s!='{') { s++; n++; } + #define BLANKCOMMAS(s) + +-struct colorname* LoadColornameFile(char* filename) ++static struct colorname* LoadColornameFile(char* filename) + { + struct colorname *list=NULL,*tmp=NULL; + char *filepath,*pos,*max; +@@ -165,7 +165,7 @@ + return(list); + } + +-void ClearXColorPrologue(void) ++static void ClearXColorPrologue(void) + { + struct colorname *next; + while (xcp) { +@@ -199,7 +199,7 @@ + strcpy(xcpname,name); + } + +-struct colorname* LoadXColorPrologue(void) ++static struct colorname* LoadXColorPrologue(void) + { + struct colorname *list=NULL,*tmp=NULL; + char *filepath,*pos,*max; +Index: draw.c +=================================================================== +--- draw.c (revision 13607) ++++ draw.c (working copy) +@@ -284,7 +284,7 @@ + } + + +-void DrawPage(dviunits hoffset, dviunits voffset) ++static void DrawPage(dviunits hoffset, dviunits voffset) + /* To be used after having read BOP and will exit cleanly when + * encountering EOP. + */ +Index: dvi.c +=================================================================== +--- dvi.c (revision 13607) ++++ dvi.c (working copy) +@@ -56,7 +56,7 @@ + return (unsigned char)got; + } + +-void DVIInit(struct dvi_data* dvi) ++static void DVIInit(struct dvi_data* dvi) + { + int k; + unsigned char* pre; +@@ -277,7 +277,7 @@ + return(length); + } + +-void SkipPage(struct dvi_data* dvi) ++static void SkipPage(struct dvi_data* dvi) + { + /* Skip present page */ + unsigned char* command; +@@ -307,7 +307,7 @@ + DEBUG_PRINT(DEBUG_DVI,("SKIP CMD:\t%s", dvi_commands[*command])); + } + +-struct page_list* InitPage(struct dvi_data* dvi) ++static struct page_list* InitPage(struct dvi_data* dvi) + { + /* Find page start, return pointer to page_list entry if found */ + struct page_list* tpagelistp=NULL; +@@ -428,7 +428,7 @@ + } + + +-void DelPageList(struct dvi_data* dvi) ++static void DelPageList(struct dvi_data* dvi) + { + struct page_list* temp; + +Index: enc.c +=================================================================== +--- enc.c (revision 13607) ++++ enc.c (working copy) +@@ -26,7 +26,7 @@ + + struct encoding* encodingp=NULL; + +-struct encoding* InitEncoding(char* encoding) ++static struct encoding* InitEncoding(char* encoding) + { + char *pos,*max,*buf,*enc_file; + int i; +Index: font.c +=================================================================== +--- font.c (revision 13607) ++++ font.c (working copy) +@@ -38,7 +38,7 @@ + } + + +-double ActualFactor(uint32_t unmodsize) ++static double ActualFactor(uint32_t unmodsize) + /* compute the actual size factor given the approximation */ + /* actually factor * 1000 */ + { +@@ -189,7 +189,7 @@ + } + + #ifdef HAVE_FT2_OR_LIBT1 +-char* kpse_find_t1_or_tt(char* filename) ++static char* kpse_find_t1_or_tt(char* filename) + { + char* filepath = kpse_find_file(filename, kpse_type1_format, false); + #ifdef HAVE_FT2 +@@ -200,7 +200,7 @@ + } + #endif + +-void FontFind(struct font_entry * tfontptr) ++static void FontFind(struct font_entry * tfontptr) + { + #ifdef HAVE_LIBKPATHSEA + kpse_glyph_file_type font_ret; +@@ -300,7 +300,7 @@ + } + + +-void DoneFont(struct font_entry *tfontp) ++static void DoneFont(struct font_entry *tfontp) + { + switch (tfontp->type) { + case FONT_TYPE_PK: +Index: fontmap.c +=================================================================== +--- fontmap.c (revision 13607) ++++ fontmap.c (working copy) +@@ -30,7 +30,7 @@ + #endif + static struct psfontmap *psfontmap=NULL; + +-char* newword(char** buffer, char* end) ++static char* newword(char** buffer, char* end) + { + char *word,*pos=*buffer; + +@@ -55,7 +55,7 @@ + return(word); + } + +-char* find_format(char* name) ++static char* find_format(char* name) + { + /* Cater for both new (first case) and old (second case) kpathsea */ + char* format = +@@ -134,7 +134,7 @@ + return(newentry); + } + +-struct psfontmap *SearchPSFontMap(char* fontname, ++static struct psfontmap *SearchPSFontMap(char* fontname, + struct filemmap* search_mmap) + { + static char *pos=NULL,*end=NULL; +@@ -196,7 +196,7 @@ + #endif + } + +-void ReadPSFontMap(struct psfontmap *entry) ++static void ReadPSFontMap(struct psfontmap *entry) + { + char *pos,*end,*psname; + int nameno = 0; +Index: ft.c +=================================================================== +--- ft.c (revision 13607) ++++ ft.c (working copy) +@@ -145,7 +145,7 @@ + } + + +-void UnLoadFT(struct char_entry *ptr) ++static void UnLoadFT(struct char_entry *ptr) + { + if (ptr->data!=NULL) + free(ptr->data); +Index: papersiz.c +=================================================================== +--- papersiz.c (revision 13607) ++++ papersiz.c (working copy) +@@ -36,7 +36,7 @@ + * Advance the passed pointer as well. + */ + +-int32_t myatodim(char ** p) ++static int32_t myatodim(char ** p) + { + double tmp; /* double accuracy is enough, I think */ + int i=0; +Index: pk.c +=================================================================== +--- pk.c (revision 13607) ++++ pk.c (working copy) +@@ -35,7 +35,7 @@ + int repeatcount; + int poshalf; + +-unsigned char getnyb(unsigned char** pos) ++static unsigned char getnyb(unsigned char** pos) + { + if (poshalf == 0) { + poshalf=1; +@@ -46,7 +46,7 @@ + } + } + +-uint32_t pk_packed_num(unsigned char** pos) ++static uint32_t pk_packed_num(unsigned char** pos) + { + register int i; + uint32_t j; +@@ -77,7 +77,7 @@ + } + } + +-unsigned char* skip_specials(unsigned char* pos) ++static unsigned char* skip_specials(unsigned char* pos) + { + uint32_t i; + +@@ -384,7 +384,7 @@ + } + } + +-void UnLoadPK(struct char_entry *ptr) ++static void UnLoadPK(struct char_entry *ptr) + { + if (ptr->data!=NULL) + free(ptr->data); +Index: ppagelist.c +=================================================================== +--- ppagelist.c (revision 13607) ++++ ppagelist.c (working copy) +@@ -107,7 +107,7 @@ + return(false); + } + +-void ListPage(int32_t pslow, int32_t pshigh) ++static void ListPage(int32_t pslow, int32_t pshigh) + { + register struct pp_list *pl; + +Index: set.c +=================================================================== +--- set.c (revision 13607) ++++ set.c (working copy) +@@ -84,7 +84,7 @@ + } + + +-void ChangeColor(gdImagePtr imagep,int x1,int y1, ++static void ChangeColor(gdImagePtr imagep,int x1,int y1, + int x2,int y2,int color1,int color2) + /* In the given rectangle, change color1 to color2 */ + { +Index: sfd.c +=================================================================== +--- sfd.c (revision 13607) ++++ sfd.c (working copy) +@@ -25,7 +25,7 @@ + #include "dvipng.h" + struct subfont* subfontp=NULL; + +-struct subfont* ReadSubfont(char* sfdname, char *infix) ++static struct subfont* ReadSubfont(char* sfdname, char *infix) + { + char *pos,*max,*sfdfile=NULL; + struct subfont* sfdp=NULL; +Index: special.c +=================================================================== +--- special.c (revision 13607) ++++ special.c (working copy) +@@ -40,7 +40,7 @@ + + struct pscode* psheaderp=NULL; /* static, DVI-specific header list */ + +-void PSCodeInit(struct pscode *entry, char *special) ++static void PSCodeInit(struct pscode *entry, char *special) + { + entry->next=NULL; + entry->special=special; +@@ -91,7 +91,7 @@ + } + } + +-void writepscode(struct pscode* pscodep, FILE* psstream) ++static void writepscode(struct pscode* pscodep, FILE* psstream) + { + while (pscodep!=NULL) { + if (pscodep->code!=NULL) { +@@ -131,7 +131,7 @@ + } + + +-gdImagePtr ++static gdImagePtr + ps2png(struct pscode* pscodep, char *device, int hresolution, int vresolution, + int llx, int lly, int urx, int ury, int bgred, int bggreen, int bgblue) + { +@@ -274,7 +274,7 @@ + return psimage; + } + +-gdImagePtr ++static gdImagePtr + rescale(gdImagePtr psimage, int pngwidth, int pngheight) + { + gdImagePtr scaledimage=psimage; +@@ -305,7 +305,7 @@ + return(scaledimage); + } + +-void newpsheader(char* special) { ++static void newpsheader(char* special) { + struct pscode* tmp; + char* txt; + +Index: t1.c +=================================================================== +--- t1.c (revision 13607) ++++ t1.c (working copy) +@@ -164,7 +164,7 @@ + } + + +-void UnLoadT1(struct char_entry *ptr) ++static void UnLoadT1(struct char_entry *ptr) + { + if (ptr->data!=NULL) + free(ptr->data); diff --git a/Build/source/texk/dvipng/dvipng.test b/Build/source/texk/dvipng/dvipng.test new file mode 100755 index 00000000000..743d2544441 --- /dev/null +++ b/Build/source/texk/dvipng/dvipng.test @@ -0,0 +1,17 @@ +#! /bin/sh + +TEXMFCNF=$(dirname $(kpsewhich texmf.cnf)) +TEXFONTMAPS=$(dirname $(dirname $(kpsewhich psfonts.map)))// +ENCFONTS=$(dirname $(dirname $(kpsewhich 8r.enc)))// +TEXMFMAIN=$(kpsewhich --expand-var='$TEXMFMAIN') +TEXMFDIST=$(kpsewhich --expand-var='$TEXMFDIST') +TEXMFLOCAL=$(kpsewhich --expand-var='$TEXMFLOCAL') + +export TEXMFCNF TEXFONTMAPS ENCFONTS TEXMFMAIN TEXMFDIST TEXMFLOCAL + +latex $srcdir/test_dvipng.tex || exit 77 + +./dvipng -T tight -strict test_dvipng || exit 1 + +echo View the result e.g. with xv test_dvipng\*.png + diff --git a/Build/source/texk/dvipng/enc.c b/Build/source/texk/dvipng/enc.c index 0ca2677c684..677799886b0 100644 --- a/Build/source/texk/dvipng/enc.c +++ b/Build/source/texk/dvipng/enc.c @@ -26,7 +26,7 @@ struct encoding* encodingp=NULL; -struct encoding* InitEncoding(char* encoding) +static struct encoding* InitEncoding(char* encoding) { char *pos,*max,*buf,*enc_file; int i; diff --git a/Build/source/texk/dvipng/font.c b/Build/source/texk/dvipng/font.c index b4fb9d82978..048395b8811 100644 --- a/Build/source/texk/dvipng/font.c +++ b/Build/source/texk/dvipng/font.c @@ -38,7 +38,7 @@ void CheckChecksum(uint32_t c1, uint32_t c2, const char* name) } -double ActualFactor(uint32_t unmodsize) +static double ActualFactor(uint32_t unmodsize) /* compute the actual size factor given the approximation */ /* actually factor * 1000 */ { @@ -189,7 +189,7 @@ void FontDef(unsigned char* command, void* parent) } #ifdef HAVE_FT2_OR_LIBT1 -char* kpse_find_t1_or_tt(char* filename) +static char* kpse_find_t1_or_tt(char* filename) { char* filepath = kpse_find_file(filename, kpse_type1_format, false); #ifdef HAVE_FT2 @@ -200,7 +200,7 @@ char* kpse_find_t1_or_tt(char* filename) } #endif -void FontFind(struct font_entry * tfontptr) +static void FontFind(struct font_entry * tfontptr) { #ifdef HAVE_LIBKPATHSEA kpse_glyph_file_type font_ret; @@ -300,7 +300,7 @@ void FontFind(struct font_entry * tfontptr) } -void DoneFont(struct font_entry *tfontp) +static void DoneFont(struct font_entry *tfontp) { switch (tfontp->type) { case FONT_TYPE_PK: diff --git a/Build/source/texk/dvipng/fontmap.c b/Build/source/texk/dvipng/fontmap.c index ea6e15c4009..fa88f7b5cab 100644 --- a/Build/source/texk/dvipng/fontmap.c +++ b/Build/source/texk/dvipng/fontmap.c @@ -30,7 +30,7 @@ static struct filemmap ttfont_mmap; #endif static struct psfontmap *psfontmap=NULL; -char* newword(char** buffer, char* end) +static char* newword(char** buffer, char* end) { char *word,*pos=*buffer; @@ -55,7 +55,7 @@ char* copyword(char* orig) return(word); } -char* find_format(char* name) +static char* find_format(char* name) { /* Cater for both new (first case) and old (second case) kpathsea */ char* format = @@ -134,7 +134,7 @@ struct psfontmap *NewPSFont(struct psfontmap* copyfrom) return(newentry); } -struct psfontmap *SearchPSFontMap(char* fontname, +static struct psfontmap *SearchPSFontMap(char* fontname, struct filemmap* search_mmap) { static char *pos=NULL,*end=NULL; @@ -196,7 +196,7 @@ void ClearPSFontMap(void) #endif } -void ReadPSFontMap(struct psfontmap *entry) +static void ReadPSFontMap(struct psfontmap *entry) { char *pos,*end,*psname; int nameno = 0; diff --git a/Build/source/texk/dvipng/ft.c b/Build/source/texk/dvipng/ft.c index dceff74bf75..10274a6db6a 100644 --- a/Build/source/texk/dvipng/ft.c +++ b/Build/source/texk/dvipng/ft.c @@ -145,7 +145,7 @@ bool InitFT(struct font_entry * tfontp) } -void UnLoadFT(struct char_entry *ptr) +static void UnLoadFT(struct char_entry *ptr) { if (ptr->data!=NULL) free(ptr->data); diff --git a/Build/source/texk/dvipng/help/Makefile.am b/Build/source/texk/dvipng/help/Makefile.am new file mode 100644 index 00000000000..f9291eeae98 --- /dev/null +++ b/Build/source/texk/dvipng/help/Makefile.am @@ -0,0 +1,26 @@ +## Makefile.am for the TeX Live subdirectory texk/dvipng/help/ +## +## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## You may freely use, modify and/or distribute this file. +## +DVIPNG_HELP = $(top_srcdir)/doc/dvipng.help + +all-local: help-stamp $(DVIPNG_HELP) + +# If dvipng.help is to be rebuilt, this would fail for a read-only source +# directory, but rebuilding dvipng.info would equally fail. +# Do not even try to rebuild dvipng.help if help-stamp is up to date. +$(DVIPNG_HELP): + $(MAKE) $(AM_MAKEFLAGS) help-stamp +help-stamp: ../dvipng$(EXEEXT) + -(cd .. && ./dvipng) | \ + sed -e's/ (dvipng) / /' -e's,/lt-dvipng ,/dvipng ,' \ + -e's,^This is .*/dvipng ,This is ./dvipng ,' \ + -e's,^Usage: .*/dvipng ,Usage: ./dvipng ,' > dvipng.tmp + ( test -r $(DVIPNG_HELP) && diff dvipng.tmp $(DVIPNG_HELP) ) \ + || cp dvipng.tmp $(DVIPNG_HELP) + rm -f dvipng.tmp + echo timestamp >$@ + +DISTCLEANFILES = help-stamp + diff --git a/Build/source/texk/dvipng/help/Makefile.in b/Build/source/texk/dvipng/help/Makefile.in new file mode 100644 index 00000000000..3345d0c36c1 --- /dev/null +++ b/Build/source/texk/dvipng/help/Makefile.in @@ -0,0 +1,409 @@ +# Makefile.in generated by automake 1.11 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = help +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \ + $(top_srcdir)/m4/makeinfo.m4 \ + $(top_srcdir)/../../m4/kpse-common.m4 \ + $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ + $(top_srcdir)/../../m4/kpse-gd-flags.m4 \ + $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ + $(top_srcdir)/../../m4/kpse-t1lib-flags.m4 \ + $(top_srcdir)/../../m4/kpse-warnings.m4 \ + $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ + $(top_srcdir)/../../m4/libtool.m4 \ + $(top_srcdir)/../../m4/ltoptions.m4 \ + $(top_srcdir)/../../m4/ltsugar.m4 \ + $(top_srcdir)/../../m4/ltversion.m4 \ + $(top_srcdir)/../../m4/lt~obsolete.m4 \ + $(top_srcdir)/ac/dvipng.ac $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/../../build-aux/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMTAR = @AMTAR@ +AM_MAKEINFOFLAGS = @AM_MAKEINFOFLAGS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ +FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ +FREETYPE2_LIBS = @FREETYPE2_LIBS@ +FT2_CONFIG = @FT2_CONFIG@ +GD_DEPEND = @GD_DEPEND@ +GD_INCLUDES = @GD_INCLUDES@ +GD_LIBS = @GD_LIBS@ +GREP = @GREP@ +GS = @GS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_INFO = @INSTALL_INFO@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KPATHSEA_DEPEND = @KPATHSEA_DEPEND@ +KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@ +KPATHSEA_LIBS = @KPATHSEA_LIBS@ +KPSEWHICH = @KPSEWHICH@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBPNG_DEPEND = @LIBPNG_DEPEND@ +LIBPNG_INCLUDES = @LIBPNG_INCLUDES@ +LIBPNG_LIBS = @LIBPNG_LIBS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POW_LIB = @POW_LIB@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +T1LIB_DEPEND = @T1LIB_DEPEND@ +T1LIB_INCLUDES = @T1LIB_INCLUDES@ +T1LIB_LIBS = @T1LIB_LIBS@ +VERSION = @VERSION@ +WARNING_CFLAGS = @WARNING_CFLAGS@ +ZLIB_DEPEND = @ZLIB_DEPEND@ +ZLIB_INCLUDES = @ZLIB_INCLUDES@ +ZLIB_LIBS = @ZLIB_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +DVIPNG_HELP = $(top_srcdir)/doc/dvipng.help +DISTCLEANFILES = help-stamp +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign help/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign help/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile all-local +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am all-local check check-am clean clean-generic \ + clean-libtool distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am + + +all-local: help-stamp $(DVIPNG_HELP) + +# If dvipng.help is to be rebuilt, this would fail for a read-only source +# directory, but rebuilding dvipng.info would equally fail. +# Do not even try to rebuild dvipng.help if help-stamp is up to date. +$(DVIPNG_HELP): + $(MAKE) $(AM_MAKEFLAGS) help-stamp +help-stamp: ../dvipng$(EXEEXT) + -(cd .. && ./dvipng) | \ + sed -e's/ (dvipng) / /' -e's,/lt-dvipng ,/dvipng ,' \ + -e's,^This is .*/dvipng ,This is ./dvipng ,' \ + -e's,^Usage: .*/dvipng ,Usage: ./dvipng ,' > dvipng.tmp + ( test -r $(DVIPNG_HELP) && diff dvipng.tmp $(DVIPNG_HELP) ) \ + || cp dvipng.tmp $(DVIPNG_HELP) + rm -f dvipng.tmp + echo timestamp >$@ + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/Build/source/texk/dvipng/m4/gs-device.m4 b/Build/source/texk/dvipng/m4/gs-device.m4 index f0ed6671a0f..dcd0dea1f8b 100644 --- a/Build/source/texk/dvipng/m4/gs-device.m4 +++ b/Build/source/texk/dvipng/m4/gs-device.m4 @@ -1,10 +1,10 @@ -# gs-device.m4 - Macro to check for GS devices. +# gs-device.m4 - Macros to check for GS devices. ## Copyright (C) 20xx Some One <someone@somewhere.net> ## Some affiliation ## -## Temporary notice: -## I extracted this macro from aclocal.m4 in the dvipng-1.9 distribution -## and renamed it in order not to violate the Autoconf (AC_) namespace. +## Notice: +## I extracted these macros from aclocal.m4 in the dvipng-1,12 distribution +## and renamed one in order not to violate the Autoconf (AC_) namespace. ## 26 Mar 2008, Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder gives unlimited @@ -13,17 +13,34 @@ # serial 1 -# xx_GS_HAS_DEVICE(DEVICE, ACTION-IF-FAILED) -# ------------------------------------------ -# Check if GS has the device DEVICE and execute the shell code -# ACTION-IF-FAILED if not. -AC_DEFUN([xx_GS_HAS_DEVICE], - [AC_MSG_CHECKING([whether $GS has the $1 device]) - if $GS -h | grep $1 >/dev/null; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - $2 - fi -])# xx_GS_HAS_DEVICE +# GS_CHECK_DEVICES +# ---------------- +# Check GS (ghostscript) devices. +AC_DEFUN([GS_CHECK_DEVICES], +[GS_WARN= +_GS_HAS_DEVICE([pngalpha], + [GS_WARN="Your EPS inclusions will be cropped to the + boundingbox, and rendered on an opaque background. + Upgrade GhostScript to avoid this." + _GS_HAS_DEVICE([png16m], + [GS_WARN="Your EPS inclusions may not work. + Upgrade/install GhostScript to avoid this."])]) +if test -n "$GS_WARN"; then + AC_MSG_WARN([$GS_WARN]) +fi +]) # GS_CHECK_DEVICES + +# _GS_HAS_DEVICE(DEVICE, ACTION-IF-FAILED) +# ---------------------------------------- +# Internal subroutine. Check if GS has the device DEVICE and +# execute the shell code ACTION-IF-FAILED if not. +m4_define([_GS_HAS_DEVICE], +[AC_MSG_CHECKING([whether $GS has the $1 device]) +if $GS -h | grep $1 >/dev/null; then + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) + $2 +fi +])# _GS_HAS_DEVICE diff --git a/Build/source/texk/dvipng/papersiz.c b/Build/source/texk/dvipng/papersiz.c index 317ea408036..749035df10e 100644 --- a/Build/source/texk/dvipng/papersiz.c +++ b/Build/source/texk/dvipng/papersiz.c @@ -36,7 +36,7 @@ const int32_t lengthsp[]={ 1L, 65536L, 65782L, * Advance the passed pointer as well. */ -int32_t myatodim(char ** p) +static int32_t myatodim(char ** p) { double tmp; /* double accuracy is enough, I think */ int i=0; diff --git a/Build/source/texk/dvipng/pk.c b/Build/source/texk/dvipng/pk.c index f2d6eb0a70a..2bb425987e8 100644 --- a/Build/source/texk/dvipng/pk.c +++ b/Build/source/texk/dvipng/pk.c @@ -35,7 +35,7 @@ unsigned char dyn_f; int repeatcount; int poshalf; -unsigned char getnyb(unsigned char** pos) +static unsigned char getnyb(unsigned char** pos) { if (poshalf == 0) { poshalf=1; @@ -46,7 +46,7 @@ unsigned char getnyb(unsigned char** pos) } } -uint32_t pk_packed_num(unsigned char** pos) +static uint32_t pk_packed_num(unsigned char** pos) { register int i; uint32_t j; @@ -77,7 +77,7 @@ uint32_t pk_packed_num(unsigned char** pos) } } -unsigned char* skip_specials(unsigned char* pos) +static unsigned char* skip_specials(unsigned char* pos) { uint32_t i; @@ -384,7 +384,7 @@ void InitPK(struct font_entry * tfontp) } } -void UnLoadPK(struct char_entry *ptr) +static void UnLoadPK(struct char_entry *ptr) { if (ptr->data!=NULL) free(ptr->data); diff --git a/Build/source/texk/dvipng/ppagelist.c b/Build/source/texk/dvipng/ppagelist.c index 4621bb7b7c8..deccb96a70f 100644 --- a/Build/source/texk/dvipng/ppagelist.c +++ b/Build/source/texk/dvipng/ppagelist.c @@ -107,7 +107,7 @@ bool InPageList(int32_t i) return(false); } -void ListPage(int32_t pslow, int32_t pshigh) +static void ListPage(int32_t pslow, int32_t pshigh) { register struct pp_list *pl; diff --git a/Build/source/texk/dvipng/set.c b/Build/source/texk/dvipng/set.c index 0a9693fed0c..050dbedea11 100644 --- a/Build/source/texk/dvipng/set.c +++ b/Build/source/texk/dvipng/set.c @@ -84,7 +84,7 @@ void CreateImage(pixels x_width,pixels y_width) } -void ChangeColor(gdImagePtr imagep,int x1,int y1, +static void ChangeColor(gdImagePtr imagep,int x1,int y1, int x2,int y2,int color1,int color2) /* In the given rectangle, change color1 to color2 */ { diff --git a/Build/source/texk/dvipng/sfd.c b/Build/source/texk/dvipng/sfd.c index ea9f2fe456d..08330e0dbc3 100644 --- a/Build/source/texk/dvipng/sfd.c +++ b/Build/source/texk/dvipng/sfd.c @@ -25,7 +25,7 @@ #include "dvipng.h" struct subfont* subfontp=NULL; -struct subfont* ReadSubfont(char* sfdname, char *infix) +static struct subfont* ReadSubfont(char* sfdname, char *infix) { char *pos,*max,*sfdfile=NULL; struct subfont* sfdp=NULL; diff --git a/Build/source/texk/dvipng/special.c b/Build/source/texk/dvipng/special.c index 45a97d92af1..d1f55b5b79e 100644 --- a/Build/source/texk/dvipng/special.c +++ b/Build/source/texk/dvipng/special.c @@ -40,7 +40,7 @@ struct pscode { struct pscode* psheaderp=NULL; /* static, DVI-specific header list */ -void PSCodeInit(struct pscode *entry, char *special) +static void PSCodeInit(struct pscode *entry, char *special) { entry->next=NULL; entry->special=special; @@ -91,7 +91,7 @@ void ClearPSHeaders(void) } } -void writepscode(struct pscode* pscodep, FILE* psstream) +static void writepscode(struct pscode* pscodep, FILE* psstream) { while (pscodep!=NULL) { if (pscodep->code!=NULL) { @@ -131,7 +131,7 @@ void writepscode(struct pscode* pscodep, FILE* psstream) } -gdImagePtr +static gdImagePtr ps2png(struct pscode* pscodep, char *device, int hresolution, int vresolution, int llx, int lly, int urx, int ury, int bgred, int bggreen, int bgblue) { @@ -274,7 +274,7 @@ ps2png(struct pscode* pscodep, char *device, int hresolution, int vresolution, return psimage; } -gdImagePtr +static gdImagePtr rescale(gdImagePtr psimage, int pngwidth, int pngheight) { gdImagePtr scaledimage=psimage; @@ -305,7 +305,7 @@ rescale(gdImagePtr psimage, int pngwidth, int pngheight) return(scaledimage); } -void newpsheader(char* special) { +static void newpsheader(char* special) { struct pscode* tmp; char* txt; diff --git a/Build/source/texk/dvipng/t1.c b/Build/source/texk/dvipng/t1.c index 85803a47bb2..84a15a5bf67 100644 --- a/Build/source/texk/dvipng/t1.c +++ b/Build/source/texk/dvipng/t1.c @@ -164,7 +164,7 @@ bool InitT1(struct font_entry * tfontp) } -void UnLoadT1(struct char_entry *ptr) +static void UnLoadT1(struct char_entry *ptr) { if (ptr->data!=NULL) free(ptr->data); |