summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/ChangeLog6
-rw-r--r--Build/source/m4/kpse-libpaper-flags.m429
-rw-r--r--Build/source/m4/kpse-paper-flags.m428
-rw-r--r--Build/source/m4/kpse-pkgs.m47
4 files changed, 38 insertions, 32 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 3d088b9f4ba..646d4dccb5d 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-pkgs.m4: Renamed paper => libpaper. Removed songs.
+ * kpse-paper-flags.m4 (removed): Renamed ...
+ * kpse-libpaper-flags.m4 (new): ... into this.
+
2014-01-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-freetype2-flags.m4: Correct location of ft2build.h.
diff --git a/Build/source/m4/kpse-libpaper-flags.m4 b/Build/source/m4/kpse-libpaper-flags.m4
new file mode 100644
index 00000000000..e615803a25a
--- /dev/null
+++ b/Build/source/m4/kpse-libpaper-flags.m4
@@ -0,0 +1,29 @@
+# Public macros for the TeX Live (TL) tree.
+# 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.
+
+# KPSE_LIBPAPER_FLAGS
+# -------------------
+# Provide the configure options '--with-system-libpaper' (if in the TL tree),
+# '--with-libpaper-includes', and '--with-libpaper-libdir'.
+#
+# Set the make variables LIBPAPER_INCLUDES and LIBPAPER_LIBS to the
+# CPPFLAGS and LIBS required for the `-lpaper' library in libs/libspaper/
+# of the TL tree.
+AC_DEFUN([KPSE_LIBPAPER_FLAGS], [dnl
+AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
+_KPSE_LIB_FLAGS([libpaper], [paper], [],
+ [-IBLD/libs/libpaper/include], [BLD/libs/libpaper/libpaper.a], [],
+ [], [${top_builddir}/../../libs/libpaper/include/paper.h])[]dnl
+]) # KPSE_LIBPAPER_FLAGS
+
+# KPSE_LIBPAPER_OPTIONS([WITH-SYSTEM])
+# ------------------------------------
+AC_DEFUN([KPSE_LIBPAPER_OPTIONS], [_KPSE_LIB_OPTIONS([libpaper], [$1])])
+
+# KPSE_LIBPAPER_SYSTEM_FLAGS
+# --------------------------
+AC_DEFUN([KPSE_LIBPAPER_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([libpaper], [paper])])
diff --git a/Build/source/m4/kpse-paper-flags.m4 b/Build/source/m4/kpse-paper-flags.m4
deleted file mode 100644
index c8e0e761e6e..00000000000
--- a/Build/source/m4/kpse-paper-flags.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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/libpaper.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], [paper])])
diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4
index 0854c425a1f..113cdedad54 100644
--- a/Build/source/m4/kpse-pkgs.m4
+++ b/Build/source/m4/kpse-pkgs.m4
@@ -1,5 +1,5 @@
# Private macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -36,7 +36,7 @@ potrace
gd
freetype2
libpng
-paper
+libpaper
lua52
zlib
])[]dnl
@@ -54,7 +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_LIBPAPER_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_LIBPNG_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_FREETYPE2_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_GD_SYSTEM_FLAGS])[]dnl
@@ -79,7 +79,6 @@ biber
m-tx
pmx
ps2eps
-songs
t1utils
texdoctk
tpic2pdftex