summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-10-24 14:26:46 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-10-24 14:26:46 +0000
commit3abca69ae2714caba89314bd9d7c003b10801c6c (patch)
tree79ce78c82d028584ff7a00d4f81c9cd443a1489c /Build/source/m4
parent75e42af0e9b0601844032849e0a5be947c3ee237 (diff)
libs/paper: Add libpaper 1.1.24+nmu2
git-svn-id: svn://tug.org/texlive/trunk@31986 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/ChangeLog5
-rw-r--r--Build/source/m4/kpse-paper-flags.m428
-rw-r--r--Build/source/m4/kpse-pkgs.m42
-rw-r--r--Build/source/m4/kpse-zlib-flags.m44
4 files changed, 36 insertions, 3 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 6ddd361fd34..29691d2d3d8 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-24 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-pkgs.m4 (kpse_libs_pkgs): Add paper.
+ * kpse-paper-flags.m4: New file.
+
2013-09-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-pkgs.m4 (kpse_libs_pkgs): Drop freetype (Version 1.5).
diff --git a/Build/source/m4/kpse-paper-flags.m4 b/Build/source/m4/kpse-paper-flags.m4
new file mode 100644
index 00000000000..b29e2953815
--- /dev/null
+++ b/Build/source/m4/kpse-paper-flags.m4
@@ -0,0 +1,28 @@
+# Public macros for the TeX Live (TL) tree.
+# Copyright (C) 2013 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.
+
+# KPSE_PAPER_FLAGS
+# ---------------
+# Provide the configure options '--with-system-paper' (if in the TL tree),
+# '--with-paper-includes', and '--with-paper-libdir'.
+#
+# Set the make variables PAPER_INCLUDES and PAPER_LIBS to the CPPFLAGS and
+# LIBS required for the `-lz' library in libs/paper/ of the TL tree.
+AC_DEFUN([KPSE_PAPER_FLAGS], [dnl
+AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
+_KPSE_LIB_FLAGS([paper], [paper], [],
+ [-IBLD/libs/paper/include], [BLD/libs/paper/libz.a], [],
+ [], [${top_builddir}/../../libs/paper/include/paper.h])[]dnl
+]) # KPSE_PAPER_FLAGS
+
+# KPSE_PAPER_OPTIONS([WITH-SYSTEM])
+# --------------------------------
+AC_DEFUN([KPSE_PAPER_OPTIONS], [_KPSE_LIB_OPTIONS([paper], [$1])])
+
+# KPSE_PAPER_SYSTEM_FLAGS
+# ----------------------
+AC_DEFUN([KPSE_PAPER_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([paper], [z])])
diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4
index c226076eaa4..4573ceef3d2 100644
--- a/Build/source/m4/kpse-pkgs.m4
+++ b/Build/source/m4/kpse-pkgs.m4
@@ -36,6 +36,7 @@ potrace
gd
freetype2
libpng
+paper
lua52
zlib
])[]dnl
@@ -53,6 +54,7 @@ AC_REQUIRE([KPSE_LIBS_PREPARE])[]dnl
AC_REQUIRE([KPSE_KPATHSEA_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_PTEXENC_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_ZLIB_SYSTEM_FLAGS])[]dnl
+AC_REQUIRE([KPSE_PAPER_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_LIBPNG_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_FREETYPE2_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_GD_SYSTEM_FLAGS])[]dnl
diff --git a/Build/source/m4/kpse-zlib-flags.m4 b/Build/source/m4/kpse-zlib-flags.m4
index e95eb868762..4fc64b1cd9d 100644
--- a/Build/source/m4/kpse-zlib-flags.m4
+++ b/Build/source/m4/kpse-zlib-flags.m4
@@ -5,14 +5,12 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 0
-
# KPSE_ZLIB_FLAGS
# ---------------
# Provide the configure options '--with-system-zlib' (if in the TL tree),
# '--with-zlib-includes', and '--with-zlib-libdir'.
#
-# Also test if <<zlib.h> defines 'z_const' and define ZLIB_CONST or z_const.
+# Also test if <zlib.h> defines 'z_const' and define ZLIB_CONST or z_const.
#
# Set the make variables ZLIB_INCLUDES and ZLIB_LIBS to the CPPFLAGS and
# LIBS required for the `-lz' library in libs/zlib/ of the TL tree.