summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-10-25 08:53:49 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-10-25 08:53:49 +0000
commitedc3291a11eb0048e750f5861e9dd447a7e959a4 (patch)
treef00a5ea83a3c0b66c0cd4b7ef86f227c2562ecb0 /Build
parent68440ee4d894f56b49a82533ecb3f215964bc5b1 (diff)
Update libs/paper and use it for dvipdfm-x
git-svn-id: svn://tug.org/texlive/trunk@31994 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rwxr-xr-xBuild/source/configure4
-rwxr-xr-xBuild/source/libs/configure2
-rw-r--r--Build/source/libs/paper/Makefile.am5
-rw-r--r--Build/source/libs/paper/Makefile.in14
-rwxr-xr-xBuild/source/libs/paper/configure4
-rw-r--r--Build/source/libs/paper/configure.ac4
-rw-r--r--Build/source/libs/paper/include/Makefile.am4
-rw-r--r--Build/source/libs/paper/include/Makefile.in4
-rw-r--r--Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL51
-rw-r--r--Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconf.1.in29
-rwxr-xr-xBuild/source/libs/paper/paper.test14
-rw-r--r--Build/source/m4/kpse-libpaper.m449
-rw-r--r--Build/source/m4/kpse-paper-flags.m44
-rwxr-xr-xBuild/source/texk/configure2
-rw-r--r--Build/source/texk/dvipdf-x/ChangeLog4
-rw-r--r--Build/source/texk/dvipdf-x/Makefile.am4
-rw-r--r--Build/source/texk/dvipdf-x/Makefile.in6
-rw-r--r--Build/source/texk/dvipdf-x/ac/withenable.ac2
-rw-r--r--Build/source/texk/dvipdf-x/aclocal.m42
-rw-r--r--Build/source/texk/dvipdf-x/config.h.in2
-rwxr-xr-xBuild/source/texk/dvipdf-x/configure169
-rw-r--r--Build/source/texk/dvipdf-x/configure.ac8
-rw-r--r--Build/source/texk/dvipdf-x/data/Makefile.in3
-rw-r--r--Build/source/texk/dvipdf-x/man/Makefile.in3
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog4
-rw-r--r--Build/source/texk/dvipdfm-x/Makefile.am4
-rw-r--r--Build/source/texk/dvipdfm-x/Makefile.in6
-rw-r--r--Build/source/texk/dvipdfm-x/ac/withenable.ac2
-rw-r--r--Build/source/texk/dvipdfm-x/aclocal.m42
-rw-r--r--Build/source/texk/dvipdfm-x/config.h.in2
-rwxr-xr-xBuild/source/texk/dvipdfm-x/configure169
-rw-r--r--Build/source/texk/dvipdfm-x/configure.ac8
-rwxr-xr-xBuild/source/utils/configure2
33 files changed, 222 insertions, 370 deletions
diff --git a/Build/source/configure b/Build/source/configure
index 3bceda7e6f4..22cf24efd44 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -4926,6 +4926,7 @@ esac
test "x$enable_dvipdf_x" = xno || {
need_kpathsea=yes
need_libpng=yes
+ need_paper=yes
}
## Define configure options for dvipdf-x.
@@ -4975,6 +4976,7 @@ esac
test "x$enable_dvipdfm_x" = xno || {
need_kpathsea=yes
need_libpng=yes
+ need_paper=yes
}
## Define configure options for dvipdfm-x.
@@ -20276,7 +20278,7 @@ fi
if test "x$with_paper_includes" != x && test "x$with_paper_includes" != xyes; then
PAPER_INCLUDES="-I$with_paper_includes"
fi
-PAPER_LIBS="-lz"
+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"
fi
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 8d735c28a4f..e05fea1852a 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -4175,6 +4175,7 @@ esac
test "x$enable_dvipdf_x" = xno || {
need_kpathsea=yes
need_libpng=yes
+ need_paper=yes
}
## Define configure options for dvipdf-x.
@@ -4224,6 +4225,7 @@ esac
test "x$enable_dvipdfm_x" = xno || {
need_kpathsea=yes
need_libpng=yes
+ need_paper=yes
}
## Define configure options for dvipdfm-x.
diff --git a/Build/source/libs/paper/Makefile.am b/Build/source/libs/paper/Makefile.am
index 2ab956f7026..4cb4b0f0f46 100644
--- a/Build/source/libs/paper/Makefile.am
+++ b/Build/source/libs/paper/Makefile.am
@@ -37,11 +37,14 @@ bin_PROGRAMS = paperconf
paperconf_SOURCES = @PAPER_TREE@/src/paperconf.c
-man_MANS = @PAPER_TREE@/man/paperconf.1
+man_MANS = paperconf.1
## Tests
##
+if build
+dist_check_SCRIPTS = paper.test
TESTS = paper.test
+endif build
# Rebuild
rebuild_prereq =
diff --git a/Build/source/libs/paper/Makefile.in b/Build/source/libs/paper/Makefile.in
index 59517485d65..128cc25b799 100644
--- a/Build/source/libs/paper/Makefile.in
+++ b/Build/source/libs/paper/Makefile.in
@@ -82,6 +82,7 @@ DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(srcdir)/config.h.in \
$(top_srcdir)/libpaper-1.1.24+nmu2/man/paperconf.1.in \
+ $(am__dist_check_SCRIPTS_DIST) \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/test-driver ChangeLog \
../../build-aux/compile ../../build-aux/config.guess \
@@ -103,7 +104,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = libpaper-1.1.24+nmu2/man/paperconf.1
+CONFIG_CLEAN_FILES = paperconf.1
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
AR = ar
@@ -124,6 +125,7 @@ am_paperconf_OBJECTS = @PAPER_TREE@/src/paperconf.$(OBJEXT)
paperconf_OBJECTS = $(am_paperconf_OBJECTS)
paperconf_LDADD = $(LDADD)
paperconf_DEPENDENCIES = libpaper.a
+am__dist_check_SCRIPTS_DIST = paper.test
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -550,8 +552,9 @@ libpaper_a_SOURCES = \
LDADD = libpaper.a
paperconf_SOURCES = @PAPER_TREE@/src/paperconf.c
-man_MANS = @PAPER_TREE@/man/paperconf.1
-TESTS = paper.test
+man_MANS = paperconf.1
+@build_TRUE@dist_check_SCRIPTS = paper.test
+@build_TRUE@TESTS = paper.test
# Rebuild
rebuild_prereq =
@@ -613,7 +616,7 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
-libpaper-1.1.24+nmu2/man/paperconf.1: $(top_builddir)/config.status $(top_srcdir)/libpaper-1.1.24+nmu2/man/paperconf.1.in
+paperconf.1: $(top_builddir)/config.status $(top_srcdir)/libpaper-1.1.24+nmu2/man/paperconf.1.in
cd $(top_builddir) && $(SHELL) ./config.status $@
clean-noinstLIBRARIES:
@@ -996,7 +999,7 @@ check-TESTS:
log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
-recheck: all
+recheck: all $(dist_check_SCRIPTS)
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
@@ -1213,6 +1216,7 @@ distcleancheck: distclean
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) $(dist_check_SCRIPTS)
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-recursive
diff --git a/Build/source/libs/paper/configure b/Build/source/libs/paper/configure
index 1b3aa5cbf85..4e5a49b69d4 100755
--- a/Build/source/libs/paper/configure
+++ b/Build/source/libs/paper/configure
@@ -5236,7 +5236,7 @@ _ACEOF
PAPER_TREE=libpaper-1.1.24+nmu2
-ac_config_files="$ac_config_files Makefile include/Makefile libpaper-1.1.24+nmu2/man/paperconf.1"
+ac_config_files="$ac_config_files Makefile include/Makefile paperconf.1:libpaper-1.1.24+nmu2/man/paperconf.1.in"
cat >confcache <<\_ACEOF
@@ -5980,7 +5980,7 @@ do
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
- "libpaper-1.1.24+nmu2/man/paperconf.1") CONFIG_FILES="$CONFIG_FILES libpaper-1.1.24+nmu2/man/paperconf.1" ;;
+ "paperconf.1") CONFIG_FILES="$CONFIG_FILES paperconf.1:libpaper-1.1.24+nmu2/man/paperconf.1.in" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff --git a/Build/source/libs/paper/configure.ac b/Build/source/libs/paper/configure.ac
index 2de90609eda..f27d64afc50 100644
--- a/Build/source/libs/paper/configure.ac
+++ b/Build/source/libs/paper/configure.ac
@@ -41,6 +41,8 @@ AC_DEFINE_UNQUOTED([PAPERSIZEVAR], ["$PAPERSIZEVAR"],
AC_SUBST([PAPER_TREE], [libpaper-]paper_version)
-AC_CONFIG_FILES([Makefile include/Makefile libpaper-]paper_version[/man/paperconf.1])
+AC_CONFIG_FILES([Makefile
+ include/Makefile
+ paperconf.1:libpaper-]paper_version[/man/paperconf.1.in])
AC_OUTPUT
diff --git a/Build/source/libs/paper/include/Makefile.am b/Build/source/libs/paper/include/Makefile.am
index 87f357fb9e1..34576a7efa3 100644
--- a/Build/source/libs/paper/include/Makefile.am
+++ b/Build/source/libs/paper/include/Makefile.am
@@ -6,9 +6,9 @@
## gives unlimited permission to copy and/or distribute it,
## with or without modifications, as long as this notice is preserved.
##
-HARFBUZZ_LIB = $(top_srcdir)/$(HARFBUZZ_TREE)/lib
+PAPER_LIB = $(top_srcdir)/$(PAPER_TREE)/lib
-hdr_links = $(HARFBUZZ_LIB)/paper.h
+hdr_links = $(PAPER_LIB)/paper.h
include $(top_srcdir)/../../am/hdr_links.am
diff --git a/Build/source/libs/paper/include/Makefile.in b/Build/source/libs/paper/include/Makefile.in
index 1756c69a4ef..a44b1009b24 100644
--- a/Build/source/libs/paper/include/Makefile.in
+++ b/Build/source/libs/paper/include/Makefile.in
@@ -203,8 +203,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-HARFBUZZ_LIB = $(top_srcdir)/$(HARFBUZZ_TREE)/lib
-hdr_links = $(HARFBUZZ_LIB)/paper.h
+PAPER_LIB = $(top_srcdir)/$(PAPER_TREE)/lib
+hdr_links = $(PAPER_LIB)/paper.h
all: all-am
.SUFFIXES:
diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL
index c83c09fe847..601ccb9d252 100644
--- a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL
+++ b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL
@@ -118,3 +118,54 @@ diff -ur libpaper-1.1.24+nmu2.orig/lib/paper.c libpaper-1.1.24+nmu2/lib/paper.c
paperdef = defaultpapername();
paperstr = malloc((strlen(paperdef) + 1) * sizeof(char));
+diff -ur libpaper-1.1.24+nmu2.orig/man/paperconf.1.in libpaper-1.1.24+nmu2/man/paperconf.1.in
+--- libpaper-1.1.24+nmu2.orig/man/paperconf.1.in 2012-05-03 21:05:12.000000000 +0200
++++ libpaper-1.1.24+nmu2/man/paperconf.1.in 2013-10-25 08:27:54.783329615 +0200
+@@ -1,4 +1,4 @@
+-.TH PAPERCONF 1 "24 April 2001"
++.TH PAPERCONF 1 "25 October 2013"
+ .SH NAME
+ .B paperconf
+ \- print paper configuration information
+@@ -46,13 +46,10 @@
+ prints the name of the system- or user-specified paper, obtained by
+ looking in order at the
+ .B @PAPERSIZEVAR@
+-environment variable, at the contents of the file specified by the
+-.B @PAPERCONFVAR@
+-environment variable, at the contents of
+-.B @PAPERCONF@
++environment variable
+ or by using
+-.B letter
+-as a fall-back value if none of the other alternatives are successful.
++.B a4
++as a fall-back value.
+ By default, width and height of the paper are printed in PostScript points.
+ .SH OPTIONS
+ .TP
+@@ -98,21 +95,9 @@
+ .SH ENVIRONMENT
+ .TP 20
+ .B @PAPERSIZEVAR@
+-Paper size to use regardless of what the papersize file contains.
+-.TP 20
+-.B @PAPERCONFVAR@
+-Full path to a file containing the paper size to use.
+-.SH FILES
+-.TP 20
+-.B @PAPERCONF@
+-Contains the name of the system-wide default paper size to be used
+-if the
+-.B @PAPERSIZEVAR@
+-and
+-.B @PAPERCONFVAR@
+-variables are not set.
++Paper size to use.
+ .SH AUTHOR
+ Yves Arrouye <arrouye@debian.org>
+-.SH SEE ALSO
+-.BR papersize (5)
++
++Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
+
diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconf.1.in b/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconf.1.in
index 6be58eb6867..24cf8c13a85 100644
--- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconf.1.in
+++ b/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconf.1.in
@@ -1,4 +1,4 @@
-.TH PAPERCONF 1 "24 April 2001"
+.TH PAPERCONF 1 "25 October 2013"
.SH NAME
.B paperconf
\- print paper configuration information
@@ -46,13 +46,10 @@ When called without arguments,
prints the name of the system- or user-specified paper, obtained by
looking in order at the
.B @PAPERSIZEVAR@
-environment variable, at the contents of the file specified by the
-.B @PAPERCONFVAR@
-environment variable, at the contents of
-.B @PAPERCONF@
+environment variable
or by using
-.B letter
-as a fall-back value if none of the other alternatives are successful.
+.B a4
+as a fall-back value.
By default, width and height of the paper are printed in PostScript points.
.SH OPTIONS
.TP
@@ -98,21 +95,9 @@ Use inches as unit for paper size.
.SH ENVIRONMENT
.TP 20
.B @PAPERSIZEVAR@
-Paper size to use regardless of what the papersize file contains.
-.TP 20
-.B @PAPERCONFVAR@
-Full path to a file containing the paper size to use.
-.SH FILES
-.TP 20
-.B @PAPERCONF@
-Contains the name of the system-wide default paper size to be used
-if the
-.B @PAPERSIZEVAR@
-and
-.B @PAPERCONFVAR@
-variables are not set.
+Paper size to use.
.SH AUTHOR
Yves Arrouye <arrouye@debian.org>
-.SH SEE ALSO
-.BR papersize (5)
+
+Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
diff --git a/Build/source/libs/paper/paper.test b/Build/source/libs/paper/paper.test
index 54c4a2c82d2..d20ebbfec37 100755
--- a/Build/source/libs/paper/paper.test
+++ b/Build/source/libs/paper/paper.test
@@ -3,9 +3,17 @@
# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
-./paperconf || exit 1
+./paperconf -ans || exit 1
-PAPERSIZE=B3 ./paperconf || exit 1
+PAPERSIZE=B3 ./paperconf -nsc || exit 1
-PAPERSIZE=jisB3 ./paperconf || exit 1
+PAPERSIZE=jisB3 ./paperconf -nsm || exit 1
+
+PAPERSIZE=jisB5 ./paperconf -p lETTER -Nsi || exit 1
+
+./paperconf -dns
+
+./paperconf FOLIO -nw
+
+./paperconf legal -Nh
diff --git a/Build/source/m4/kpse-libpaper.m4 b/Build/source/m4/kpse-libpaper.m4
deleted file mode 100644
index 36703b446fc..00000000000
--- a/Build/source/m4/kpse-libpaper.m4
+++ /dev/null
@@ -1,49 +0,0 @@
-# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 1998-2008 Jin-Hwan Cho <chofchof@ktug.or.kr>
-# Copyright (C) 2008-2013 Peter Breitenlohner <tex-live@tug.org>
-#
-# 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.
-
-# KPSE_LIBPAPER
-# -------------
-# Provide the configure options '--with-paper-includes', '--with-paper-libdir'
-# and check for the ortional libpaper. If found define HAVE_LIBPAPER.
-# Set the make variables PAPER_INCLUDES and PAPER_LIBS to the CPPFLAGS and
-# LIBS required for the installed (system) library.
-AC_DEFUN([KPSE_LIBPAPER], [dnl
-AC_REQUIRE([KPSE_SAVE_FLAGS])
-AC_ARG_WITH([paper-includes],
- AS_HELP_STRING([--with-paper-includes=DIR],
- [paper headers installed in DIR]))[]dnl
-AC_ARG_WITH([paper-libdir],
- AS_HELP_STRING([--with-paper-libdir=DIR],
- [paper library installed in DIR]))[]dnl
-AS_CASE([$with_paper_includes],
- ["" | yes], [PAPER_INCLUDES=],
- [PAPER_INCLUDES="-I$with_paper_includes"])
-AS_CASE([$with_paper_libdir],
- ["" | yes], [PAPER_LIBS=],
- [PAPER_LIBS="-L$with_paper_libdir"])
-CPPFLAGS="$CPPFLAGS $PAPER_INCLUDES"
-LIBS="$LIBS $PAPER_LIBS"
-AC_MSG_CHECKING([for paper header files])
-result=no
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <paper.h>]],
- [[struct paper *p;]])],
- [AC_SEARCH_LIBS([paperpswidth], [paper])
- AS_CASE([$ac_cv_search_paperpswidth],
- [no], [:],
- ["none required"], [result=yes],
- [result=yes
- PAPER_LIBS="$PAPER_LIBS $ac_cv_search_paperpswidth"])])
-AS_CASE([$result],
- [no], [PAPER_INCLUDES= PAPER_LIBS=],
- [AC_DEFINE([HAVE_LIBPAPER], 1, [Define if you have libpaper])])
-AC_MSG_RESULT([$result])
-AC_SUBST([PAPER_INCLUDES])
-AC_SUBST([PAPER_LIBS])
-KPSE_RESTORE_FLAGS
-])# KPSE_LIBPAPER
-
diff --git a/Build/source/m4/kpse-paper-flags.m4 b/Build/source/m4/kpse-paper-flags.m4
index b29e2953815..c8e0e761e6e 100644
--- a/Build/source/m4/kpse-paper-flags.m4
+++ b/Build/source/m4/kpse-paper-flags.m4
@@ -15,7 +15,7 @@
AC_DEFUN([KPSE_PAPER_FLAGS], [dnl
AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
_KPSE_LIB_FLAGS([paper], [paper], [],
- [-IBLD/libs/paper/include], [BLD/libs/paper/libz.a], [],
+ [-IBLD/libs/paper/include], [BLD/libs/paper/libpaper.a], [],
[], [${top_builddir}/../../libs/paper/include/paper.h])[]dnl
]) # KPSE_PAPER_FLAGS
@@ -25,4 +25,4 @@ AC_DEFUN([KPSE_PAPER_OPTIONS], [_KPSE_LIB_OPTIONS([paper], [$1])])
# KPSE_PAPER_SYSTEM_FLAGS
# ----------------------
-AC_DEFUN([KPSE_PAPER_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([paper], [z])])
+AC_DEFUN([KPSE_PAPER_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([paper], [paper])])
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index af91b2504f4..428a8375e73 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -4189,6 +4189,7 @@ esac
test "x$enable_dvipdf_x" = xno || {
need_kpathsea=yes
need_libpng=yes
+ need_paper=yes
}
## Define configure options for dvipdf-x.
@@ -4238,6 +4239,7 @@ esac
test "x$enable_dvipdfm_x" = xno || {
need_kpathsea=yes
need_libpng=yes
+ need_paper=yes
}
## Define configure options for dvipdfm-x.
diff --git a/Build/source/texk/dvipdf-x/ChangeLog b/Build/source/texk/dvipdf-x/ChangeLog
index 94ceaf204b8..ee1cc462990 100644
--- a/Build/source/texk/dvipdf-x/ChangeLog
+++ b/Build/source/texk/dvipdf-x/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-24 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am, /ac/withenable.ac, configure.ac: Use libs/paper.
+
2013-09-30 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Drop the useless KPSE_LT_HACK.
diff --git a/Build/source/texk/dvipdf-x/Makefile.am b/Build/source/texk/dvipdf-x/Makefile.am
index 25f7c8543dc..4f641b79cc6 100644
--- a/Build/source/texk/dvipdf-x/Makefile.am
+++ b/Build/source/texk/dvipdf-x/Makefile.am
@@ -289,7 +289,7 @@ endif DVIPDFMX
all-local: config.force
-config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND)
+config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) $(PAPER_DEPEND)
echo timestamp >config.force
$(SHELL) ./config.status --recheck
@@ -303,6 +303,8 @@ DISTCLEANFILES = config.force
@LIBPNG_RULE@
## Rebuild libz
@ZLIB_RULE@
+## Rebuild libpaper
+@PAPER_RULE@
## Tests
##
diff --git a/Build/source/texk/dvipdf-x/Makefile.in b/Build/source/texk/dvipdf-x/Makefile.in
index 4e48af69b66..8d8f41040fb 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.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 \
@@ -641,6 +641,7 @@ 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@
@@ -4072,7 +4073,7 @@ uninstall-hook: uninstall-bin-links
all-local: config.force
-config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND)
+config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) $(PAPER_DEPEND)
echo timestamp >config.force
$(SHELL) ./config.status --recheck
@@ -4080,6 +4081,7 @@ config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEP
@FREETYPE2_RULE@
@LIBPNG_RULE@
@ZLIB_RULE@
+@PAPER_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 fddd09736ba..db76289b744 100644
--- a/Build/source/texk/dvipdf-x/ac/withenable.ac
+++ b/Build/source/texk/dvipdf-x/ac/withenable.ac
@@ -4,5 +4,5 @@ dnl Copyright (C) 2009-2013 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], [disable])
+KPSE_ENABLE_PROG([dvipdf-x], [kpathsea libpng paper], [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 c1337a226aa..41b28c9772f 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.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/config.h.in b/Build/source/texk/dvipdf-x/config.h.in
index 684bb4c43a0..f7d6d1ef177 100644
--- a/Build/source/texk/dvipdf-x/config.h.in
+++ b/Build/source/texk/dvipdf-x/config.h.in
@@ -44,7 +44,7 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-/* Define if you have libpaper */
+/* Define if you have libpaper. */
#undef HAVE_LIBPAPER
/* Define if you have libpng and its headers. */
diff --git a/Build/source/texk/dvipdf-x/configure b/Build/source/texk/dvipdf-x/configure
index 1c84299de82..f60679010ce 100755
--- a/Build/source/texk/dvipdf-x/configure
+++ b/Build/source/texk/dvipdf-x/configure
@@ -643,6 +643,8 @@ WIN32_CALL_FALSE
WIN32_CALL_TRUE
WIN32_FALSE
WIN32_TRUE
+PAPER_RULE
+PAPER_DEPEND
PAPER_LIBS
PAPER_INCLUDES
FREETYPE2_RULE
@@ -806,6 +808,7 @@ with_zlib_includes
with_zlib_libdir
with_system_libpng
with_system_freetype2
+with_system_paper
with_paper_includes
with_paper_libdir
'
@@ -1478,6 +1481,7 @@ 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
@@ -15620,6 +15624,44 @@ ${top_builddir}/../../libs/freetype2/ft2build.h:
cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
+## _KPSE_LIB_FLAGS: Setup paper (-lpaper) flags
+
+# Check whether --with-system-paper was given.
+if test "${with_system_paper+set}" = set; then :
+ withval=$with_system_paper;
+fi
+
+# Check whether --with-paper-includes was given.
+if test "${with_paper_includes+set}" = set; then :
+ withval=$with_paper_includes;
+fi
+
+# Check whether --with-paper-libdir was given.
+if test "${with_paper_libdir+set}" = set; then :
+ withval=$with_paper_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"
+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"
+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'
+fi
+
+
+$as_echo "#define HAVE_LIBPAPER 1" >>confdefs.h
+
kpse_save_CPPFLAGS=$CPPFLAGS
kpse_save_LIBS=$LIBS
@@ -15702,133 +15744,6 @@ $as_echo "#define HAVE_ZLIB_COMPRESS2 1" >>confdefs.h
$as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
-
-if test "x$enable_texlive_build" != xyes || test ! -d $srcdir/../kpathsea; then
-
-
-# Check whether --with-paper-includes was given.
-if test "${with_paper_includes+set}" = set; then :
- withval=$with_paper_includes;
-fi
-
-# Check whether --with-paper-libdir was given.
-if test "${with_paper_libdir+set}" = set; then :
- withval=$with_paper_libdir;
-fi
-case $with_paper_includes in #(
- "" | yes) :
- PAPER_INCLUDES= ;; #(
- *) :
- PAPER_INCLUDES="-I$with_paper_includes" ;;
-esac
-case $with_paper_libdir in #(
- "" | yes) :
- PAPER_LIBS= ;; #(
- *) :
- PAPER_LIBS="-L$with_paper_libdir" ;;
-esac
-CPPFLAGS="$CPPFLAGS $PAPER_INCLUDES"
-LIBS="$LIBS $PAPER_LIBS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for paper header files" >&5
-$as_echo_n "checking for paper header files... " >&6; }
-result=no
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <paper.h>
-int
-main ()
-{
-struct paper *p;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing paperpswidth" >&5
-$as_echo_n "checking for library containing paperpswidth... " >&6; }
-if ${ac_cv_search_paperpswidth+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char paperpswidth ();
-int
-main ()
-{
-return paperpswidth ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' paper; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_paperpswidth=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_paperpswidth+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_paperpswidth+:} false; then :
-
-else
- ac_cv_search_paperpswidth=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_paperpswidth" >&5
-$as_echo "$ac_cv_search_paperpswidth" >&6; }
-ac_res=$ac_cv_search_paperpswidth
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
- case $ac_cv_search_paperpswidth in #(
- no) :
- : ;; #(
- "none required") :
- result=yes ;; #(
- *) :
- result=yes
- PAPER_LIBS="$PAPER_LIBS $ac_cv_search_paperpswidth" ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-case $result in #(
- no) :
- PAPER_INCLUDES= PAPER_LIBS= ;; #(
- *) :
-
-$as_echo "#define HAVE_LIBPAPER 1" >>confdefs.h
- ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
-$as_echo "$result" >&6; }
-
-
-CPPFLAGS=$kpse_save_CPPFLAGS
-LIBS=$kpse_save_LIBS
-
-
-fi
-
{ $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 :
diff --git a/Build/source/texk/dvipdf-x/configure.ac b/Build/source/texk/dvipdf-x/configure.ac
index a481621cd3e..f82ccad6d78 100644
--- a/Build/source/texk/dvipdf-x/configure.ac
+++ b/Build/source/texk/dvipdf-x/configure.ac
@@ -54,6 +54,8 @@ KPSE_KPATHSEA_FLAGS
KPSE_ZLIB_FLAGS
KPSE_LIBPNG_FLAGS
KPSE_FREETYPE2_FLAGS
+KPSE_PAPER_FLAGS
+AC_DEFINE([HAVE_LIBPAPER], [1], [Define if you have libpaper.])
KPSE_SAVE_FLAGS
@@ -87,12 +89,6 @@ AC_DEFINE([HAVE_ZLIB], 1, [Define if you have zlib and its headers.])
AC_DEFINE([HAVE_ZLIB_COMPRESS2], 1, [Define if your zlib has the compress2 function.])
AC_DEFINE([HAVE_LIBPNG], 1, [Define if you have libpng and its headers.])
-dnl Check for additional libraries.
-
-if test "x$enable_texlive_build" != xyes || test ! -d $srcdir/../kpathsea; then
- KPSE_LIBPAPER
-fi
-
KPSE_WIN32_CALL
AM_CONDITIONAL([DVIPDFMX], [test "x$enable_dvipdf" != xno])
diff --git a/Build/source/texk/dvipdf-x/data/Makefile.in b/Build/source/texk/dvipdf-x/data/Makefile.in
index 49f81b59b2c..c6ac597ccf1 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.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 \
@@ -223,6 +223,7 @@ 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@
diff --git a/Build/source/texk/dvipdf-x/man/Makefile.in b/Build/source/texk/dvipdf-x/man/Makefile.in
index e3558f7e5c6..15f60db6c2c 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.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 \
@@ -220,6 +220,7 @@ 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@
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 671a60c7ecc..ded1af799bd 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-24 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am, /ac/withenable.ac, configure.ac: Use libs/paper.
+
2013-10-12 Khaled Hosny <khaledhosny@eglug.org>
* dvi.c, dvicodes.h: Rename XDVI_ID to XDV_ID.
diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am
index 007a076b288..87540d6e2a0 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.am
+++ b/Build/source/texk/dvipdfm-x/Makefile.am
@@ -250,7 +250,7 @@ endif DVIPDFMX
all-local: config.force
-config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND)
+config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) $(PAPER_DEPEND)
echo timestamp >config.force
$(SHELL) ./config.status --recheck
@@ -264,6 +264,8 @@ DISTCLEANFILES = config.force
@LIBPNG_RULE@
## Rebuild libz
@ZLIB_RULE@
+## Rebuild libpaper
+@PAPER_RULE@
## Tests
##
diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in
index 48beb03f7b0..f9b325a4cb4 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.in
+++ b/Build/source/texk/dvipdfm-x/Makefile.in
@@ -119,8 +119,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.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 \
@@ -566,6 +566,7 @@ 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@
@@ -2261,7 +2262,7 @@ uninstall-hook: uninstall-bin-links uninstall-man1-links
all-local: config.force
-config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND)
+config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) $(PAPER_DEPEND)
echo timestamp >config.force
$(SHELL) ./config.status --recheck
@@ -2269,6 +2270,7 @@ config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEP
@FREETYPE2_RULE@
@LIBPNG_RULE@
@ZLIB_RULE@
+@PAPER_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/dvipdfm-x/ac/withenable.ac b/Build/source/texk/dvipdfm-x/ac/withenable.ac
index 2db424cf72a..135f736d359 100644
--- a/Build/source/texk/dvipdfm-x/ac/withenable.ac
+++ b/Build/source/texk/dvipdfm-x/ac/withenable.ac
@@ -4,5 +4,5 @@ dnl Copyright (C) 2009-2013 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 dvipdfm-x
-KPSE_ENABLE_PROG([dvipdfm-x], [kpathsea libpng])
+KPSE_ENABLE_PROG([dvipdfm-x], [kpathsea libpng paper])
m4_include(kpse_TL[texk/dvipdfm-x/ac/dvipdfm-x.ac])
diff --git a/Build/source/texk/dvipdfm-x/aclocal.m4 b/Build/source/texk/dvipdfm-x/aclocal.m4
index c1337a226aa..41b28c9772f 100644
--- a/Build/source/texk/dvipdfm-x/aclocal.m4
+++ b/Build/source/texk/dvipdfm-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.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/dvipdfm-x/config.h.in b/Build/source/texk/dvipdfm-x/config.h.in
index 684bb4c43a0..f7d6d1ef177 100644
--- a/Build/source/texk/dvipdfm-x/config.h.in
+++ b/Build/source/texk/dvipdfm-x/config.h.in
@@ -44,7 +44,7 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-/* Define if you have libpaper */
+/* Define if you have libpaper. */
#undef HAVE_LIBPAPER
/* Define if you have libpng and its headers. */
diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index 4224a903c4b..578cf1f6874 100755
--- a/Build/source/texk/dvipdfm-x/configure
+++ b/Build/source/texk/dvipdfm-x/configure
@@ -643,6 +643,8 @@ WIN32_CALL_FALSE
WIN32_CALL_TRUE
WIN32_FALSE
WIN32_TRUE
+PAPER_RULE
+PAPER_DEPEND
PAPER_LIBS
PAPER_INCLUDES
FREETYPE2_RULE
@@ -806,6 +808,7 @@ with_zlib_includes
with_zlib_libdir
with_system_libpng
with_system_freetype2
+with_system_paper
with_paper_includes
with_paper_libdir
'
@@ -1479,6 +1482,7 @@ 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
@@ -15621,6 +15625,44 @@ ${top_builddir}/../../libs/freetype2/ft2build.h:
cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
+## _KPSE_LIB_FLAGS: Setup paper (-lpaper) flags
+
+# Check whether --with-system-paper was given.
+if test "${with_system_paper+set}" = set; then :
+ withval=$with_system_paper;
+fi
+
+# Check whether --with-paper-includes was given.
+if test "${with_paper_includes+set}" = set; then :
+ withval=$with_paper_includes;
+fi
+
+# Check whether --with-paper-libdir was given.
+if test "${with_paper_libdir+set}" = set; then :
+ withval=$with_paper_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"
+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"
+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'
+fi
+
+
+$as_echo "#define HAVE_LIBPAPER 1" >>confdefs.h
+
kpse_save_CPPFLAGS=$CPPFLAGS
kpse_save_LIBS=$LIBS
@@ -15703,133 +15745,6 @@ $as_echo "#define HAVE_ZLIB_COMPRESS2 1" >>confdefs.h
$as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
-
-if test "x$enable_texlive_build" != xyes || test ! -d $srcdir/../kpathsea; then
-
-
-# Check whether --with-paper-includes was given.
-if test "${with_paper_includes+set}" = set; then :
- withval=$with_paper_includes;
-fi
-
-# Check whether --with-paper-libdir was given.
-if test "${with_paper_libdir+set}" = set; then :
- withval=$with_paper_libdir;
-fi
-case $with_paper_includes in #(
- "" | yes) :
- PAPER_INCLUDES= ;; #(
- *) :
- PAPER_INCLUDES="-I$with_paper_includes" ;;
-esac
-case $with_paper_libdir in #(
- "" | yes) :
- PAPER_LIBS= ;; #(
- *) :
- PAPER_LIBS="-L$with_paper_libdir" ;;
-esac
-CPPFLAGS="$CPPFLAGS $PAPER_INCLUDES"
-LIBS="$LIBS $PAPER_LIBS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for paper header files" >&5
-$as_echo_n "checking for paper header files... " >&6; }
-result=no
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <paper.h>
-int
-main ()
-{
-struct paper *p;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing paperpswidth" >&5
-$as_echo_n "checking for library containing paperpswidth... " >&6; }
-if ${ac_cv_search_paperpswidth+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char paperpswidth ();
-int
-main ()
-{
-return paperpswidth ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' paper; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_paperpswidth=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_paperpswidth+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_paperpswidth+:} false; then :
-
-else
- ac_cv_search_paperpswidth=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_paperpswidth" >&5
-$as_echo "$ac_cv_search_paperpswidth" >&6; }
-ac_res=$ac_cv_search_paperpswidth
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
- case $ac_cv_search_paperpswidth in #(
- no) :
- : ;; #(
- "none required") :
- result=yes ;; #(
- *) :
- result=yes
- PAPER_LIBS="$PAPER_LIBS $ac_cv_search_paperpswidth" ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-case $result in #(
- no) :
- PAPER_INCLUDES= PAPER_LIBS= ;; #(
- *) :
-
-$as_echo "#define HAVE_LIBPAPER 1" >>confdefs.h
- ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
-$as_echo "$result" >&6; }
-
-
-CPPFLAGS=$kpse_save_CPPFLAGS
-LIBS=$kpse_save_LIBS
-
-
-fi
-
{ $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 :
diff --git a/Build/source/texk/dvipdfm-x/configure.ac b/Build/source/texk/dvipdfm-x/configure.ac
index af92b839442..c77902ca57a 100644
--- a/Build/source/texk/dvipdfm-x/configure.ac
+++ b/Build/source/texk/dvipdfm-x/configure.ac
@@ -54,6 +54,8 @@ KPSE_KPATHSEA_FLAGS
KPSE_ZLIB_FLAGS
KPSE_LIBPNG_FLAGS
KPSE_FREETYPE2_FLAGS
+KPSE_PAPER_FLAGS
+AC_DEFINE([HAVE_LIBPAPER], [1], [Define if you have libpaper.])
KPSE_SAVE_FLAGS
@@ -87,12 +89,6 @@ AC_DEFINE([HAVE_ZLIB], 1, [Define if you have zlib and its headers.])
AC_DEFINE([HAVE_ZLIB_COMPRESS2], 1, [Define if your zlib has the compress2 function.])
AC_DEFINE([HAVE_LIBPNG], 1, [Define if you have libpng and its headers.])
-dnl Check for additional libraries.
-
-if test "x$enable_texlive_build" != xyes || test ! -d $srcdir/../kpathsea; then
- KPSE_LIBPAPER
-fi
-
KPSE_WIN32_CALL
AM_CONDITIONAL([DVIPDFMX], [test "x$enable_dvipdfmx" != xno])
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index d9bf8cd4ef3..731266b0185 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -4170,6 +4170,7 @@ esac
test "x$enable_dvipdf_x" = xno || {
need_kpathsea=yes
need_libpng=yes
+ need_paper=yes
}
## Define configure options for dvipdf-x.
@@ -4219,6 +4220,7 @@ esac
test "x$enable_dvipdfm_x" = xno || {
need_kpathsea=yes
need_libpng=yes
+ need_paper=yes
}
## Define configure options for dvipdfm-x.