summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-01-13 13:03:22 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-01-13 13:03:22 +0000
commita8fb135db314d7fb3407051c5925eec99a0c3097 (patch)
tree6a5a41ec53e3d4f27222d1c02794cdcfc57dc55c /Build/source/texk
parentf028526edcba2838df64e33e27a36ef43b13cd64 (diff)
Rename libs/paper => libs/libpaper. Remove utils/songs
git-svn-id: svn://tug.org/texlive/trunk@32654 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/Makefile.in5
-rw-r--r--Build/source/texk/aclocal.m42
-rwxr-xr-xBuild/source/texk/configure81
-rw-r--r--Build/source/texk/dvipdf-x/ChangeLog5
-rw-r--r--Build/source/texk/dvipdf-x/Makefile.am10
-rw-r--r--Build/source/texk/dvipdf-x/Makefile.in16
-rw-r--r--Build/source/texk/dvipdf-x/ac/withenable.ac4
-rw-r--r--Build/source/texk/dvipdf-x/aclocal.m42
-rwxr-xr-xBuild/source/texk/dvipdf-x/configure71
-rw-r--r--Build/source/texk/dvipdf-x/configure.ac4
-rw-r--r--Build/source/texk/dvipdf-x/data/Makefile.in8
-rw-r--r--Build/source/texk/dvipdf-x/man/Makefile.in8
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog5
-rw-r--r--Build/source/texk/dvipdfm-x/Makefile.am10
-rw-r--r--Build/source/texk/dvipdfm-x/Makefile.in16
-rw-r--r--Build/source/texk/dvipdfm-x/ac/withenable.ac4
-rw-r--r--Build/source/texk/dvipdfm-x/aclocal.m42
-rwxr-xr-xBuild/source/texk/dvipdfm-x/configure71
-rw-r--r--Build/source/texk/dvipdfm-x/configure.ac4
-rw-r--r--Build/source/texk/psutils/ChangeLog5
-rw-r--r--Build/source/texk/psutils/Makefile.am10
-rw-r--r--Build/source/texk/psutils/Makefile.in16
-rw-r--r--Build/source/texk/psutils/ac/withenable.ac4
-rw-r--r--Build/source/texk/psutils/aclocal.m42
-rwxr-xr-xBuild/source/texk/psutils/configure71
-rw-r--r--Build/source/texk/psutils/configure.ac4
26 files changed, 219 insertions, 221 deletions
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index 7f03306ea70..70ab8ef3e44 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -100,11 +100,11 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../m4/kpse-harfbuzz-flags.m4 \
$(top_srcdir)/../m4/kpse-icu-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-lt-hack.m4 \
$(top_srcdir)/../m4/kpse-mktex.m4 \
$(top_srcdir)/../m4/kpse-options.m4 \
- $(top_srcdir)/../m4/kpse-paper-flags.m4 \
$(top_srcdir)/../m4/kpse-pixman-flags.m4 \
$(top_srcdir)/../m4/kpse-pkgs.m4 \
$(top_srcdir)/../m4/kpse-poppler-flags.m4 \
@@ -123,7 +123,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../utils/m-tx/ac/withenable.ac \
$(top_srcdir)/../utils/pmx/ac/withenable.ac \
$(top_srcdir)/../utils/ps2eps/ac/withenable.ac \
- $(top_srcdir)/../utils/songs/ac/withenable.ac \
$(top_srcdir)/../utils/t1utils/ac/withenable.ac \
$(top_srcdir)/../utils/texdoctk/ac/withenable.ac \
$(top_srcdir)/../utils/tpic2pdftex/ac/withenable.ac \
@@ -186,7 +185,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../libs/gd/ac/withenable.ac \
$(top_srcdir)/../libs/freetype2/ac/withenable.ac \
$(top_srcdir)/../libs/libpng/ac/withenable.ac \
- $(top_srcdir)/../libs/paper/ac/withenable.ac \
+ $(top_srcdir)/../libs/libpaper/ac/withenable.ac \
$(top_srcdir)/../libs/lua52/ac/withenable.ac \
$(top_srcdir)/../libs/zlib/ac/withenable.ac \
$(top_srcdir)/../texk/ptexenc/ac/withenable.ac \
diff --git a/Build/source/texk/aclocal.m4 b/Build/source/texk/aclocal.m4
index 861bd65775d..f7a4791f29b 100644
--- a/Build/source/texk/aclocal.m4
+++ b/Build/source/texk/aclocal.m4
@@ -1192,11 +1192,11 @@ m4_include([../m4/kpse-graphite2-flags.m4])
m4_include([../m4/kpse-harfbuzz-flags.m4])
m4_include([../m4/kpse-icu-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-lt-hack.m4])
m4_include([../m4/kpse-mktex.m4])
m4_include([../m4/kpse-options.m4])
-m4_include([../m4/kpse-paper-flags.m4])
m4_include([../m4/kpse-pixman-flags.m4])
m4_include([../m4/kpse-pkgs.m4])
m4_include([../m4/kpse-poppler-flags.m4])
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 6b38ac7be86..9770cdf130f 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -700,7 +700,6 @@ enable_biber
enable_m_tx
enable_pmx
enable_ps2eps
-enable_songs
enable_t1utils
enable_texdoctk
enable_tpic2pdftex
@@ -825,9 +824,9 @@ with_gd_includes
with_gd_libdir
with_system_freetype2
with_system_libpng
-with_system_paper
-with_paper_includes
-with_paper_libdir
+with_system_libpaper
+with_libpaper_includes
+with_libpaper_libdir
with_system_zlib
with_zlib_includes
with_zlib_libdir
@@ -1518,7 +1517,6 @@ Optional Features:
--disable-m-tx do not build the m-tx package
--disable-pmx do not build the pmx package
--disable-ps2eps do not build the ps2eps package
- --disable-songs do not build the songs package
--disable-t1utils do not build the t1utils package
--disable-texdoctk do not build the texdoctk package
--disable-tpic2pdftex do not build the tpic2pdftex package
@@ -1698,10 +1696,11 @@ Optional Packages:
(requires freetype-config)
--with-system-libpng use installed libpng headers and library (requires
pkg-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
--with-system-zlib use installed zlib headers and library
--with-zlib-includes=DIR
zlib headers installed in DIR
@@ -3443,24 +3442,6 @@ $as_echo "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;}
;;
esac
-## utils/songs/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/songs/
-## configure options and TL libraries required for songs
-# Check whether --enable-songs was given.
-if test "${enable_songs+set}" = set; then :
- enableval=$enable_songs;
-fi
-case $enable_songs in #(
- yes|no) :
- ;; #(
- *) :
-
- enable_songs=$enable_all_pkgs
- { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-songs=$enable_songs'" >&5
-$as_echo "$as_me: Assuming \`--enable-songs=$enable_songs'" >&6;}
- ac_configure_args="$ac_configure_args '--enable-songs=$enable_songs'"
- ;;
-esac
-
## utils/t1utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/t1utils/
## configure options and TL libraries required for t1utils
# Check whether --enable-t1utils was given.
@@ -4196,7 +4177,7 @@ esac
test "x$enable_dvipdf_x" = xno || {
need_kpathsea=yes
need_libpng=yes
- need_paper=yes
+ need_libpaper=yes
}
## Define configure options for dvipdf-x.
@@ -4246,7 +4227,7 @@ esac
test "x$enable_dvipdfm_x" = xno || {
need_kpathsea=yes
need_libpng=yes
- need_paper=yes
+ need_libpaper=yes
}
## Define configure options for dvipdfm-x.
@@ -4654,7 +4635,7 @@ esac
test "x$enable_psutils" = xno || {
need_kpathsea=yes
- need_paper=yes
+ need_libpaper=yes
}
## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/
@@ -5233,34 +5214,34 @@ test "x$need_libpng" = xyes && {
need_zlib=yes
}
-## libs/paper/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/paper/
-## configure options and TL libraries required for paper
+## libs/libpaper/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpaper/
+## configure options and TL libraries required for libpaper
-# 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" = x; then
- if test -f $srcdir/../libs/paper/configure; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`paper' headers and library from TL tree" >&5
-$as_echo "$as_me: Assuming \`paper' headers and library from TL tree" >&6;}
- with_system_paper=no
+if test "x$with_system_libpaper" = x; then
+ if test -f $srcdir/../libs/libpaper/configure; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`libpaper' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`libpaper' headers and library from TL tree" >&6;}
+ with_system_libpaper=no
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`paper' headers and library" >&5
-$as_echo "$as_me: Assuming installed \`paper' headers and library" >&6;}
- with_system_paper=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`libpaper' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`libpaper' headers and library" >&6;}
+ with_system_libpaper=yes
fi
- ac_configure_args="$ac_configure_args '--with-system-paper=$with_system_paper'"
+ ac_configure_args="$ac_configure_args '--with-system-libpaper=$with_system_libpaper'"
fi
## libs/lua52/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/lua52/
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@
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 28d30eb93d0..1abd3cd6222 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,5 +1,10 @@
2014-01-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+ * Makefile.am, /ac/withenable.ac, configure.ac:
+ Replace libs/paper => libs/libpaper.
+
+2014-01-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
* dbxfile.c [WIN32]: Include <wchar.h>. Avoid use of
uninitialized variables cmdvw and qvw.
diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am
index 16da1d0f756..d33e8291ee1 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.am
+++ b/Build/source/texk/dvipdfm-x/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/dvipdfm-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
@@ -19,7 +19,7 @@ EXTRA_PROGRAMS = dvipdfmx xdvipdfmx
EXTRA_LIBRARIES = libutil.a
-AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PAPER_INCLUDES)
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(LIBPAPER_INCLUDES)
xdvipdfmx_CPPFLAGS = -DXETEX $(FREETYPE2_INCLUDES) $(AM_CPPFLAGS)
AM_CFLAGS = $(WARNING_CFLAGS)
@@ -177,7 +177,7 @@ dvipdfmx_SOURCES = \
nodist_xdvipdfmx_SOURCES = $(dvipdfmx_SOURCES)
-dvipdfmx_LDADD = libutil.a $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(PAPER_LIBS)
+dvipdfmx_LDADD = libutil.a $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(LIBPAPER_LIBS)
xdvipdfmx_LDADD = $(FREETYPE2_LIBS) $(dvipdfmx_LDADD)
$(dvipdfmx_OBJECTS) $(xdvipdfmx_OBJECTS): config.force
@@ -250,7 +250,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
@@ -265,7 +265,7 @@ DISTCLEANFILES = config.force
## Rebuild libz
@ZLIB_RULE@
## Rebuild libpaper
-@PAPER_RULE@
+@LIBPAPER_RULE@
## Tests
##
diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in
index 841279066f6..648e5fc6cdd 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-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 \
@@ -541,6 +541,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@
@@ -566,9 +569,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@
@@ -636,7 +636,7 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
@DVIPDFMX_TRUE@@WIN32_FALSE@dist_bin_SCRIPTS = dvipdft
EXTRA_LIBRARIES = libutil.a
-AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PAPER_INCLUDES)
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(LIBPAPER_INCLUDES)
xdvipdfmx_CPPFLAGS = -DXETEX $(FREETYPE2_INCLUDES) $(AM_CPPFLAGS)
AM_CFLAGS = $(WARNING_CFLAGS)
libutil_a_SOURCES = \
@@ -792,7 +792,7 @@ dvipdfmx_SOURCES = \
type1.c
nodist_xdvipdfmx_SOURCES = $(dvipdfmx_SOURCES)
-dvipdfmx_LDADD = libutil.a $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(PAPER_LIBS)
+dvipdfmx_LDADD = libutil.a $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(LIBPAPER_LIBS)
xdvipdfmx_LDADD = $(FREETYPE2_LIBS) $(dvipdfmx_LDADD)
bin_links = $(am__append_3)
call_dvipdfmx_CPPFLAGS = -DEXEPROG=\"dvipdfmx.exe\"
@@ -2278,7 +2278,7 @@ uninstall-hook: uninstall-bin-links uninstall-man1-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
@@ -2286,7 +2286,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/dvipdfm-x/ac/withenable.ac b/Build/source/texk/dvipdfm-x/ac/withenable.ac
index 135f736d359..0e582cb5a8d 100644
--- a/Build/source/texk/dvipdfm-x/ac/withenable.ac
+++ b/Build/source/texk/dvipdfm-x/ac/withenable.ac
@@ -1,8 +1,8 @@
## texk/dvipdfm-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm-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 dvipdfm-x
-KPSE_ENABLE_PROG([dvipdfm-x], [kpathsea libpng paper])
+KPSE_ENABLE_PROG([dvipdfm-x], [kpathsea libpng libpaper])
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 86c07f86da7..b7f1d346c2f 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-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/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index 2236507c430..e268af84f50 100755
--- a/Build/source/texk/dvipdfm-x/configure
+++ b/Build/source/texk/dvipdfm-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
@@ -1482,10 +1482,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
@@ -15625,39 +15626,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/dvipdfm-x/configure.ac b/Build/source/texk/dvipdfm-x/configure.ac
index c77902ca57a..2ac675d1491 100644
--- a/Build/source/texk/dvipdfm-x/configure.ac
+++ b/Build/source/texk/dvipdfm-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/psutils/ChangeLog b/Build/source/texk/psutils/ChangeLog
index 0d8c6f3dc89..b740adc8e0b 100644
--- a/Build/source/texk/psutils/ChangeLog
+++ b/Build/source/texk/psutils/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-12-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* psutils.test (psresize): Test for '-0.000000' also at start.
diff --git a/Build/source/texk/psutils/Makefile.am b/Build/source/texk/psutils/Makefile.am
index 7d174c450a0..b190eadcea0 100644
--- a/Build/source/texk/psutils/Makefile.am
+++ b/Build/source/texk/psutils/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/psutils/
##
-## 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.
##
## We want to re-distribute the whole original psutils source tree.
@@ -12,7 +12,7 @@ EXTRA_DIST += $(PSUTILS_TREE)-PATCHES
dist-hook:
rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
-AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(PAPER_INCLUDES) -D_Noreturn= -D_GL_ATTRIBUTE_CONST=
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(LIBPAPER_INCLUDES) -D_Noreturn= -D_GL_ATTRIBUTE_CONST=
AM_CFLAGS = $(WARNING_CFLAGS)
noinst_LIBRARIES = libpsutils.a
@@ -23,7 +23,7 @@ libpsutils_a_SOURCES = \
@PSUTILS_TREE@/psutil.c \
@PSUTILS_TREE@/psutil.h
-$(libpsutils_a_OBJECTS): $(KPATHSEA_DEPEND) $(PAPER_DEPEND)
+$(libpsutils_a_OBJECTS): $(KPATHSEA_DEPEND) $(LIBPAPER_DEPEND)
bin_PROGRAMS = epsffit psbook psnup psresize psselect pstops
@@ -39,7 +39,7 @@ psselect_SOURCES = @PSUTILS_TREE@/psselect.c
pstops_SOURCES = @PSUTILS_TREE@/pstops.c
-LDADD = libpsutils.a $(KPATHSEA_LIBS) $(PAPER_LIBS)
+LDADD = libpsutils.a $(KPATHSEA_LIBS) $(LIBPAPER_LIBS)
perl_scripts = \
extractres \
@@ -73,7 +73,7 @@ man1_MANS = \
## Rebuild libkpathsea
@KPATHSEA_RULE@
## Rebuild libpaper
-@PAPER_RULE@
+@LIBPAPER_RULE@
## Tests
##
diff --git a/Build/source/texk/psutils/Makefile.in b/Build/source/texk/psutils/Makefile.in
index d1be582b3d6..5f75d25249a 100644
--- a/Build/source/texk/psutils/Makefile.in
+++ b/Build/source/texk/psutils/Makefile.in
@@ -105,7 +105,7 @@ subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
- $(top_srcdir)/../../m4/kpse-paper-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-libpaper-flags.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/libtool.m4 \
@@ -499,6 +499,9 @@ KPATHSEA_LIBS = @KPATHSEA_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
+LIBPAPER_DEPEND = @LIBPAPER_DEPEND@
+LIBPAPER_INCLUDES = @LIBPAPER_INCLUDES@
+LIBPAPER_LIBS = @LIBPAPER_LIBS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
@@ -521,9 +524,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@
PSUTILS_TREE = @PSUTILS_TREE@
RANLIB = @RANLIB@
@@ -591,7 +591,7 @@ EXTRA_DIST = $(PSUTILS_TREE) $(PSUTILS_TREE)-PATCHES \
tests/playps.2 tests/playres.ps tests/playsel.2 \
tests/playsel1.2 tests/plot.eps tests/ploth.eps \
tests/plotm.eps tests/plotv.eps
-AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(PAPER_INCLUDES) -D_Noreturn= -D_GL_ATTRIBUTE_CONST=
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(LIBPAPER_INCLUDES) -D_Noreturn= -D_GL_ATTRIBUTE_CONST=
AM_CFLAGS = $(WARNING_CFLAGS)
noinst_LIBRARIES = libpsutils.a
libpsutils_a_SOURCES = \
@@ -606,7 +606,7 @@ psnup_SOURCES = @PSUTILS_TREE@/psnup.c
psresize_SOURCES = @PSUTILS_TREE@/psresize.c
psselect_SOURCES = @PSUTILS_TREE@/psselect.c
pstops_SOURCES = @PSUTILS_TREE@/pstops.c
-LDADD = libpsutils.a $(KPATHSEA_LIBS) $(PAPER_LIBS)
+LDADD = libpsutils.a $(KPATHSEA_LIBS) $(LIBPAPER_LIBS)
perl_scripts = \
extractres \
includeres \
@@ -1486,7 +1486,7 @@ uninstall-man: uninstall-man1
dist-hook:
rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
-$(libpsutils_a_OBJECTS): $(KPATHSEA_DEPEND) $(PAPER_DEPEND)
+$(libpsutils_a_OBJECTS): $(KPATHSEA_DEPEND) $(LIBPAPER_DEPEND)
.PHONY: install-lua-links install-perl-links install-shell-links install-sh-links \
install-links uninstall-links
@WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript)
@@ -1535,7 +1535,7 @@ install-data-hook: install-perl-links
uninstall-hook: uninstall-links
@KPATHSEA_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/psutils/ac/withenable.ac b/Build/source/texk/psutils/ac/withenable.ac
index 057dc856a0b..eac99ec8435 100644
--- a/Build/source/texk/psutils/ac/withenable.ac
+++ b/Build/source/texk/psutils/ac/withenable.ac
@@ -1,7 +1,7 @@
## texk/psutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/psutils/
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 psutils
-KPSE_ENABLE_PROG([psutils], [kpathsea paper])
+KPSE_ENABLE_PROG([psutils], [kpathsea libpaper])
diff --git a/Build/source/texk/psutils/aclocal.m4 b/Build/source/texk/psutils/aclocal.m4
index 1e7423053a1..dd72793fc1b 100644
--- a/Build/source/texk/psutils/aclocal.m4
+++ b/Build/source/texk/psutils/aclocal.m4
@@ -1185,7 +1185,7 @@ AC_SUBST([am__untar])
m4_include([../../m4/kpse-common.m4])
m4_include([../../m4/kpse-kpathsea-flags.m4])
-m4_include([../../m4/kpse-paper-flags.m4])
+m4_include([../../m4/kpse-libpaper-flags.m4])
m4_include([../../m4/kpse-warnings.m4])
m4_include([../../m4/kpse-win32.m4])
m4_include([../../m4/libtool.m4])
diff --git a/Build/source/texk/psutils/configure b/Build/source/texk/psutils/configure
index ee3fb8401f7..a0d89371a7c 100755
--- a/Build/source/texk/psutils/configure
+++ b/Build/source/texk/psutils/configure
@@ -641,10 +641,10 @@ WIN32_WRAP_FALSE
WIN32_WRAP_TRUE
WIN32_FALSE
WIN32_TRUE
-PAPER_RULE
-PAPER_DEPEND
-PAPER_LIBS
-PAPER_INCLUDES
+LIBPAPER_RULE
+LIBPAPER_DEPEND
+LIBPAPER_LIBS
+LIBPAPER_INCLUDES
KPATHSEA_RULE
KPATHSEA_DEPEND
KPATHSEA_LIBS
@@ -784,9 +784,9 @@ enable_largefile
with_system_kpathsea
with_kpathsea_includes
with_kpathsea_libdir
-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
@@ -1448,10 +1448,11 @@ Optional Packages:
kpathsea headers installed in DIR
--with-kpathsea-libdir=DIR
kpathsea library installed in DIR
- --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
@@ -14393,39 +14394,39 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
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/psutils/configure.ac b/Build/source/texk/psutils/configure.ac
index 561c6834591..0e493ca683d 100644
--- a/Build/source/texk/psutils/configure.ac
+++ b/Build/source/texk/psutils/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,
@@ -20,7 +20,7 @@ AC_CONFIG_HEADERS([config.h])
AH_BOTTOM([#include <kpathsea/getopt.h>])
KPSE_KPATHSEA_FLAGS
-KPSE_PAPER_FLAGS
+KPSE_LIBPAPER_FLAGS
KPSE_COND_WIN32_WRAP