diff options
Diffstat (limited to 'Build/source/texk/dvipng')
-rw-r--r-- | Build/source/texk/dvipng/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipng/Makefile.am | 18 | ||||
-rw-r--r-- | Build/source/texk/dvipng/Makefile.in | 50 | ||||
-rw-r--r-- | Build/source/texk/dvipng/aclocal.m4 | 1 | ||||
-rwxr-xr-x | Build/source/texk/dvipng/configure | 61 | ||||
-rw-r--r-- | Build/source/texk/dvipng/configure.ac | 5 | ||||
-rw-r--r-- | Build/source/texk/dvipng/doc/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/texk/dvipng/help/Makefile.in | 1 |
8 files changed, 125 insertions, 16 deletions
diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog index 48dd9d4b67e..b64f53a8206 100644 --- a/Build/source/texk/dvipng/ChangeLog +++ b/Build/source/texk/dvipng/ChangeLog @@ -1,3 +1,7 @@ +2011-02-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am, configure.ac [WIN32]: Add dvigif.exe wrapper. + 2011-02-08 Peter Breitenlohner <peb@mppmu.mpg.de> * doc/Makefile.am: Use ../am/man1_links.am for manpage links. diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am index bcddc3e197d..30e3a63e91d 100644 --- a/Build/source/texk/dvipng/Makefile.am +++ b/Build/source/texk/dvipng/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/dvipng/ ## -## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## #************************************************************************ @@ -27,9 +27,9 @@ EXTRA_DIST += $(DVIPNG_TREE)-PATCHES dist-hook: rm -rf `find $(distdir) -name .svn` -INCLUDES = -I$(top_srcdir)/$(DVIPNG_TREE) -INCLUDES += $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(GD_INCLUDES) -INCLUDES += $(T1LIB_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) +AM_CPPFLAGS = -I$(top_srcdir)/$(DVIPNG_TREE) +AM_CPPFLAGS += $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(GD_INCLUDES) +AM_CPPFLAGS += $(T1LIB_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) DVIPS = dvips -Ppdf @@ -90,6 +90,12 @@ DISTCLEANFILES = config.force LDADD = $(KPATHSEA_LIBS) $(GD_LIBS) $(FREETYPE2_LIBS) LDADD += $(T1LIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) +dvigif_CPPFLAGS = -DEXEPROG=\"dvipng.exe\" + +dvigif_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c + +dvigif_LDADD = + ## Rebuild libkpathsea @KPATHSEA_RULE@ ## Rebuild libfreetype @@ -104,12 +110,16 @@ LDADD += $(T1LIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) @ZLIB_RULE@ if have_gif +if WIN32 +bin_PROGRAMS += dvigif +else !WIN32 install-exec-hook: cd $(DESTDIR)$(bindir) && \ rm -f dvigif$(EXEEXT) && \ $(LN_S) dvipng$(EXEEXT) dvigif$(EXEEXT) uninstall-hook: rm -f $(DESTDIR)$(bindir)/dvigif$(EXEEXT) +endif !WIN32 endif have_gif TESTS = dvipng.test diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in index e1053a24715..31bc72e0d94 100644 --- a/Build/source/texk/dvipng/Makefile.in +++ b/Build/source/texk/dvipng/Makefile.in @@ -34,7 +34,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = dvipng$(EXEEXT) +bin_PROGRAMS = dvipng$(EXEEXT) $(am__EXEEXT_1) @have_t1_TRUE@am__append_1 = \ @have_t1_TRUE@ $(DVIPNG_TREE)/t1.c @@ -47,6 +47,7 @@ bin_PROGRAMS = dvipng$(EXEEXT) @have_ft2_or_t1_TRUE@ $(DVIPNG_TREE)/fontmap.c \ @have_ft2_or_t1_TRUE@ $(DVIPNG_TREE)/tfm.c +@WIN32_TRUE@@have_gif_TRUE@am__append_4 = dvigif subdir = . DIST_COMMON = $(am__configure_deps) \ $(srcdir)/../../build-aux/config.guess \ @@ -71,6 +72,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.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-win32.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltoptions.m4 \ @@ -86,8 +88,12 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +@WIN32_TRUE@@have_gif_TRUE@am__EXEEXT_1 = dvigif$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) +am_dvigif_OBJECTS = dvigif-callexe.$(OBJEXT) +dvigif_OBJECTS = $(am_dvigif_OBJECTS) +dvigif_DEPENDENCIES = @have_t1_TRUE@am__objects_1 = t1.$(OBJEXT) @have_ft2_TRUE@am__objects_2 = ft.$(OBJEXT) sfd.$(OBJEXT) @have_ft2_or_t1_TRUE@am__objects_3 = enc.$(OBJEXT) fontmap.$(OBJEXT) \ @@ -116,8 +122,8 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(nodist_dvipng_SOURCES) -DIST_SOURCES = +SOURCES = $(dvigif_SOURCES) $(nodist_dvipng_SOURCES) +DIST_SOURCES = $(dvigif_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -323,7 +329,7 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -I m4 EXTRA_DIST = $(DVIPNG_TREE) $(DVIPNG_TREE)-PATCHES dvipng.test \ dvipng-test.dvi -INCLUDES = -I$(top_srcdir)/$(DVIPNG_TREE) $(KPATHSEA_INCLUDES) \ +AM_CPPFLAGS = -I$(top_srcdir)/$(DVIPNG_TREE) $(KPATHSEA_INCLUDES) \ $(FREETYPE2_INCLUDES) $(GD_INCLUDES) $(T1LIB_INCLUDES) \ $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) @@ -347,6 +353,9 @@ dvipng_dependencies = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) \ DISTCLEANFILES = config.force LDADD = $(KPATHSEA_LIBS) $(GD_LIBS) $(FREETYPE2_LIBS) $(T1LIB_LIBS) \ $(LIBPNG_LIBS) $(ZLIB_LIBS) +dvigif_CPPFLAGS = -DEXEPROG=\"dvipng.exe\" +dvigif_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c +dvigif_LDADD = TESTS = dvipng.test CLEANFILES = missfont.log test_dvipng.aux test_dvipng.dvi test_dvipng.log test_dvipng*.png all: config.h @@ -448,6 +457,9 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list +dvigif$(EXEEXT): $(dvigif_OBJECTS) $(dvigif_DEPENDENCIES) + @rm -f dvigif$(EXEEXT) + $(LINK) $(dvigif_OBJECTS) $(dvigif_LDADD) $(LIBS) dvipng$(EXEEXT): $(dvipng_OBJECTS) $(dvipng_DEPENDENCIES) @rm -f dvipng$(EXEEXT) $(LINK) $(dvipng_OBJECTS) $(dvipng_LDADD) $(LIBS) @@ -461,6 +473,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/draw.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvi.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvigif-callexe.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvipng.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font.Po@am__quote@ @@ -498,6 +511,20 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +dvigif-callexe.o: $(srcdir)/../texlive/w32_wrapper/callexe.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvigif_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dvigif-callexe.o -MD -MP -MF $(DEPDIR)/dvigif-callexe.Tpo -c -o dvigif-callexe.o `test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(srcdir)/../texlive/w32_wrapper/callexe.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/dvigif-callexe.Tpo $(DEPDIR)/dvigif-callexe.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../texlive/w32_wrapper/callexe.c' object='dvigif-callexe.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvigif_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dvigif-callexe.o `test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(srcdir)/../texlive/w32_wrapper/callexe.c + +dvigif-callexe.obj: $(srcdir)/../texlive/w32_wrapper/callexe.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvigif_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dvigif-callexe.obj -MD -MP -MF $(DEPDIR)/dvigif-callexe.Tpo -c -o dvigif-callexe.obj `if test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../texlive/w32_wrapper/callexe.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/dvigif-callexe.Tpo $(DEPDIR)/dvigif-callexe.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/../texlive/w32_wrapper/callexe.c' object='dvigif-callexe.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvigif_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dvigif-callexe.obj `if test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../texlive/w32_wrapper/callexe.c'; fi` + color.o: $(DVIPNG_TREE)/color.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT color.o -MD -MP -MF $(DEPDIR)/color.Tpo -c -o color.o `test -f '$(DVIPNG_TREE)/color.c' || echo '$(srcdir)/'`$(DVIPNG_TREE)/color.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/color.Tpo $(DEPDIR)/color.Po @@ -1200,7 +1227,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." +@WIN32_TRUE@install-exec-hook: @have_gif_FALSE@install-exec-hook: +@WIN32_TRUE@uninstall-hook: @have_gif_FALSE@uninstall-hook: clean: clean-recursive @@ -1318,13 +1347,12 @@ config.force: $(dvipng_dependencies) @T1LIB_RULE@ @LIBPNG_RULE@ @ZLIB_RULE@ - -@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@uninstall-hook: -@have_gif_TRUE@ rm -f $(DESTDIR)$(bindir)/dvigif$(EXEEXT) +@WIN32_FALSE@@have_gif_TRUE@install-exec-hook: +@WIN32_FALSE@@have_gif_TRUE@ cd $(DESTDIR)$(bindir) && \ +@WIN32_FALSE@@have_gif_TRUE@ rm -f dvigif$(EXEEXT) && \ +@WIN32_FALSE@@have_gif_TRUE@ $(LN_S) dvipng$(EXEEXT) dvigif$(EXEEXT) +@WIN32_FALSE@@have_gif_TRUE@uninstall-hook: +@WIN32_FALSE@@have_gif_TRUE@ rm -f $(DESTDIR)$(bindir)/dvigif$(EXEEXT) # 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/aclocal.m4 b/Build/source/texk/dvipng/aclocal.m4 index 1e4dcc17fc8..75b85225d42 100644 --- a/Build/source/texk/dvipng/aclocal.m4 +++ b/Build/source/texk/dvipng/aclocal.m4 @@ -998,6 +998,7 @@ 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-win32.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/configure b/Build/source/texk/dvipng/configure index 4f2357350f4..805d2afea93 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -616,6 +616,8 @@ ac_header_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS +WIN32_FALSE +WIN32_TRUE DVIPNG_TREE have_gif_FALSE have_gif_TRUE @@ -16474,6 +16476,61 @@ ac_config_headers="$ac_config_headers config.h" DVIPNG_TREE=dvipng-1.14 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5 +$as_echo_n "checking for native WIN32 or MINGW32... " >&6; } +if ${kpse_cv_have_win32+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef WIN32 + choke me +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __MINGW32__ + choke me +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have_win32=mingw32 +else + kpse_cv_have_win32=native +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + kpse_cv_have_win32=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5 +$as_echo "$kpse_cv_have_win32" >&6; } + + if test "x$kpse_cv_have_win32" != xno; then + WIN32_TRUE= + WIN32_FALSE='#' +else + WIN32_TRUE='#' + WIN32_FALSE= +fi + + ac_config_files="$ac_config_files Makefile help/Makefile doc/Makefile" @@ -16626,6 +16683,10 @@ if test -z "${have_gif_TRUE}" && test -z "${have_gif_FALSE}"; then as_fn_error $? "conditional \"have_gif\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then + as_fn_error $? "conditional \"WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac index 4ae238768d1..163997abb24 100644 --- a/Build/source/texk/dvipng/configure.ac +++ b/Build/source/texk/dvipng/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -194,6 +194,9 @@ AC_CONFIG_HEADERS([config.h]) AC_SUBST([DVIPNG_TREE], [dvipng-]dvipng_version) +KPSE_CHECK_WIN32 +AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno]) + AC_CONFIG_FILES([Makefile help/Makefile doc/Makefile]) AC_OUTPUT diff --git a/Build/source/texk/dvipng/doc/Makefile.in b/Build/source/texk/dvipng/doc/Makefile.in index 459616fcdab..67e1de7332d 100644 --- a/Build/source/texk/dvipng/doc/Makefile.in +++ b/Build/source/texk/dvipng/doc/Makefile.in @@ -48,6 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.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-win32.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltoptions.m4 \ diff --git a/Build/source/texk/dvipng/help/Makefile.in b/Build/source/texk/dvipng/help/Makefile.in index 33aec474c67..c6d9c86008a 100644 --- a/Build/source/texk/dvipng/help/Makefile.in +++ b/Build/source/texk/dvipng/help/Makefile.in @@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.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-win32.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ $(top_srcdir)/../../m4/libtool.m4 \ $(top_srcdir)/../../m4/ltoptions.m4 \ |