diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-03-25 10:27:56 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-03-25 10:27:56 +0000 |
commit | 14fdf58582eb34614c899048041260830bf11319 (patch) | |
tree | 24c257e172a5759d4653886820e0debc19a79e75 /Build/source/texk/dvipdfmx | |
parent | 1d49a87a191295313dd1fdbce07dfb18ddd65bfc (diff) |
new build system: update
git-svn-id: svn://tug.org/texlive/trunk@12515 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfmx')
-rw-r--r-- | Build/source/texk/dvipdfmx/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/Makefile.in | 11 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/Makefile.in.orig | 616 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/aclocal.m4 | 5 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfmx/configure | 376 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/configure.ac | 97 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/configure.in | 149 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/data/Makefile.in | 6 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/m4/cho-kpse.m4 | 56 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/m4/cho-libs.m4 | 150 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/m4/maw-time.m4 | 34 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/src/Makefile.in | 6 |
12 files changed, 265 insertions, 1245 deletions
diff --git a/Build/source/texk/dvipdfmx/Makefile.am b/Build/source/texk/dvipdfmx/Makefile.am index ec345fbf3a2..eea486dc358 100644 --- a/Build/source/texk/dvipdfmx/Makefile.am +++ b/Build/source/texk/dvipdfmx/Makefile.am @@ -1,9 +1,9 @@ ## -ACLOCAL_AMFLAGS = -I ../../m4 -I m4 +ACLOCAL_AMFLAGS = -I ../../m4 SUBDIRS = data src -EXTRA_DIST = ChangeLog.TL m4/cho-kpse.m4 +EXTRA_DIST = ChangeLog.TL ## Eventually delete these files ## diff --git a/Build/source/texk/dvipdfmx/Makefile.in b/Build/source/texk/dvipdfmx/Makefile.in index 5623bfc3be0..97f37995235 100644 --- a/Build/source/texk/dvipdfmx/Makefile.in +++ b/Build/source/texk/dvipdfmx/Makefile.in @@ -46,8 +46,8 @@ DIST_COMMON = README $(am__configure_deps) \ ../../build-aux/ylwrap AUTHORS COPYING ChangeLog INSTALL NEWS \ TODO ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/cho-libs.m4 \ - $(top_srcdir)/m4/maw-time.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../../m4/cho-kpse.m4 \ + $(top_srcdir)/../../m4/cho-libs.m4 \ $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ @@ -57,7 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cho-libs.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/../../m4/maw-time.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -210,10 +210,9 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../m4 -I m4 +ACLOCAL_AMFLAGS = -I ../../m4 SUBDIRS = data src -EXTRA_DIST = ChangeLog.TL m4/cho-kpse.m4 Makefile.am.orig \ - configure.in.orig +EXTRA_DIST = ChangeLog.TL Makefile.am.orig configure.in.orig all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/Build/source/texk/dvipdfmx/Makefile.in.orig b/Build/source/texk/dvipdfmx/Makefile.in.orig deleted file mode 100644 index effbfe0fbf7..00000000000 --- a/Build/source/texk/dvipdfmx/Makefile.in.orig +++ /dev/null @@ -1,616 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@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 = : -subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - TODO compile depcomp install-sh missing mkinstalldirs -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/cho-kpse.m4 \ - $(top_srcdir)/m4/cho-libs.m4 $(top_srcdir)/m4/maw-time.m4 \ - $(top_srcdir)/../../libs/zlib/withenable.ac \ - $(top_srcdir)/../../libs/zlib/zlib.ac \ - $(top_srcdir)/../../libs/libpng/withenable.ac \ - $(top_srcdir)/../../libs/libpng/libpng.ac \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -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 -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -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@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LDLIBPNG = @LDLIBPNG@ -LDZLIB = @LDZLIB@ -LIBOBJS = @LIBOBJS@ -LIBPNGCPPFLAGS = @LIBPNGCPPFLAGS@ -LIBPNGDEP = @LIBPNGDEP@ -LIBS = @LIBS@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -OBJEXT = @OBJEXT@ -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@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ZLIBCPPFLAGS = @ZLIBCPPFLAGS@ -ZLIBDEP = @ZLIBDEP@ -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@ -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_alias = @build_alias@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -dvipdfmx_LDFLAGS = @dvipdfmx_LDFLAGS@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -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@ -SUBDIRS = data src -ACLOCAL_AMFLAGS = -I m4 -all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - -config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi - -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) - rm -f stamp-h1 - touch $@ - -distclean-hdr: - -rm -f config.h stamp-h1 - -# 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; \ - 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; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - 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; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - 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 || \ - tags="$$tags $$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; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - 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; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - test -d $(distdir) || mkdir $(distdir) - @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 $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ - done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile config.h -installdirs: installdirs-recursive -installdirs-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-recursive -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) - -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-recursive - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-hdr distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-exec-am: - -install-html: install-html-recursive - -install-info: install-info-recursive - -install-man: - -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-tags distcleancheck \ - distdir distuninstallcheck 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 installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am - - -# to regenerate autofiles, run -# aclocal -I m4 && autoconf && autoheader && automake -# tested with autoconf 2.62 and automake 1.10.1. --karl, 21apr08. -# 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/dvipdfmx/aclocal.m4 b/Build/source/texk/dvipdfmx/aclocal.m4 index 319a7083559..e7df4725fd5 100644 --- a/Build/source/texk/dvipdfmx/aclocal.m4 +++ b/Build/source/texk/dvipdfmx/aclocal.m4 @@ -904,8 +904,8 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([m4/cho-libs.m4]) -m4_include([m4/maw-time.m4]) +m4_include([../../m4/cho-kpse.m4]) +m4_include([../../m4/cho-libs.m4]) m4_include([../../m4/kpse-common.m4]) m4_include([../../m4/kpse-kpathsea-flags.m4]) m4_include([../../m4/kpse-libpng-flags.m4]) @@ -915,3 +915,4 @@ m4_include([../../m4/ltoptions.m4]) m4_include([../../m4/ltsugar.m4]) m4_include([../../m4/ltversion.m4]) m4_include([../../m4/lt~obsolete.m4]) +m4_include([../../m4/maw-time.m4]) diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure index 0f3985e37a1..5e40ad32785 100755 --- a/Build/source/texk/dvipdfmx/configure +++ b/Build/source/texk/dvipdfmx/configure @@ -14222,7 +14222,10 @@ $as_echo "$as_me: error: unknown endianness { $as_echo "$as_me:$LINENO: checking whether time.h defines timezone as an external variable" >&5 $as_echo_n "checking whether time.h defines timezone as an external variable... " >&6; } - cat >conftest.$ac_ext <<_ACEOF +if test "${maw_cv_ext_timezone+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -14258,51 +14261,61 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define HAVE_TIMEZONE 1 -_ACEOF - + maw_cv_ext_timezone=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + maw_cv_ext_timezone=no fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $maw_cv_ext_timezone" >&5 +$as_echo "$maw_cv_ext_timezone" >&6; } +if test "x$maw_cv_ext_timezone" = xyes; then -{ $as_echo "$as_me:$LINENO: checking whether struct tm has tm_gmtoff as a member" >&5 -$as_echo_n "checking whether struct tm has tm_gmtoff as a member... " >&6; } - cat >conftest.$ac_ext <<_ACEOF +cat >>confdefs.h <<\_ACEOF +#define HAVE_TIMEZONE 1 +_ACEOF + +fi + + +{ $as_echo "$as_me:$LINENO: checking for struct tm.tm_gmtoff" >&5 +$as_echo_n "checking for struct tm.tm_gmtoff... " >&6; } +if test "${ac_cv_member_struct_tm_tm_gmtoff+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <time.h> + int main () { -struct tm *tp; tp->tm_gmtoff; +static struct tm ac_aggr; +if (ac_aggr.tm_gmtoff) +return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -14311,28 +14324,71 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_tm_tm_gmtoff=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -cat >>confdefs.h <<\_ACEOF -#define HAVE_TM_GMTOFF 1 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <time.h> +int +main () +{ +static struct tm ac_aggr; +if (sizeof ac_aggr.tm_gmtoff) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_tm_tm_gmtoff=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + ac_cv_member_struct_tm_tm_gmtoff=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5 +$as_echo "$ac_cv_member_struct_tm_tm_gmtoff" >&6; } +if test "x$ac_cv_member_struct_tm_tm_gmtoff" = x""yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_TM_GMTOFF 1 +_ACEOF + fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext # The cast to long int works around a bug in the HP C Compiler @@ -17277,31 +17333,28 @@ ${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngcon fi -save_CPPFLAGS=$CPPFLAGS -save_LIBS=$LIBS +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS CPPFLAGS="$CPPFLAGS $KPATHSEA_INCLUDES" LIBS="$KPATHSEA_LIBS $LIBS" -{ $as_echo "$as_me:$LINENO: checking whether you have kpathsea headers and they know about the required file formats" >&5 -$as_echo_n "checking whether you have kpathsea headers and they know about the required file formats... " >&6; } -cat >conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:$LINENO: checking whether kpathsea declares the kpse_truetype_format" >&5 +$as_echo_n "checking whether kpathsea declares the kpse_truetype_format... " >&6; } +if test "${kpse_cv_have_truetype_format+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <stdio.h> -#include <kpathsea/tex-file.h> +#include <kpathsea/kpathsea.h> int main () { -kpse_tex_ps_header_format; - kpse_type1_format; - kpse_vf_format; - kpse_ofm_format; - kpse_ovf_format; - kpse_truetype_format; +kpse_truetype_format ; return 0; } @@ -17327,35 +17380,77 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - { $as_echo "$as_me:$LINENO: checking whether your kpathsea has xbasename" >&5 -$as_echo_n "checking whether your kpathsea has xbasename... " >&6; } - cat >conftest.$ac_ext <<_ACEOF + kpse_cv_have_truetype_format=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + kpse_cv_have_truetype_format=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $kpse_cv_have_truetype_format" >&5 +$as_echo "$kpse_cv_have_truetype_format" >&6; } +if test "x$kpse_cv_have_truetype_format" = xyes; then + : +else + { { $as_echo "$as_me:$LINENO: error: Required file formats not found in Kpathsea header files. + +This version of dvipdfmx requires that kpathsea and its headers be available. +If you are sure they are installed and in a standard place, maybe you need a +newer version of kpathsea? You also might try setting the environment +variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing +the file \"kpathsea/kpathsea.h\" + +" >&5 +$as_echo "$as_me: error: Required file formats not found in Kpathsea header files. + +This version of dvipdfmx requires that kpathsea and its headers be available. +If you are sure they are installed and in a standard place, maybe you need a +newer version of kpathsea? You also might try setting the environment +variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing +the file \"kpathsea/kpathsea.h\" + +" >&2;} + { (exit 1); exit 1; }; } +fi + +{ $as_echo "$as_me:$LINENO: checking whether xbasename is declared" >&5 +$as_echo_n "checking whether xbasename is declared... " >&6; } +if test "${ac_cv_have_decl_xbasename+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <stdio.h> -#include <kpathsea/lib.h> +#include <kpathsea/kpathsea.h> + int main () { -xbasename; +#ifndef xbasename + (void) xbasename; +#endif + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -17364,75 +17459,45 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_xbasename=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: This version of dvipdfmx requires xbasename() in kpathsea library." >&5 -$as_echo "$as_me: error: This version of dvipdfmx requires xbasename() in kpathsea library." >&2;} - { (exit 1); exit 1; }; } + ac_cv_have_decl_xbasename=no fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_xbasename" >&5 +$as_echo "$ac_cv_have_decl_xbasename" >&6; } +if test "x$ac_cv_have_decl_xbasename" = x""yes; then + : else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: Required file formats not found in Kpathsea header files. - -This version of dvipdfmx requires that kpathsea and its headers be available. -If you are sure they are installed and in a standard place, maybe you need a -newer version of kpathsea? You also might try setting the environment -variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing -the file \"kpathsea/tex-file.h\" - -" >&5 -$as_echo "$as_me: error: Required file formats not found in Kpathsea header files. - -This version of dvipdfmx requires that kpathsea and its headers be available. -If you are sure they are installed and in a standard place, maybe you need a -newer version of kpathsea? You also might try setting the environment -variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing -the file \"kpathsea/tex-file.h\" - -" >&2;} + { { $as_echo "$as_me:$LINENO: error: This version of dvipdfmx requires xbasename in libkpathsea." >&5 +$as_echo "$as_me: error: This version of dvipdfmx requires xbasename in libkpathsea." >&2;} { (exit 1); exit 1; }; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: checking whether kpathsea library supports TDS version 1.1 installation" >&5 -$as_echo_n "checking whether kpathsea library supports TDS version 1.1 installation... " >&6; } -cat >conftest.$ac_ext <<_ACEOF + +{ $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 + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <stdio.h> #include <kpathsea/kpathsea.h> -#include <kpathsea/tex-file.h> int main () { -kpse_enc_format; - kpse_cmap_format; - kpse_sfd_format; - kpse_opentype_format; +kpse_opentype_format ; return 0; } @@ -17458,6 +17523,21 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then + kpse_cv_have_opentype_format=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + kpse_cv_have_opentype_format=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $kpse_cv_have_opentype_format" >&5 +$as_echo "$kpse_cv_have_opentype_format" >&6; } +if test "x$kpse_cv_have_opentype_format" = xyes; then tds_version_11=yes cat >>confdefs.h <<\_ACEOF @@ -17465,19 +17545,15 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - tds_version_11=no - cat >>confdefs.h <<\_ACEOF + tds_version_11=no + cat >>confdefs.h <<\_ACEOF #define __TDS_VERSION__ 0x200302L _ACEOF fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: checking whether libkpathsea supports TDS version 1.1 installation" >&5 +$as_echo_n "checking whether libkpathsea supports TDS version 1.1 installation... " >&6; } { $as_echo "$as_me:$LINENO: result: $tds_version_11" >&5 $as_echo "$tds_version_11" >&6; } if test "x$tds_version_11" = xyes; then @@ -17489,12 +17565,16 @@ else fi -CPPFLAGS="$save_CPPFLAGS $ZLIB_INCLUDES" -LIBS="$ZLIB_LIBS $save_LIBS" + +CPPFLAGS="$CPPFLAGS $ZLIB_INCLUDES" +LIBS="$ZLIB_LIBS $LIBS" { $as_echo "$as_me:$LINENO: checking for zlib header files and library" >&5 $as_echo_n "checking for zlib header files and library... " >&6; } -cat >conftest.$ac_ext <<_ACEOF +if test "${cho_cv_have_zlib+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17530,8 +17610,21 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + cho_cv_have_zlib=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cho_cv_have_zlib=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $cho_cv_have_zlib" >&5 +$as_echo "$cho_cv_have_zlib" >&6; } +if test "x$cho_cv_have_zlib" = xyes; then for ac_func in compress do @@ -17742,24 +17835,19 @@ done fi done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + CPPFLAGS="$CPPFLAGS $LIBPNG_INCLUDES" LIBS="$LIBPNG_LIBS $LIBS" -{ $as_echo "$as_me:$LINENO: checking for png header files and library" >&5 -$as_echo_n "checking for png header files and library... " >&6; } -cat >conftest.$ac_ext <<_ACEOF +{ $as_echo "$as_me:$LINENO: checking for libpng header files and library" >&5 +$as_echo_n "checking for libpng header files and library... " >&6; } +if test "${cho_cv_have_png+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17795,8 +17883,21 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + cho_cv_have_png=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cho_cv_have_png=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $cho_cv_have_png" >&5 +$as_echo "$cho_cv_have_png" >&6; } +if test "x$cho_cv_have_png" = xyes; then for ac_func in png_get_image_width do @@ -17902,20 +18003,13 @@ _ACEOF fi done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -CPPFLAGS=$save_CPPFLAGS -LIBS=$save_LIBS + +CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + if test "x$enable_tetex_build" != xyes || test ! -d $srdir/../kpathsea; then _cppflags=$CPPFLAGS _ldflags=$LDFLAGS diff --git a/Build/source/texk/dvipdfmx/configure.ac b/Build/source/texk/dvipdfmx/configure.ac index 1b8b22b6ca4..0c90760c6b1 100644 --- a/Build/source/texk/dvipdfmx/configure.ac +++ b/Build/source/texk/dvipdfmx/configure.ac @@ -48,92 +48,23 @@ KPSE_KPATHSEA_FLAGS KPSE_ZLIB_FLAGS KPSE_LIBPNG_FLAGS -save_CPPFLAGS=$CPPFLAGS -save_LIBS=$LIBS - -CPPFLAGS="$CPPFLAGS $KPATHSEA_INCLUDES" -LIBS="$KPATHSEA_LIBS $LIBS" - -AC_MSG_CHECKING([whether you have kpathsea headers and they know about the required file formats]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> -#include <kpathsea/tex-file.h>]], - [[kpse_tex_ps_header_format; - kpse_type1_format; - kpse_vf_format; - kpse_ofm_format; - kpse_ovf_format; - kpse_truetype_format;]])], - [AC_MSG_RESULT([yes]) - AC_MSG_CHECKING([whether your kpathsea has xbasename]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> -#include <kpathsea/lib.h>]], - [[xbasename;]])], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]) - AC_MSG_ERROR([This version of ]Kpse_Package[ requires xbasename() in kpathsea library.])])], - [AC_MSG_RESULT([no]) - AC_MSG_ERROR([Required file formats not found in Kpathsea header files. - -This version of ]Kpse_Package[ requires that kpathsea and its headers be available. -If you are sure they are installed and in a standard place, maybe you need a -newer version of kpathsea? You also might try setting the environment -variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing -the file "kpathsea/tex-file.h" - -])]) - -AC_MSG_CHECKING([whether kpathsea library supports TDS version 1.1 installation]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> -#include <kpathsea/kpathsea.h> -#include <kpathsea/tex-file.h>]], - [[kpse_enc_format; - kpse_cmap_format; - kpse_sfd_format; - kpse_opentype_format;]])], - [tds_version_11=yes - AC_DEFINE([__TDS_VERSION__], [0x200406L], - [Define as 0x200406L if your libkpathsea supports enc formats, - or as 0x200302L otherwise.])], - [tds_version_11=no - AC_DEFINE([__TDS_VERSION__], [0x200302L])]) -AC_MSG_RESULT([$tds_version_11]) -AM_CONDITIONAL([TDS_VERSION_11], [test "x$tds_version_11" = xyes]) - -CPPFLAGS="$save_CPPFLAGS $ZLIB_INCLUDES" -LIBS="$ZLIB_LIBS $save_LIBS" - -AC_MSG_CHECKING([for zlib header files and library]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <zlib.h>]], - [[z_stream p;]])], - [AC_MSG_RESULT([yes]) - AC_CHECK_FUNCS([compress], - [AC_DEFINE([HAVE_ZLIB], 1, - [Define if you have zlib and its headers.]) - AC_CHECK_FUNCS([compress2], - [AC_DEFINE([HAVE_ZLIB_COMPRESS2], 1, - [Define if your zlib has the compress2 function.])])])], - [AC_MSG_RESULT([no])]) - -CPPFLAGS="$CPPFLAGS $LIBPNG_INCLUDES" -LIBS="$LIBPNG_LIBS $LIBS" - -AC_MSG_CHECKING([for png header files and library]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <png.h>]], - [[png_infop p;]])], - [AC_MSG_RESULT([yes]) - AC_CHECK_FUNCS([png_get_image_width], - [AC_DEFINE([HAVE_LIBPNG], 1, - [Define if you have libpng and its headers.])])], - [AC_MSG_RESULT([no])]) - -CPPFLAGS=$save_CPPFLAGS -LIBS=$save_LIBS - -dnl We do not provide the configure option '--enable-tetex-build, but may +KPSE_ADD_FLAGS([kpathsea]) +CHO_CHECK_KPSE_SUPPORT([dvipdfmx]) +CHO_CHECK_KPSE_TDS_VERSION + +KPSE_ADD_FLAGS([zlib]) +CHO_CHECK_ZLIB + +KPSE_ADD_FLAGS([libpng]) +CHO_CHECK_LIBPNG + +KPSE_RESTORE_FLAGS + +dnl We do not provide the configure option '--enable-tetex-build', but may dnl inherit enable_tetex_build when part of a teTeX / TeX Live installation. dnl If not, check for libpaper. if test "x$enable_tetex_build" != xyes || test ! -d $srdir/../kpathsea; then - CHO_HAS_LIBPAPER + CHO_CHECK_LIBPAPER fi AC_CONFIG_FILES([Makefile data/Makefile src/Makefile]) diff --git a/Build/source/texk/dvipdfmx/configure.in b/Build/source/texk/dvipdfmx/configure.in deleted file mode 100644 index b7d3b21514f..00000000000 --- a/Build/source/texk/dvipdfmx/configure.in +++ /dev/null @@ -1,149 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(src/dvipdfmx.c) -AM_INIT_AUTOMAKE(dvipdfmx, 20080607) -AM_CONFIG_HEADER(config.h) -AM_MAINTAINER_MODE - -dnl Checks for programs. -AC_PROG_CC -AM_PROG_CC_C_O -AM_PROG_CC_C_O -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET - -AC_SYS_LARGEFILE -AC_FUNC_FSEEKO - -# Building inside teTeX or TeX Live? -AC_ARG_ENABLE(tetex-build, [ --enable-tetex-build build as part of a teTeX installation]) - - -dnl Check for kpathsea library. (required) -if test "x$enable_tetex_build" = xyes; then - # In teTeX and TeX Live, LDFLAGS is passed by texk/Makefile and - # reserved for the user. Therefore we need another variable for the - # loader flags to find the local kpathsea. We use dvipdfmx_LDFLAGS - # since Automake already sets that up in the link command. - dvipdfmx_LDFLAGS= - AC_SUBST(dvipdfmx_LDFLAGS) - - if test ! -d $srcdir/../../texk/kpathsea; then - AC_MSG_ERROR([ -========================================= - -You specified --enable-tetex-build, but I can't find the kpathsea -directory. I expected it to be in $srcdir/../../texk/kpathsea. - -=========================================]) - fi - CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/../../texk -I\$(top_srcdir)/../../texk" - dvipdfmx_LDFLAGS="-L\$(top_builddir)/../../texk/kpathsea/.libs" - - AM_CONDITIONAL(TDS_VERSION_11, true) - AC_DEFINE([__TDS_VERSION__], 0x200406L) -else - dnl Don't bother going further if we don't have kpse installed. - AC_ARG_WITH(kpathsea, - [ --with-kpathsea=DIR use kpathsea include/library files from DIR], [ - if test -d "$withval"; then - CPPFLAGS="$CPPFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib" - fi - ], [ - if test -d "$prefix"; then - CPPFLAGS="$CPPFLAGS -I$prefix/include" - LDFLAGS="$LDFLAGS -L$prefix/lib" - else - CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include" - LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" - fi - ]) - - AC_CHECK_LIB(kpathsea, kpse_find_file, [LIBS="-lkpathsea $LIBS"], - AC_MSG_ERROR([kpathsea library not found -This version of dvipdfmx requires the kpathsea library and its headers. If -you know where it is you might try setting the LDFLAGS environment variable -with -L pointing to the directory containing libkpathsea.a. - ]) - ) - - dnl Check kpathsea support for required formats and funcs. - CHO_CHECK_KPSE_SUPPORT([dvipdfmx]) - - dnl Check for TDS version kpathsea library supports. - CHO_CHECK_KPSE_TDS_VERSION -fi - - -dnl Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS(unistd.h) -AC_CHECK_HEADERS(stdint.h inttypes.h sys/types.h) - -dnl Checks for library functions. -AC_FUNC_MEMCMP -AC_CHECK_FUNCS(open close system getenv mkstemp basename) - -dnl Checks for typedefs, structures, and compiler characteristics. -MAW_EXT_TIMEZONE -MAW_TZ_HAS_TM_GMTOFF - -AC_C_CONST -AC_C_INLINE -AC_TYPE_SIZE_T -AC_STRUCT_TM -AC_STRUCT_TIMEZONE -AC_C_BIGENDIAN - -AC_CHECK_SIZEOF(char) -AC_CHECK_SIZEOF(short) -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(long) - - -dnl Check for additional libraries. -if test "x$enable_tetex_build" = xyes; then - # Get these common libraries from the sources, too. - # Seems like it would be simpler to treat kpathsea this way too, but - # we're just starting from what lcdf-typetools did. - sinclude(../../libs/zlib/withenable.ac) - sinclude(../../libs/zlib/zlib.ac) - - sinclude(../../libs/libpng/withenable.ac) - sinclude(../../libs/libpng/libpng.ac) - - # yes, we have zlib and png. - AC_DEFINE(HAVE_ZLIB) - AC_DEFINE(HAVE_LIBPNG) - - # You must define HAVE_ZLIB_COMPRESS2 to enable '-z' option for controlling - # zlib compression level, but zlib.ac included above does not do this test. - # We assume zlib always has compress2() here although that's not always true. - AC_DEFINE([HAVE_ZLIB_COMPRESS2], 1) - - # tetex/tex live build; this always has kpathsea, xbasename, etc., - # as we're building from current sources. Do this stuff at the end so - # other configure tests don't try to link with kpathsea (which doesn't - # exist at configure time). - LIBS="-lkpathsea -lm $LIBS" - AC_MSG_NOTICE([tetex build enabled, LIBS now: $LIBS]) -else - CHO_HAS_LIBPAPER - CHO_HAS_ZLIB - CHO_HAS_LIBPNG - -dnl these variables are defined in the tetex case and used in src/Makefile.am. -dnl just let them be empty. - AC_SUBST(LIBPNGCPPFLAGS) - AC_SUBST(LDLIBPNG) - AC_SUBST(LIBPNGDEP) - AC_SUBST(ZLIBCPPFLAGS) - AC_SUBST(LDZLIB) - AC_SUBST(ZLIBDEP) - AC_SUBST(dvipdfmx_LDFLAGS) -fi - -AC_CONFIG_FILES([Makefile data/Makefile src/Makefile]) -AC_OUTPUT - diff --git a/Build/source/texk/dvipdfmx/data/Makefile.in b/Build/source/texk/dvipdfmx/data/Makefile.in index 191e5f04130..3db8104b65a 100644 --- a/Build/source/texk/dvipdfmx/data/Makefile.in +++ b/Build/source/texk/dvipdfmx/data/Makefile.in @@ -37,8 +37,8 @@ DIST_COMMON = $(dist_configdata_DATA) $(dist_glyphlistdata_DATA) \ $(dist_mapdata_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/cho-libs.m4 \ - $(top_srcdir)/m4/maw-time.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../../m4/cho-kpse.m4 \ + $(top_srcdir)/../../m4/cho-libs.m4 \ $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ @@ -48,7 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cho-libs.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/../../m4/maw-time.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/Build/source/texk/dvipdfmx/m4/cho-kpse.m4 b/Build/source/texk/dvipdfmx/m4/cho-kpse.m4 deleted file mode 100644 index 9668fa21d85..00000000000 --- a/Build/source/texk/dvipdfmx/m4/cho-kpse.m4 +++ /dev/null @@ -1,56 +0,0 @@ -# cho-kpse.m4 - kpathsea features -# Copyright (C) 1998 - 2008 Jin-Hwan Cho <chofchof@ktug.or.kr> -# -# This file is free software; the copyright holders -# give unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# CHO_CHECK_KPSE_SUPPORT(PACKAGE-NAME) -# ------------------------------------ -# Check for kpathsea features -AC_DEFUN([CHO_CHECK_KPSE_SUPPORT], -[AC_MSG_CHECKING([whether you have kpathsea headers and they know about the required file formats]) - AC_TRY_COMPILE( - [#include <stdio.h> -#include <kpathsea/kpathsea.h>], - [kpse_tex_ps_header_format; - kpse_type1_format; - kpse_vf_format; - kpse_ofm_format; - kpse_ovf_format; - kpse_truetype_format;], - [AC_MSG_RESULT(yes) - AC_CHECK_LIB([kpathsea], [xbasename], - [], - [AC_MSG_ERROR([This version of $1 requires xbasename() in kpathsea library.])])], - [AC_MSG_RESULT(no) - AC_MSG_ERROR([This version of $1 requires that kpathsea and its headers be installed. -If you are sure they are installed and in a standard place, maybe you need a -newer version of kpathsea? You also might try setting the environment -variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing -the file "tex-file.h"])]) -])# CHO_CHECK_KPSE_SUPPORT - -# CHO_CHECK_KPSE_TDS_VERSION -# -------------------------- -# Check for enc, cmap, sfd formats -AC_DEFUN([CHO_CHECK_KPSE_TDS_VERSION], -[AC_MSG_CHECKING([whether kpathsea library supports TDS version 1.1 installation]) - AC_TRY_COMPILE( - [#include <stdio.h> -#include <kpathsea/kpathsea.h> -#include <kpathsea/tex-file.h>], - [kpse_enc_format; - kpse_cmap_format; - kpse_sfd_format; - kpse_opentype_format;], - [AC_MSG_RESULT(yes) - AC_DEFINE([__TDS_VERSION__], [0x200406L], [Define if your libkpathsea supports enc formats]) - AM_CONDITIONAL([TDS_VERSION_11], [true])], - [AC_MSG_RESULT(no) - AC_DEFINE([__TDS_VERSION__], [0x200302L], [Define if your libkpathsea supports enc formats]) - AM_CONDITIONAL([TDS_VERSION_11], [false])]) -])# CHO_CHECK_KPSE_TDS_VERSION - diff --git a/Build/source/texk/dvipdfmx/m4/cho-libs.m4 b/Build/source/texk/dvipdfmx/m4/cho-libs.m4 deleted file mode 100644 index 3687a0bb9f5..00000000000 --- a/Build/source/texk/dvipdfmx/m4/cho-libs.m4 +++ /dev/null @@ -1,150 +0,0 @@ -# cho-libs.m4 - various libraries -# Copyright (C) 1998 - 2008 Jin-Hwan Cho <chofchof@ktug.or.kr> -# -# This file is free software; the copyright holders -# give unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# CHO_HAS_ZLIB -# ------------ -# Check for zlib -AC_DEFUN([CHO_HAS_ZLIB], -[_cppflags=$CPPFLAGS _ldflags=$LDFLAGS - AC_ARG_WITH([zlib], - [AS_HELP_STRING([--with-zlib=DIR], [use zlib include/library files from DIR])], - [if test -d "$withval"; then - CPPFLAGS="$CPPFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib" - fi]) - AC_MSG_CHECKING([for zlib header files]) - AC_TRY_COMPILE( - [#include <zlib.h>], - [z_stream p;], - [AC_MSG_RESULT(yes) - AC_SEARCH_LIBS([compress], [z], - [AC_DEFINE([HAVE_ZLIB], 1, [Define if you have zlib and its headers]) - AC_CHECK_LIB([z], [compress2], - [AC_DEFINE([HAVE_ZLIB_COMPRESS2], 1, [Define if your zlib has the compress2 function])])])], - [CPPFLAGS=$_cppflags - LDDFLAGS=$_ldflags - AC_MSG_RESULT(no)]) -])# CHO_HAS_ZLIB - -# CHO_HAS_LIBPNG -# -------------- -# Check for libpng -AC_DEFUN([CHO_HAS_LIBPNG], -[_cppflags=$CPPFLAGS _ldflags=$LDFLAGS - AC_ARG_WITH([png], - [AS_HELP_STRING([--with-png=DIR], [use png include/library files from DIR])], - [if test -d "$withval"; then - CPPFLAGS="$CPPFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib" - fi]) - AC_SEARCH_LIBS([pow], [m]) - AC_MSG_CHECKING([for png header files]) - AC_TRY_COMPILE( - [#include <png.h>], - [png_infop p;], - [AC_MSG_RESULT(yes) - AC_SEARCH_LIBS(png_get_image_width, png, - [AC_DEFINE([HAVE_LIBPNG], 1, [Define if you have libpng])], - [], [-lz])], - [CPPFLAGS=$_cppflags - LDDFLAGS=$_ldflags - AC_MSG_RESULT(no)]) -])# CHO_HAS_LIBPNG - -# CHO_HAS_LIBPAPER -# ---------------- -# Check for libpaper -AC_DEFUN([CHO_HAS_LIBPAPER], -[_cppflags=$CPPFLAGS _ldflags=$LDFLAGS - AC_ARG_WITH([paper], - [AS_HELP_STRING([--with-paper=DIR], [use paper include/library files from DIR])], - [if test -d "$withval"; then - CPPFLAGS="$CPPFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib" - fi]) - AC_MSG_CHECKING([for paper header files]) - AC_TRY_COMPILE( - [#include <paper.h>], - [struct paper *p;], - [AC_MSG_RESULT(yes) - AC_SEARCH_LIBS([paperpswidth], [paper], - [AC_DEFINE(HAVE_LIBPAPER, 1, [Define if you have libpaper])])], - [CPPFLAGS=$_cppflags - LDDFLAGS=$_ldflags - AC_MSG_RESULT(no)]) -])# CHO_HAS_LIBPAPER - -# CHO_HAS_LIBFONTCONFIG -# --------------------- -# Check for libfontconfig -AC_DEFUN([CHO_HAS_LIBFONTCONFIG], -[_cppflags=$CPPFLAGS _ldflags=$LDFLAGS - have_libfontconfig=no - AC_ARG_WITH([fontconfig], - [AS_HELP_STRING([--with-fontconfig=DIR],[use fontconfig include/library files from DIR])], - [if test -d "$withval"; then - CPPFLAGS="$CPPFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib" - FONTCONFIGLDFLAGS="-L$withval/lib" - fi]) - AC_MSG_CHECKING([for fontconfig header files]) - AC_TRY_COMPILE( - [#include <fontconfig/fontconfig.h>], - [FcObjectSet *os;], - [AC_MSG_RESULT(yes) - AC_SEARCH_LIBS([FcInit], [fontconfig], - [AC_DEFINE([HAVE_LIBFONTCONFIG], 1, [Define if you have libfontconfig]) - have_libfontconfig=yes])], - [CPPFLAGS=$_cppflags - LDDFLAGS=$_ldflags - AC_MSG_RESULT(no)]) -])# CHO_HAS_LIBFONTCONFIG - -# CHO_CHECK_LIBFREETYPE(PACKAGE-NAME) -# ----------------------------------- -# Check for libfreetype, fail with error if not found -AC_DEFUN([CHO_CHECK_LIBFREETYPE], -[_cppflags=$CPPFLAGS _ldflags=$LDFLAGS - using_installed_freetype=yes - AC_ARG_WITH(ft2lib, - [AS_HELP_STRING([--with-ft2lib=LIB], [use freetype2 library LIB])], - [if test x"$withval" != x; then - LIBS="$LIBS $withval" - using_installed_freetype=no - fi]) - AC_ARG_WITH([ft2include], - [AS_HELP_STRING([--with-ft2include=DIR], [use freetype2 include files from DIR])], - [if test -d "$withval"; then - CPPFLAGS="$CPPFLAGS -I$withval" - fi]) - AC_ARG_WITH([freetype2], - [AS_HELP_STRING([--with-freetype2=DIR], [use installed freetype2 include & lib files from DIR])], - [if test -d "$withval"; then - CPPFLAGS="$CPPFLAGS -I$withval/include/freetype2" - LDFLAGS="$LDFLAGS -L$withval/lib" - fi]) - AC_MSG_CHECKING([for freetype2 header files and library]) - AC_TRY_COMPILE( - [#include "ft2build.h" -#include FT_FREETYPE_H], - [FT_Face face;], - [AC_MSG_RESULT(yes) - if test x"$using_installed_freetype" = xyes; then - AC_SEARCH_LIBS([FT_Init_FreeType], [freetype], - [AC_DEFINE([HAVE_LIBFREETYPE], 1, [Define if you have libfreetype])]) - else - AC_DEFINE([HAVE_LIBFREETYPE], 1) - fi], - [AC_MSG_RESULT(no) - AC_MSG_ERROR([This version of $1 requires that FreeType2 and its headers be available. -You can use the --with-freetype2 option to indicate the location of the installed -freetype2, or --with-ft2lib and --with-ft2include to point to the libfreetype.a -library and the FreeType2 include files.])]) -])# CHO_CHECK_LIBFREETYPE - diff --git a/Build/source/texk/dvipdfmx/m4/maw-time.m4 b/Build/source/texk/dvipdfmx/m4/maw-time.m4 deleted file mode 100644 index 91a6c005ddd..00000000000 --- a/Build/source/texk/dvipdfmx/m4/maw-time.m4 +++ /dev/null @@ -1,34 +0,0 @@ -# maw-time.m4 - timezone tests -# Copyright (C) 1998 - 2009 Mark A. Wicks <mwicks@kettering.edu> -# Kettering University -# -# This file is free software; the copyright holder -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# MAW_EXT_TIMEZONE -# ---------------- -AC_DEFUN([MAW_EXT_TIMEZONE], -[AC_MSG_CHECKING([whether time.h defines timezone as an external variable]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], - [[-timezone;]])], - [AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_TIMEZONE], 1, - [Define if <time.h> has timezone as an external variable.])], - [AC_MSG_RESULT([no])]) -])# MAW_EXT_TIMEZONE - -# MAW_TM_HAS_TM_GMTOFF -# -------------------- -AC_DEFUN([MAW_TM_HAS_TM_GMTOFF], -[AC_MSG_CHECKING([whether struct tm has tm_gmtoff as a member]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], - [[struct tm *tp; tp->tm_gmtoff;]])], - [AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_TM_GMTOFF], 1, - [Define if struct tm has tm_gmtoff as a member.])], - [AC_MSG_RESULT([no])]) -])# MAW_TM_HAS_TM_GMTOFF - diff --git a/Build/source/texk/dvipdfmx/src/Makefile.in b/Build/source/texk/dvipdfmx/src/Makefile.in index 96903c9f7a9..ec4bf4e415a 100644 --- a/Build/source/texk/dvipdfmx/src/Makefile.in +++ b/Build/source/texk/dvipdfmx/src/Makefile.in @@ -36,8 +36,8 @@ bin_PROGRAMS = dvipdfmx$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/cho-libs.m4 \ - $(top_srcdir)/m4/maw-time.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../../m4/cho-kpse.m4 \ + $(top_srcdir)/../../m4/cho-libs.m4 \ $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ @@ -47,7 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cho-libs.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/../../m4/maw-time.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d |