diff options
Diffstat (limited to 'Build/source/texk/dvipdf-x')
-rw-r--r-- | Build/source/texk/dvipdf-x/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/dvipdf-x/Makefile.am | 10 | ||||
-rw-r--r-- | Build/source/texk/dvipdf-x/Makefile.in | 16 | ||||
-rw-r--r-- | Build/source/texk/dvipdf-x/ac/withenable.ac | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipdf-x/aclocal.m4 | 2 | ||||
-rwxr-xr-x | Build/source/texk/dvipdf-x/configure | 71 | ||||
-rw-r--r-- | Build/source/texk/dvipdf-x/configure.ac | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipdf-x/data/Makefile.in | 8 | ||||
-rw-r--r-- | Build/source/texk/dvipdf-x/man/Makefile.in | 8 |
9 files changed, 67 insertions, 61 deletions
diff --git a/Build/source/texk/dvipdf-x/ChangeLog b/Build/source/texk/dvipdf-x/ChangeLog index ee1cc462990..7c8bf9f7fd1 100644 --- a/Build/source/texk/dvipdf-x/ChangeLog +++ b/Build/source/texk/dvipdf-x/ChangeLog @@ -1,3 +1,8 @@ +2014-01-13 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am, /ac/withenable.ac, configure.ac: + Replace libs/paper => libs/libpaper. + 2013-10-24 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am, /ac/withenable.ac, configure.ac: Use libs/paper. diff --git a/Build/source/texk/dvipdf-x/Makefile.am b/Build/source/texk/dvipdf-x/Makefile.am index 4f641b79cc6..12dfbe50a6e 100644 --- a/Build/source/texk/dvipdf-x/Makefile.am +++ b/Build/source/texk/dvipdf-x/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/dvipdf-x/ ## -## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -28,7 +28,7 @@ bin_PROGRAMS += xdvipdfmx endif XDVIPDFMX EXTRA_PROGRAMS = dvipdfmx xdvipdfmx -AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PAPER_INCLUDES) +AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(LIBPAPER_INCLUDES) dvipdfmx_CPPFLAGS = -I$(srcdir)/src $(AM_CPPFLAGS) xdvipdfmx_CPPFLAGS = -DXETEX -I$(srcdir)/xsrc $(FREETYPE2_INCLUDES) $(AM_CPPFLAGS) AM_CFLAGS = $(WARNING_CFLAGS) @@ -36,7 +36,7 @@ AM_CFLAGS = $(WARNING_CFLAGS) nodist_dvipdfmx_SOURCES = $(common_sources) $(dvipdfmx_sources) nodist_xdvipdfmx_SOURCES = $(common_sources) $(xdvipdfmx_sources) -dvipdfmx_LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(PAPER_LIBS) +dvipdfmx_LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(LIBPAPER_LIBS) xdvipdfmx_LDADD = $(FREETYPE2_LIBS) $(dvipdfmx_LDADD) $(dvipdfmx_OBJECTS): config.force @@ -289,7 +289,7 @@ endif DVIPDFMX all-local: config.force -config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) $(PAPER_DEPEND) +config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) $(LIBPAPER_DEPEND) echo timestamp >config.force $(SHELL) ./config.status --recheck @@ -304,7 +304,7 @@ DISTCLEANFILES = config.force ## Rebuild libz @ZLIB_RULE@ ## Rebuild libpaper -@PAPER_RULE@ +@LIBPAPER_RULE@ ## Tests ## diff --git a/Build/source/texk/dvipdf-x/Makefile.in b/Build/source/texk/dvipdf-x/Makefile.in index e9a3a4d4820..5f17429d355 100644 --- a/Build/source/texk/dvipdf-x/Makefile.in +++ b/Build/source/texk/dvipdf-x/Makefile.in @@ -116,8 +116,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../../m4/kpse-libpaper-flags.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ - $(top_srcdir)/../../m4/kpse-paper-flags.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ @@ -616,6 +616,9 @@ KPATHSEA_LIBS = @KPATHSEA_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ +LIBPAPER_DEPEND = @LIBPAPER_DEPEND@ +LIBPAPER_INCLUDES = @LIBPAPER_INCLUDES@ +LIBPAPER_LIBS = @LIBPAPER_LIBS@ LIBPNG_DEPEND = @LIBPNG_DEPEND@ LIBPNG_INCLUDES = @LIBPNG_INCLUDES@ LIBPNG_LIBS = @LIBPNG_LIBS@ @@ -641,9 +644,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ -PAPER_DEPEND = @PAPER_DEPEND@ -PAPER_INCLUDES = @PAPER_INCLUDES@ -PAPER_LIBS = @PAPER_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ @@ -712,13 +712,13 @@ ACLOCAL_AMFLAGS = -I ../../m4 SUBDIRS = data $(am__append_1) bin_links = $(am__append_3) @DVIPDFMX_TRUE@@WIN32_FALSE@dist_bin_SCRIPTS = dvipdft -AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PAPER_INCLUDES) +AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(LIBPAPER_INCLUDES) dvipdfmx_CPPFLAGS = -I$(srcdir)/src $(AM_CPPFLAGS) xdvipdfmx_CPPFLAGS = -DXETEX -I$(srcdir)/xsrc $(FREETYPE2_INCLUDES) $(AM_CPPFLAGS) AM_CFLAGS = $(WARNING_CFLAGS) nodist_dvipdfmx_SOURCES = $(common_sources) $(dvipdfmx_sources) nodist_xdvipdfmx_SOURCES = $(common_sources) $(xdvipdfmx_sources) -dvipdfmx_LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(PAPER_LIBS) +dvipdfmx_LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(LIBPAPER_LIBS) xdvipdfmx_LDADD = $(FREETYPE2_LIBS) $(dvipdfmx_LDADD) common_sources = \ agl.c \ @@ -4074,7 +4074,7 @@ uninstall-hook: uninstall-bin-links all-local: config.force -config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) $(PAPER_DEPEND) +config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) $(LIBPAPER_DEPEND) echo timestamp >config.force $(SHELL) ./config.status --recheck @@ -4082,7 +4082,7 @@ config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEP @FREETYPE2_RULE@ @LIBPNG_RULE@ @ZLIB_RULE@ -@PAPER_RULE@ +@LIBPAPER_RULE@ # 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/dvipdf-x/ac/withenable.ac b/Build/source/texk/dvipdf-x/ac/withenable.ac index db76289b744..e13cd98744e 100644 --- a/Build/source/texk/dvipdf-x/ac/withenable.ac +++ b/Build/source/texk/dvipdf-x/ac/withenable.ac @@ -1,8 +1,8 @@ ## texk/dvipdf-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdf-x/ dnl -dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for dvipdf-x -KPSE_ENABLE_PROG([dvipdf-x], [kpathsea libpng paper], [disable]) +KPSE_ENABLE_PROG([dvipdf-x], [kpathsea libpng libpaper], [disable]) m4_include(kpse_TL[texk/dvipdf-x/ac/dvipdf-x.ac]) diff --git a/Build/source/texk/dvipdf-x/aclocal.m4 b/Build/source/texk/dvipdf-x/aclocal.m4 index 86c07f86da7..b7f1d346c2f 100644 --- a/Build/source/texk/dvipdf-x/aclocal.m4 +++ b/Build/source/texk/dvipdf-x/aclocal.m4 @@ -1223,8 +1223,8 @@ AC_SUBST([am__untar]) m4_include([../../m4/kpse-common.m4]) m4_include([../../m4/kpse-freetype2-flags.m4]) m4_include([../../m4/kpse-kpathsea-flags.m4]) +m4_include([../../m4/kpse-libpaper-flags.m4]) m4_include([../../m4/kpse-libpng-flags.m4]) -m4_include([../../m4/kpse-paper-flags.m4]) m4_include([../../m4/kpse-warnings.m4]) m4_include([../../m4/kpse-win32.m4]) m4_include([../../m4/kpse-zlib-flags.m4]) diff --git a/Build/source/texk/dvipdf-x/configure b/Build/source/texk/dvipdf-x/configure index 02e3fbc0f5b..f728c3066ac 100755 --- a/Build/source/texk/dvipdf-x/configure +++ b/Build/source/texk/dvipdf-x/configure @@ -643,10 +643,10 @@ WIN32_CALL_FALSE WIN32_CALL_TRUE WIN32_FALSE WIN32_TRUE -PAPER_RULE -PAPER_DEPEND -PAPER_LIBS -PAPER_INCLUDES +LIBPAPER_RULE +LIBPAPER_DEPEND +LIBPAPER_LIBS +LIBPAPER_INCLUDES FREETYPE2_RULE FREETYPE2_DEPEND FREETYPE2_LIBS @@ -808,9 +808,9 @@ with_zlib_includes with_zlib_libdir with_system_libpng with_system_freetype2 -with_system_paper -with_paper_includes -with_paper_libdir +with_system_libpaper +with_libpaper_includes +with_libpaper_libdir ' ac_precious_vars='build_alias host_alias @@ -1481,10 +1481,11 @@ Optional Packages: pkg-config) --with-system-freetype2 use installed freetype2 headers and library (requires freetype-config) - --with-system-paper use installed paper headers and library - --with-paper-includes=DIR - paper headers installed in DIR - --with-paper-libdir=DIR paper library installed in DIR + --with-system-libpaper use installed libpaper headers and library + --with-libpaper-includes=DIR + libpaper headers installed in DIR + --with-libpaper-libdir=DIR + libpaper library installed in DIR Some influential environment variables: CC C compiler command @@ -15624,39 +15625,39 @@ ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h: cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi -## _KPSE_LIB_FLAGS: Setup paper (-lpaper) flags +## _KPSE_LIB_FLAGS: Setup libpaper (-lpaper) flags -# Check whether --with-system-paper was given. -if test "${with_system_paper+set}" = set; then : - withval=$with_system_paper; +# Check whether --with-system-libpaper was given. +if test "${with_system_libpaper+set}" = set; then : + withval=$with_system_libpaper; fi -# Check whether --with-paper-includes was given. -if test "${with_paper_includes+set}" = set; then : - withval=$with_paper_includes; +# Check whether --with-libpaper-includes was given. +if test "${with_libpaper_includes+set}" = set; then : + withval=$with_libpaper_includes; fi -# Check whether --with-paper-libdir was given. -if test "${with_paper_libdir+set}" = set; then : - withval=$with_paper_libdir; +# Check whether --with-libpaper-libdir was given. +if test "${with_libpaper_libdir+set}" = set; then : + withval=$with_libpaper_libdir; fi -if test "x$with_system_paper" = xyes; then - if test "x$with_paper_includes" != x && test "x$with_paper_includes" != xyes; then - PAPER_INCLUDES="-I$with_paper_includes" +if test "x$with_system_libpaper" = xyes; then + if test "x$with_libpaper_includes" != x && test "x$with_libpaper_includes" != xyes; then + LIBPAPER_INCLUDES="-I$with_libpaper_includes" fi -PAPER_LIBS="-lpaper" -if test "x$with_paper_libdir" != x && test "x$with_paper_libdir" != xyes; then - PAPER_LIBS="-L$with_paper_libdir $PAPER_LIBS" +LIBPAPER_LIBS="-lpaper" +if test "x$with_libpaper_libdir" != x && test "x$with_libpaper_libdir" != xyes; then + LIBPAPER_LIBS="-L$with_libpaper_libdir $LIBPAPER_LIBS" fi else - PAPER_INCLUDES="-I$kpse_BLD/libs/paper/include" - PAPER_LIBS="$kpse_BLD/libs/paper/libpaper.a" - PAPER_DEPEND='${top_builddir}/../../libs/paper/libpaper.a' - PAPER_RULE='# Rebuild libpaper -$(PAPER_DEPEND): ${top_builddir}/../../libs/paper/include/paper.h - cd ${top_builddir}/../../libs/paper && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/paper/include/paper.h: - cd ${top_builddir}/../../libs/paper && $(MAKE) $(AM_MAKEFLAGS) rebuild' + LIBPAPER_INCLUDES="-I$kpse_BLD/libs/libpaper/include" + LIBPAPER_LIBS="$kpse_BLD/libs/libpaper/libpaper.a" + LIBPAPER_DEPEND='${top_builddir}/../../libs/libpaper/libpaper.a' + LIBPAPER_RULE='# Rebuild libpaper +$(LIBPAPER_DEPEND): ${top_builddir}/../../libs/libpaper/include/paper.h + cd ${top_builddir}/../../libs/libpaper && $(MAKE) $(AM_MAKEFLAGS) rebuild +${top_builddir}/../../libs/libpaper/include/paper.h: + cd ${top_builddir}/../../libs/libpaper && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/texk/dvipdf-x/configure.ac b/Build/source/texk/dvipdf-x/configure.ac index f82ccad6d78..341dc5dc9cb 100644 --- a/Build/source/texk/dvipdf-x/configure.ac +++ b/Build/source/texk/dvipdf-x/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009-2014 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, @@ -54,7 +54,7 @@ KPSE_KPATHSEA_FLAGS KPSE_ZLIB_FLAGS KPSE_LIBPNG_FLAGS KPSE_FREETYPE2_FLAGS -KPSE_PAPER_FLAGS +KPSE_LIBPAPER_FLAGS AC_DEFINE([HAVE_LIBPAPER], [1], [Define if you have libpaper.]) KPSE_SAVE_FLAGS diff --git a/Build/source/texk/dvipdf-x/data/Makefile.in b/Build/source/texk/dvipdf-x/data/Makefile.in index 45670fb17cd..c6508db09e3 100644 --- a/Build/source/texk/dvipdf-x/data/Makefile.in +++ b/Build/source/texk/dvipdf-x/data/Makefile.in @@ -86,8 +86,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../../m4/kpse-libpaper-flags.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ - $(top_srcdir)/../../m4/kpse-paper-flags.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ @@ -198,6 +198,9 @@ KPATHSEA_LIBS = @KPATHSEA_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ +LIBPAPER_DEPEND = @LIBPAPER_DEPEND@ +LIBPAPER_INCLUDES = @LIBPAPER_INCLUDES@ +LIBPAPER_LIBS = @LIBPAPER_LIBS@ LIBPNG_DEPEND = @LIBPNG_DEPEND@ LIBPNG_INCLUDES = @LIBPNG_INCLUDES@ LIBPNG_LIBS = @LIBPNG_LIBS@ @@ -223,9 +226,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ -PAPER_DEPEND = @PAPER_DEPEND@ -PAPER_INCLUDES = @PAPER_INCLUDES@ -PAPER_LIBS = @PAPER_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ diff --git a/Build/source/texk/dvipdf-x/man/Makefile.in b/Build/source/texk/dvipdf-x/man/Makefile.in index 03312d5b2d8..ecdded298b4 100644 --- a/Build/source/texk/dvipdf-x/man/Makefile.in +++ b/Build/source/texk/dvipdf-x/man/Makefile.in @@ -84,8 +84,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ + $(top_srcdir)/../../m4/kpse-libpaper-flags.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ - $(top_srcdir)/../../m4/kpse-paper-flags.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ @@ -195,6 +195,9 @@ KPATHSEA_LIBS = @KPATHSEA_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ +LIBPAPER_DEPEND = @LIBPAPER_DEPEND@ +LIBPAPER_INCLUDES = @LIBPAPER_INCLUDES@ +LIBPAPER_LIBS = @LIBPAPER_LIBS@ LIBPNG_DEPEND = @LIBPNG_DEPEND@ LIBPNG_INCLUDES = @LIBPNG_INCLUDES@ LIBPNG_LIBS = @LIBPNG_LIBS@ @@ -220,9 +223,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ -PAPER_DEPEND = @PAPER_DEPEND@ -PAPER_INCLUDES = @PAPER_INCLUDES@ -PAPER_LIBS = @PAPER_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ |