diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-01-13 13:03:22 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-01-13 13:03:22 +0000 |
commit | a8fb135db314d7fb3407051c5925eec99a0c3097 (patch) | |
tree | 6a5a41ec53e3d4f27222d1c02794cdcfc57dc55c /Build/source/libs | |
parent | f028526edcba2838df64e33e27a36ef43b13cd64 (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/libs')
-rw-r--r-- | Build/source/libs/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/libs/README | 6 | ||||
-rw-r--r-- | Build/source/libs/aclocal.m4 | 2 | ||||
-rwxr-xr-x | Build/source/libs/configure | 91 | ||||
-rw-r--r-- | Build/source/libs/libpaper/ChangeLog | 17 | ||||
-rw-r--r-- | Build/source/libs/libpaper/Makefile.am (renamed from Build/source/libs/paper/Makefile.am) | 24 | ||||
-rw-r--r-- | Build/source/libs/libpaper/Makefile.in (renamed from Build/source/libs/paper/Makefile.in) | 88 | ||||
-rw-r--r-- | Build/source/libs/libpaper/ac/libpaper.ac | 9 | ||||
-rw-r--r-- | Build/source/libs/libpaper/ac/withenable.ac | 7 | ||||
-rw-r--r-- | Build/source/libs/libpaper/aclocal.m4 (renamed from Build/source/libs/paper/aclocal.m4) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/config.h.in (renamed from Build/source/libs/paper/config.h.in) | 0 | ||||
-rwxr-xr-x | Build/source/libs/libpaper/configure (renamed from Build/source/libs/paper/configure) | 28 | ||||
-rw-r--r-- | Build/source/libs/libpaper/configure.ac (renamed from Build/source/libs/paper/configure.ac) | 12 | ||||
-rw-r--r-- | Build/source/libs/libpaper/include/Makefile.am (renamed from Build/source/libs/paper/include/Makefile.am) | 6 | ||||
-rw-r--r-- | Build/source/libs/libpaper/include/Makefile.in (renamed from Build/source/libs/paper/include/Makefile.in) | 6 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/TL-Changes (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/TL-Changes) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/patch-01-JIS (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-01-JIS) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/patch-03-getopt (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-03-getopt) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/ChangeLog (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/ChangeLog) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/Makefile.am (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/Makefile.am) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/README (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/README) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/config.h.in (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/config.h.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/configure.ac (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/configure.ac) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/Makefile.am (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/Makefile.am) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/dimen.c (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/dimen.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/dimen.h (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/dimen.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paper.c (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/paper.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paper.h (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/paper.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paperspecs (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/paperspecs) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paperspecs.h (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/paperspecs.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/Makefile.am (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/Makefile.am) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/defaultpapername.3 (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/defaultpapername.3) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/defaultpapersizefile.3 (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/defaultpapersizefile.3) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperconf.1.in (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconf.1.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperconfig.8.in (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconfig.8.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperdone.3 (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperdone.3) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperfirst.3 (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperfirst.3) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperinfo.3 (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperinfo.3) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperinit.3 (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperinit.3) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperlast.3 (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperlast.3) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/papernext.3 (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/papernext.3) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperprev.3 (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperprev.3) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperpsheight.3 (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperpsheight.3) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperpsname.3 (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperpsname.3) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperpswidth.3 (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperpswidth.3) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/papersize.5.in (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/papersize.5.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperwithsize.3 (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperwithsize.3) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/systempapername.3.in (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/systempapername.3.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/systempapersizefile.3 (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/man/systempapersizefile.3) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/src/Makefile.am (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/src/Makefile.am) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/src/paperconf.c (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/src/paperconf.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/libpaper-1.1.24+nmu2/src/paperconfig.in (renamed from Build/source/libs/paper/libpaper-1.1.24+nmu2/src/paperconfig.in) | 0 | ||||
-rwxr-xr-x | Build/source/libs/libpaper/paper.test (renamed from Build/source/libs/paper/paper.test) | 0 | ||||
-rw-r--r-- | Build/source/libs/libpaper/version.ac (renamed from Build/source/libs/paper/version.ac) | 6 | ||||
-rw-r--r-- | Build/source/libs/paper/ChangeLog | 9 | ||||
-rw-r--r-- | Build/source/libs/paper/ac/paper.ac | 9 | ||||
-rw-r--r-- | Build/source/libs/paper/ac/withenable.ac | 7 |
59 files changed, 161 insertions, 171 deletions
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in index 677c12542d0..4146ea368b0 100644 --- a/Build/source/libs/Makefile.in +++ b/Build/source/libs/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/libs/README b/Build/source/libs/README index c5172d0a39b..de3aeea1092 100644 --- a/Build/source/libs/README +++ b/Build/source/libs/README @@ -27,6 +27,9 @@ harfbuzz 0.9.25 - checked 5dec13 icu 52.1 (release) - checked 10oct13 http://download.icu-project.org/files/icu4c/ +libpaper 1.1.24+nmu2 - checked 24oct13 + ftp://ftp.de.debian.org/debian/pool/main/libp/libpaper/ + libpng 1.6.8 - checked 2jan14 http://www.libpng.org/ - used by many http://www.libpng.org/pub/png/pngcode.html @@ -34,9 +37,6 @@ libpng 1.6.8 - checked 2jan14 lua 5.2.3 - checked 7dec13 http://www.lua.org/ftp/ -paper 1.1.24+nmu2 - checked 24oct13 - ftp://ftp.de.debian.org/debian/pool/main/libp/libpaper/ - pixman 0.32.4 - checked 18nov13 http://cairographics.org/releases/ diff --git a/Build/source/libs/aclocal.m4 b/Build/source/libs/aclocal.m4 index 861bd65775d..f7a4791f29b 100644 --- a/Build/source/libs/aclocal.m4 +++ b/Build/source/libs/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/libs/configure b/Build/source/libs/configure index 86a0d4bf886..1967482d9ff 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/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 @@ -870,7 +869,7 @@ potrace gd freetype2 libpng -paper +libpaper lua52 zlib' @@ -1503,7 +1502,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 @@ -1683,10 +1681,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 @@ -3428,24 +3427,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. @@ -4181,7 +4162,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. @@ -4231,7 +4212,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. @@ -4639,7 +4620,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/ @@ -5218,34 +5199,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/ @@ -6393,11 +6374,11 @@ if test -x $srcdir/libpng/configure; then fi fi -if test -x $srcdir/paper/configure; then - test "x$with_system_paper" != xyes && test "x$need_paper" = xyes && MAKE_SUBDIRS="paper $MAKE_SUBDIRS" - CONF_SUBDIRS="paper $CONF_SUBDIRS" +if test -x $srcdir/libpaper/configure; then + test "x$with_system_libpaper" != xyes && test "x$need_libpaper" = xyes && MAKE_SUBDIRS="libpaper $MAKE_SUBDIRS" + CONF_SUBDIRS="libpaper $CONF_SUBDIRS" if false; then - subdirs="$subdirs paper" + subdirs="$subdirs libpaper" fi fi diff --git a/Build/source/libs/libpaper/ChangeLog b/Build/source/libs/libpaper/ChangeLog new file mode 100644 index 00000000000..a19c11ec3c8 --- /dev/null +++ b/Build/source/libs/libpaper/ChangeLog @@ -0,0 +1,17 @@ +2014-01-13 Peter Breitenlohner <peb@mppmu.mpg.de> + + Renamed libs/paper => libs/libpaper/. + * ac/paper.ac (removed): Renamed ... + * ac/libpaper.ac (new): ... into this. + * ac/withenable.ac, {.,include/}Makefile.am, configure.ac, + version.ac: Adapted. + +2013-11-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * paper.test: Avoid GNU specific getopt features. + Problem reported by Marc Baudoin <babafou@babafou.eu.org>. + +2013-10-24 Peter Breitenlohner <peb@mppmu.mpg.de> + + Import libpaper-1.1.24+nmu2. + diff --git a/Build/source/libs/paper/Makefile.am b/Build/source/libs/libpaper/Makefile.am index 4cb4b0f0f46..6a12c84eca2 100644 --- a/Build/source/libs/paper/Makefile.am +++ b/Build/source/libs/libpaper/Makefile.am @@ -1,6 +1,6 @@ -## Proxy Makefile.am to build paper for TeX Live. +## Proxy Makefile.am to build libpaper for TeX Live. ## -## Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, @@ -8,34 +8,34 @@ ## ## We want to re-distribute the whole original harfbuzz source tree. ## -EXTRA_DIST = $(PAPER_TREE) +EXTRA_DIST = $(LIBPAPER_TREE) ## Changes applied to the original source tree ## -EXTRA_DIST += $(PAPER_TREE)-PATCHES +EXTRA_DIST += $(LIBPAPER_TREE)-PATCHES # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` -AM_CPPFLAGS = -I$(top_srcdir)/$(PAPER_TREE)/lib $(WARNING_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPAPER_TREE)/lib $(WARNING_CFLAGS) SUBDIRS = . include noinst_LIBRARIES = libpaper.a libpaper_a_SOURCES = \ - @PAPER_TREE@/lib/dimen.c \ - @PAPER_TREE@/lib/dimen.h \ - @PAPER_TREE@/lib/paper.c \ - @PAPER_TREE@/lib/paper.h \ - @PAPER_TREE@/lib/paperspecs.h + @LIBPAPER_TREE@/lib/dimen.c \ + @LIBPAPER_TREE@/lib/dimen.h \ + @LIBPAPER_TREE@/lib/paper.c \ + @LIBPAPER_TREE@/lib/paper.h \ + @LIBPAPER_TREE@/lib/paperspecs.h LDADD = libpaper.a bin_PROGRAMS = paperconf -paperconf_SOURCES = @PAPER_TREE@/src/paperconf.c +paperconf_SOURCES = @LIBPAPER_TREE@/src/paperconf.c man_MANS = paperconf.1 @@ -54,7 +54,7 @@ CLEANFILES = include $(srcdir)/../../am/rebuild.am if MAINTAINER_MODE -BUILT_SOURCES = $(PAPER_TREE)/lib/paperspecs.h +BUILT_SOURCES = $(LIBPAPER_TREE)/lib/paperspecs.h paperspecs.h: paperspecs Makefile echo ' /* This file has been automaticaly generated.' >$@ diff --git a/Build/source/libs/paper/Makefile.in b/Build/source/libs/libpaper/Makefile.in index 38a3cacffd3..5c2d9976eac 100644 --- a/Build/source/libs/paper/Makefile.in +++ b/Build/source/libs/libpaper/Makefile.in @@ -116,12 +116,12 @@ am__v_AR_1 = libpaper_a_AR = $(AR) $(ARFLAGS) libpaper_a_LIBADD = am__dirstamp = $(am__leading_dot)dirstamp -am_libpaper_a_OBJECTS = @PAPER_TREE@/lib/dimen.$(OBJEXT) \ - @PAPER_TREE@/lib/paper.$(OBJEXT) +am_libpaper_a_OBJECTS = @LIBPAPER_TREE@/lib/dimen.$(OBJEXT) \ + @LIBPAPER_TREE@/lib/paper.$(OBJEXT) libpaper_a_OBJECTS = $(am_libpaper_a_OBJECTS) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) -am_paperconf_OBJECTS = @PAPER_TREE@/src/paperconf.$(OBJEXT) +am_paperconf_OBJECTS = @LIBPAPER_TREE@/src/paperconf.$(OBJEXT) paperconf_OBJECTS = $(am_paperconf_OBJECTS) paperconf_LDADD = $(LDADD) paperconf_DEPENDENCIES = libpaper.a @@ -473,6 +473,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ +LIBPAPER_TREE = @LIBPAPER_TREE@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -489,7 +490,6 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAPERSIZE = @PAPERSIZE@ PAPERSIZEVAR = @PAPERSIZEVAR@ -PAPER_TREE = @PAPER_TREE@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ @@ -539,19 +539,19 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = $(PAPER_TREE) $(PAPER_TREE)-PATCHES -AM_CPPFLAGS = -I$(top_srcdir)/$(PAPER_TREE)/lib $(WARNING_CFLAGS) +EXTRA_DIST = $(LIBPAPER_TREE) $(LIBPAPER_TREE)-PATCHES +AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPAPER_TREE)/lib $(WARNING_CFLAGS) SUBDIRS = . include noinst_LIBRARIES = libpaper.a libpaper_a_SOURCES = \ - @PAPER_TREE@/lib/dimen.c \ - @PAPER_TREE@/lib/dimen.h \ - @PAPER_TREE@/lib/paper.c \ - @PAPER_TREE@/lib/paper.h \ - @PAPER_TREE@/lib/paperspecs.h + @LIBPAPER_TREE@/lib/dimen.c \ + @LIBPAPER_TREE@/lib/dimen.h \ + @LIBPAPER_TREE@/lib/paper.c \ + @LIBPAPER_TREE@/lib/paper.h \ + @LIBPAPER_TREE@/lib/paperspecs.h LDADD = libpaper.a -paperconf_SOURCES = @PAPER_TREE@/src/paperconf.c +paperconf_SOURCES = @LIBPAPER_TREE@/src/paperconf.c man_MANS = paperconf.1 @build_TRUE@dist_check_SCRIPTS = paper.test @build_TRUE@TESTS = paper.test @@ -560,7 +560,7 @@ man_MANS = paperconf.1 rebuild_prereq = rebuild_target = all CLEANFILES = rebuild.stamp -@MAINTAINER_MODE_TRUE@BUILT_SOURCES = $(PAPER_TREE)/lib/paperspecs.h +@MAINTAINER_MODE_TRUE@BUILT_SOURCES = $(LIBPAPER_TREE)/lib/paperspecs.h all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -621,16 +621,18 @@ paperconf.1: $(top_builddir)/config.status $(top_srcdir)/libpaper-1.1.24+nmu2/ma clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -@PAPER_TREE@/lib/$(am__dirstamp): - @$(MKDIR_P) @PAPER_TREE@/lib - @: > @PAPER_TREE@/lib/$(am__dirstamp) -@PAPER_TREE@/lib/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) @PAPER_TREE@/lib/$(DEPDIR) - @: > @PAPER_TREE@/lib/$(DEPDIR)/$(am__dirstamp) -@PAPER_TREE@/lib/dimen.$(OBJEXT): @PAPER_TREE@/lib/$(am__dirstamp) \ - @PAPER_TREE@/lib/$(DEPDIR)/$(am__dirstamp) -@PAPER_TREE@/lib/paper.$(OBJEXT): @PAPER_TREE@/lib/$(am__dirstamp) \ - @PAPER_TREE@/lib/$(DEPDIR)/$(am__dirstamp) +@LIBPAPER_TREE@/lib/$(am__dirstamp): + @$(MKDIR_P) @LIBPAPER_TREE@/lib + @: > @LIBPAPER_TREE@/lib/$(am__dirstamp) +@LIBPAPER_TREE@/lib/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) @LIBPAPER_TREE@/lib/$(DEPDIR) + @: > @LIBPAPER_TREE@/lib/$(DEPDIR)/$(am__dirstamp) +@LIBPAPER_TREE@/lib/dimen.$(OBJEXT): \ + @LIBPAPER_TREE@/lib/$(am__dirstamp) \ + @LIBPAPER_TREE@/lib/$(DEPDIR)/$(am__dirstamp) +@LIBPAPER_TREE@/lib/paper.$(OBJEXT): \ + @LIBPAPER_TREE@/lib/$(am__dirstamp) \ + @LIBPAPER_TREE@/lib/$(DEPDIR)/$(am__dirstamp) libpaper.a: $(libpaper_a_OBJECTS) $(libpaper_a_DEPENDENCIES) $(EXTRA_libpaper_a_DEPENDENCIES) $(AM_V_at)-rm -f libpaper.a @@ -678,15 +680,15 @@ uninstall-binPROGRAMS: clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -@PAPER_TREE@/src/$(am__dirstamp): - @$(MKDIR_P) @PAPER_TREE@/src - @: > @PAPER_TREE@/src/$(am__dirstamp) -@PAPER_TREE@/src/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) @PAPER_TREE@/src/$(DEPDIR) - @: > @PAPER_TREE@/src/$(DEPDIR)/$(am__dirstamp) -@PAPER_TREE@/src/paperconf.$(OBJEXT): \ - @PAPER_TREE@/src/$(am__dirstamp) \ - @PAPER_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@LIBPAPER_TREE@/src/$(am__dirstamp): + @$(MKDIR_P) @LIBPAPER_TREE@/src + @: > @LIBPAPER_TREE@/src/$(am__dirstamp) +@LIBPAPER_TREE@/src/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) @LIBPAPER_TREE@/src/$(DEPDIR) + @: > @LIBPAPER_TREE@/src/$(DEPDIR)/$(am__dirstamp) +@LIBPAPER_TREE@/src/paperconf.$(OBJEXT): \ + @LIBPAPER_TREE@/src/$(am__dirstamp) \ + @LIBPAPER_TREE@/src/$(DEPDIR)/$(am__dirstamp) paperconf$(EXEEXT): $(paperconf_OBJECTS) $(paperconf_DEPENDENCIES) $(EXTRA_paperconf_DEPENDENCIES) @rm -f paperconf$(EXEEXT) @@ -694,15 +696,15 @@ paperconf$(EXEEXT): $(paperconf_OBJECTS) $(paperconf_DEPENDENCIES) $(EXTRA_paper mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f @PAPER_TREE@/lib/*.$(OBJEXT) - -rm -f @PAPER_TREE@/src/*.$(OBJEXT) + -rm -f @LIBPAPER_TREE@/lib/*.$(OBJEXT) + -rm -f @LIBPAPER_TREE@/src/*.$(OBJEXT) distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@@PAPER_TREE@/lib/$(DEPDIR)/dimen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@@PAPER_TREE@/lib/$(DEPDIR)/paper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@@PAPER_TREE@/src/$(DEPDIR)/paperconf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@@LIBPAPER_TREE@/lib/$(DEPDIR)/dimen.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@@LIBPAPER_TREE@/lib/$(DEPDIR)/paper.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@@LIBPAPER_TREE@/src/$(DEPDIR)/paperconf.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -1258,10 +1260,10 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -rm -f @PAPER_TREE@/lib/$(DEPDIR)/$(am__dirstamp) - -rm -f @PAPER_TREE@/lib/$(am__dirstamp) - -rm -f @PAPER_TREE@/src/$(DEPDIR)/$(am__dirstamp) - -rm -f @PAPER_TREE@/src/$(am__dirstamp) + -rm -f @LIBPAPER_TREE@/lib/$(DEPDIR)/$(am__dirstamp) + -rm -f @LIBPAPER_TREE@/lib/$(am__dirstamp) + -rm -f @LIBPAPER_TREE@/src/$(DEPDIR)/$(am__dirstamp) + -rm -f @LIBPAPER_TREE@/src/$(am__dirstamp) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -1274,7 +1276,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf @PAPER_TREE@/lib/$(DEPDIR) @PAPER_TREE@/src/$(DEPDIR) + -rm -rf @LIBPAPER_TREE@/lib/$(DEPDIR) @LIBPAPER_TREE@/src/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-tags @@ -1322,7 +1324,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf @PAPER_TREE@/lib/$(DEPDIR) @PAPER_TREE@/src/$(DEPDIR) + -rm -rf @LIBPAPER_TREE@/lib/$(DEPDIR) @LIBPAPER_TREE@/src/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic diff --git a/Build/source/libs/libpaper/ac/libpaper.ac b/Build/source/libs/libpaper/ac/libpaper.ac new file mode 100644 index 00000000000..57439aa9976 --- /dev/null +++ b/Build/source/libs/libpaper/ac/libpaper.ac @@ -0,0 +1,9 @@ +## libs/libpaper/ac/libpaper.ac: configure.ac fragment for the TeX Live subdirectory libs/libpaper/ +dnl +dnl Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org> +dnl You may freely use, modify and/or distribute this file. +dnl +## basic check of system libpaper +KPSE_TRY_LIB([libpaper], + [#include <paper.h>], + [const char *v = defaultpapername();]) diff --git a/Build/source/libs/libpaper/ac/withenable.ac b/Build/source/libs/libpaper/ac/withenable.ac new file mode 100644 index 00000000000..b0672254154 --- /dev/null +++ b/Build/source/libs/libpaper/ac/withenable.ac @@ -0,0 +1,7 @@ +## libs/libpaper/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpaper/ +dnl +dnl Copyright (C) 2012-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 libpaper +KPSE_WITH_LIB([libpaper]) diff --git a/Build/source/libs/paper/aclocal.m4 b/Build/source/libs/libpaper/aclocal.m4 index 7788d8b5d0a..7788d8b5d0a 100644 --- a/Build/source/libs/paper/aclocal.m4 +++ b/Build/source/libs/libpaper/aclocal.m4 diff --git a/Build/source/libs/paper/config.h.in b/Build/source/libs/libpaper/config.h.in index 44d8cdd81a7..44d8cdd81a7 100644 --- a/Build/source/libs/paper/config.h.in +++ b/Build/source/libs/libpaper/config.h.in diff --git a/Build/source/libs/paper/configure b/Build/source/libs/libpaper/configure index 4e5a49b69d4..83d5126af10 100755 --- a/Build/source/libs/paper/configure +++ b/Build/source/libs/libpaper/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for paper (TeX Live) 1.1.24+nmu2. +# Generated by GNU Autoconf 2.69 for libpaper (TeX Live) 1.1.24+nmu2. # # Report bugs to <tex-k@tug.org>. # @@ -578,10 +578,10 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='paper (TeX Live)' -PACKAGE_TARNAME='paper--tex-live-' +PACKAGE_NAME='libpaper (TeX Live)' +PACKAGE_TARNAME='libpaper--tex-live-' PACKAGE_VERSION='1.1.24+nmu2' -PACKAGE_STRING='paper (TeX Live) 1.1.24+nmu2' +PACKAGE_STRING='libpaper (TeX Live) 1.1.24+nmu2' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -626,7 +626,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -PAPER_TREE +LIBPAPER_TREE PAPERSIZEVAR PAPERSIZE build_FALSE @@ -1279,7 +1279,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures paper (TeX Live) 1.1.24+nmu2 to adapt to many kinds of systems. +\`configure' configures libpaper (TeX Live) 1.1.24+nmu2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1328,7 +1328,7 @@ Fine tuning of the installation directories: --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] --docdir=DIR documentation root - [DATAROOTDIR/doc/paper--tex-live-] + [DATAROOTDIR/doc/libpaper--tex-live-] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1346,7 +1346,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of paper (TeX Live) 1.1.24+nmu2:";; + short | recursive ) echo "Configuration of libpaper (TeX Live) 1.1.24+nmu2:";; esac cat <<\_ACEOF @@ -1443,7 +1443,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -paper (TeX Live) configure 1.1.24+nmu2 +libpaper (TeX Live) configure 1.1.24+nmu2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1745,7 +1745,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by paper (TeX Live) $as_me 1.1.24+nmu2, which was +It was created by libpaper (TeX Live) $as_me 1.1.24+nmu2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3667,7 +3667,7 @@ fi # Define the identity of the package. - PACKAGE='paper--tex-live-' + PACKAGE='libpaper--tex-live-' VERSION='1.1.24+nmu2' @@ -5233,7 +5233,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF -PAPER_TREE=libpaper-1.1.24+nmu2 +LIBPAPER_TREE=libpaper-1.1.24+nmu2 ac_config_files="$ac_config_files Makefile include/Makefile paperconf.1:libpaper-1.1.24+nmu2/man/paperconf.1.in" @@ -5781,7 +5781,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by paper (TeX Live) $as_me 1.1.24+nmu2, which was +This file was extended by libpaper (TeX Live) $as_me 1.1.24+nmu2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5847,7 +5847,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -paper (TeX Live) config.status 1.1.24+nmu2 +libpaper (TeX Live) config.status 1.1.24+nmu2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/libs/paper/configure.ac b/Build/source/libs/libpaper/configure.ac index f27d64afc50..b36ff819a46 100644 --- a/Build/source/libs/paper/configure.ac +++ b/Build/source/libs/libpaper/configure.ac @@ -1,15 +1,15 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2013, 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, dnl with or without modifications, as long as this notice is preserved. dnl -m4_include([version.ac])[] dnl define paper_version -AC_INIT([paper (TeX Live)], paper_version, [tex-k@tug.org]) +m4_include([version.ac])[] dnl define libpaper_version +AC_INIT([libpaper (TeX Live)], libpaper_version, [tex-k@tug.org]) AC_PREREQ([2.65]) -AC_CONFIG_SRCDIR([libpaper-]paper_version[/lib/paper.h]) +AC_CONFIG_SRCDIR([libpaper-]libpaper_version[/lib/paper.h]) AC_CONFIG_AUX_DIR([../../build-aux]) AC_CONFIG_MACRO_DIRS([../../m4]) @@ -39,10 +39,10 @@ AC_SUBST([PAPERSIZEVAR], [PAPERSIZE]) AC_DEFINE_UNQUOTED([PAPERSIZEVAR], ["$PAPERSIZEVAR"], [Environment variable that overrides the default paper size]) -AC_SUBST([PAPER_TREE], [libpaper-]paper_version) +AC_SUBST([LIBPAPER_TREE], [libpaper-]libpaper_version) AC_CONFIG_FILES([Makefile include/Makefile - paperconf.1:libpaper-]paper_version[/man/paperconf.1.in]) + paperconf.1:libpaper-]libpaper_version[/man/paperconf.1.in]) AC_OUTPUT diff --git a/Build/source/libs/paper/include/Makefile.am b/Build/source/libs/libpaper/include/Makefile.am index 34576a7efa3..fd7b2fba481 100644 --- a/Build/source/libs/paper/include/Makefile.am +++ b/Build/source/libs/libpaper/include/Makefile.am @@ -1,14 +1,14 @@ ## Proxy Makefile.am to install paper headers for TeX Live. ## -## Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org> ## ## This file is free software; the copyright holder ## gives unlimited permission to copy and/or distribute it, ## with or without modifications, as long as this notice is preserved. ## -PAPER_LIB = $(top_srcdir)/$(PAPER_TREE)/lib +LIBPAPER_LIB = $(top_srcdir)/$(LIBPAPER_TREE)/lib -hdr_links = $(PAPER_LIB)/paper.h +hdr_links = $(LIBPAPER_LIB)/paper.h include $(top_srcdir)/../../am/hdr_links.am diff --git a/Build/source/libs/paper/include/Makefile.in b/Build/source/libs/libpaper/include/Makefile.in index 7dc26197e53..a31abb7ab86 100644 --- a/Build/source/libs/paper/include/Makefile.in +++ b/Build/source/libs/libpaper/include/Makefile.in @@ -137,6 +137,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ +LIBPAPER_TREE = @LIBPAPER_TREE@ LIBS = @LIBS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -153,7 +154,6 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PAPERSIZE = @PAPERSIZE@ PAPERSIZEVAR = @PAPERSIZEVAR@ -PAPER_TREE = @PAPER_TREE@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ @@ -203,8 +203,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -PAPER_LIB = $(top_srcdir)/$(PAPER_TREE)/lib -hdr_links = $(PAPER_LIB)/paper.h +LIBPAPER_LIB = $(top_srcdir)/$(LIBPAPER_TREE)/lib +hdr_links = $(LIBPAPER_LIB)/paper.h all: all-am .SUFFIXES: diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog index 8747ca1a3e3..8747ca1a3e3 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/TL-Changes b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/TL-Changes index 779b6d4ff35..779b6d4ff35 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/TL-Changes +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/TL-Changes diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-01-JIS b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/patch-01-JIS index ce2016ad995..ce2016ad995 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-01-JIS +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/patch-01-JIS diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL index 601ccb9d252..601ccb9d252 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/patch-02-TL diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-03-getopt b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/patch-03-getopt index cec650d1108..cec650d1108 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-03-getopt +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2-PATCHES/patch-03-getopt diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/ChangeLog b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/ChangeLog index 1eadcbd9f1b..1eadcbd9f1b 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/ChangeLog +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/ChangeLog diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/Makefile.am b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/Makefile.am index e646ec42084..e646ec42084 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/Makefile.am +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/Makefile.am diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/README b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/README index 2b451f7a552..2b451f7a552 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/README +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/README diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/config.h.in b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/config.h.in index eb99fd55840..eb99fd55840 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/config.h.in +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/config.h.in diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/configure.ac b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/configure.ac index 4b6ef5714ad..4b6ef5714ad 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/configure.ac +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/configure.ac diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/Makefile.am b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/Makefile.am index 3375cc05d38..3375cc05d38 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/Makefile.am +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/Makefile.am diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/dimen.c b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/dimen.c index d0c86e20524..d0c86e20524 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/dimen.c +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/dimen.c diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/dimen.h b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/dimen.h index d574ac3202d..d574ac3202d 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/dimen.h +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/dimen.h diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/paper.c b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paper.c index 512dff88452..512dff88452 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/paper.c +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paper.c diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/paper.h b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paper.h index 993f7463c8c..993f7463c8c 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/paper.h +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paper.h diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/paperspecs b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paperspecs index 6be0a46dc3a..6be0a46dc3a 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/paperspecs +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paperspecs diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/paperspecs.h b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paperspecs.h index a94ec36dafb..a94ec36dafb 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/lib/paperspecs.h +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/lib/paperspecs.h diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/Makefile.am b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/Makefile.am index f9d579a645c..f9d579a645c 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/Makefile.am +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/Makefile.am diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/defaultpapername.3 b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/defaultpapername.3 index 882f4bbf27e..882f4bbf27e 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/defaultpapername.3 +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/defaultpapername.3 diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/defaultpapersizefile.3 b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/defaultpapersizefile.3 index 390a56bdfeb..390a56bdfeb 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/defaultpapersizefile.3 +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/defaultpapersizefile.3 diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconf.1.in b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperconf.1.in index 53cecd83bdd..53cecd83bdd 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconf.1.in +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperconf.1.in diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconfig.8.in b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperconfig.8.in index 1c7ce4d9159..1c7ce4d9159 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconfig.8.in +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperconfig.8.in diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperdone.3 b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperdone.3 index d1098b8c116..d1098b8c116 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperdone.3 +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperdone.3 diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperfirst.3 b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperfirst.3 index 0ba4c23059d..0ba4c23059d 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperfirst.3 +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperfirst.3 diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperinfo.3 b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperinfo.3 index 68f5bf75f98..68f5bf75f98 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperinfo.3 +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperinfo.3 diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperinit.3 b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperinit.3 index e1f71dfdf99..e1f71dfdf99 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperinit.3 +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperinit.3 diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperlast.3 b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperlast.3 index 0ba4c23059d..0ba4c23059d 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperlast.3 +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperlast.3 diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/papernext.3 b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/papernext.3 index 0ba4c23059d..0ba4c23059d 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/papernext.3 +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/papernext.3 diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperprev.3 b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperprev.3 index 0ba4c23059d..0ba4c23059d 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperprev.3 +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperprev.3 diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperpsheight.3 b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperpsheight.3 index 0ba4c23059d..0ba4c23059d 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperpsheight.3 +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperpsheight.3 diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperpsname.3 b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperpsname.3 index 0ba4c23059d..0ba4c23059d 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperpsname.3 +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperpsname.3 diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperpswidth.3 b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperpswidth.3 index 0ba4c23059d..0ba4c23059d 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperpswidth.3 +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperpswidth.3 diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/papersize.5.in b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/papersize.5.in index f0f71934890..f0f71934890 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/papersize.5.in +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/papersize.5.in diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperwithsize.3 b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperwithsize.3 index 0ba4c23059d..0ba4c23059d 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperwithsize.3 +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/paperwithsize.3 diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/systempapername.3.in b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/systempapername.3.in index 033e0309756..033e0309756 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/systempapername.3.in +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/systempapername.3.in diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/systempapersizefile.3 b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/systempapersizefile.3 index 42182084272..42182084272 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/systempapersizefile.3 +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/man/systempapersizefile.3 diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/src/Makefile.am b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/src/Makefile.am index 5d7bc85170e..5d7bc85170e 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/src/Makefile.am +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/src/Makefile.am diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/src/paperconf.c b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/src/paperconf.c index d0fa34fab2f..d0fa34fab2f 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/src/paperconf.c +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/src/paperconf.c diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/src/paperconfig.in b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/src/paperconfig.in index 9548b4aa2f9..9548b4aa2f9 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/src/paperconfig.in +++ b/Build/source/libs/libpaper/libpaper-1.1.24+nmu2/src/paperconfig.in diff --git a/Build/source/libs/paper/paper.test b/Build/source/libs/libpaper/paper.test index ea19f41adb2..ea19f41adb2 100755 --- a/Build/source/libs/paper/paper.test +++ b/Build/source/libs/libpaper/paper.test diff --git a/Build/source/libs/paper/version.ac b/Build/source/libs/libpaper/version.ac index 74bfc260ff4..3304d3fd5c9 100644 --- a/Build/source/libs/paper/version.ac +++ b/Build/source/libs/libpaper/version.ac @@ -1,5 +1,5 @@ dnl -dnl Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2013, 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, @@ -7,5 +7,5 @@ dnl with or without modifications, as long as this notice is preserved. dnl dnl -------------------------------------------------------- dnl -dnl m4-include this file to define the current paper version -m4_define([paper_version], [1.1.24+nmu2]) +dnl m4-include this file to define the current libpaper version +m4_define([libpaper_version], [1.1.24+nmu2]) diff --git a/Build/source/libs/paper/ChangeLog b/Build/source/libs/paper/ChangeLog deleted file mode 100644 index 1c6df7798c4..00000000000 --- a/Build/source/libs/paper/ChangeLog +++ /dev/null @@ -1,9 +0,0 @@ -2013-11-20 Peter Breitenlohner <peb@mppmu.mpg.de> - - * paper.test: Avoid GNU specific getopt features. - Problem reported by Marc Baudoin <babafou@babafou.eu.org>. - -2013-10-24 Peter Breitenlohner <peb@mppmu.mpg.de> - - Import libpaper-1.1.24+nmu2. - diff --git a/Build/source/libs/paper/ac/paper.ac b/Build/source/libs/paper/ac/paper.ac deleted file mode 100644 index 6ef5ddb215c..00000000000 --- a/Build/source/libs/paper/ac/paper.ac +++ /dev/null @@ -1,9 +0,0 @@ -## libs/paper/ac/paper.ac: configure.ac fragment for the TeX Live subdirectory libs/paper/ -dnl -dnl Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org> -dnl You may freely use, modify and/or distribute this file. -dnl -## basic check of system paper -KPSE_TRY_LIB([paper], - [#include <paper.h>], - [const char *v = defaultpapername();]) diff --git a/Build/source/libs/paper/ac/withenable.ac b/Build/source/libs/paper/ac/withenable.ac deleted file mode 100644 index cc8d0236dfe..00000000000 --- a/Build/source/libs/paper/ac/withenable.ac +++ /dev/null @@ -1,7 +0,0 @@ -## libs/paper/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/paper/ -dnl -dnl Copyright (C) 2012 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 paper -KPSE_WITH_LIB([paper]) |