From 7c0b908f1a6e1489834fbdb0789766eed8a37b49 Mon Sep 17 00:00:00 2001 From: Luigi Scarso Date: Tue, 21 Apr 2020 18:43:36 +0000 Subject: pplib under libs -- WORK IN PROGRSS grep '?' out git-svn-id: svn://tug.org/texlive/trunk@54824 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/m4/ChangeLog | 5 +++++ Build/source/m4/kpse-pkgs.m4 | 2 ++ Build/source/m4/kpse-pplib-flags.m4 | 30 ++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 Build/source/m4/kpse-pplib-flags.m4 (limited to 'Build/source/m4') diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index 2fd00ef866e..4dfe8ed2e93 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,8 @@ +2020-04-21 Luigi Scarso + + * kpse-pkgs.m4 (KPSE_LIBS_PKGS): add pplib. + * Add kpse-pplib-flags.m4. + 2020-03-14 Karl Berry * kpse-setup.m4 (KPSE_SETUP): make that powerpc*, not powerpc-*. diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4 index 8ed6ca3e65c..c8832bd2247 100644 --- a/Build/source/m4/kpse-pkgs.m4 +++ b/Build/source/m4/kpse-pkgs.m4 @@ -25,6 +25,7 @@ # Each library must precede required other libraries (if any). AC_DEFUN([KPSE_LIBS_PKGS], [dnl m4_define([kpse_libs_pkgs], [dnl +pplib harfbuzz icu teckit @@ -58,6 +59,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_PPLIB_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_LIBPAPER_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_LIBPNG_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_FREETYPE2_SYSTEM_FLAGS])[]dnl diff --git a/Build/source/m4/kpse-pplib-flags.m4 b/Build/source/m4/kpse-pplib-flags.m4 new file mode 100644 index 00000000000..e6674542261 --- /dev/null +++ b/Build/source/m4/kpse-pplib-flags.m4 @@ -0,0 +1,30 @@ +# Public macros for the TeX Live (TL) tree. +# Copyright (C) 2009-2015 Peter Breitenlohner +# +# 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. + +# serial 0 + +# KPSE_PPLIB_FLAGS +# ----------------- +# Provide the configure options '--with-system-PPLIB' (if in the TL tree). +# +# Set the make variables PPLIB_INCLUDES and PPLIB_LIBS to the CPPFLAGS and +# LIBS required for the `-lpplib' library in libs/pplib/ of the TL tree. +AC_DEFUN([KPSE_PPLIB_FLAGS], [dnl +AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl +_KPSE_LIB_FLAGS([pplib], [pplib], [tree], + [-IBLD/libs/pplib/include], [BLD/libs/pplib/libpplib.a], [], + [], [${top_builddir}/../../libs/pplib/include/pplib.h])[]dnl +]) # KPSE_PPLIB_FLAGS + +# KPSE_PPLIB_OPTIONS([WITH-SYSTEM]) +# ---------------------------------- +AC_DEFUN([KPSE_PPLIB_OPTIONS], [_KPSE_LIB_OPTIONS([PPLIB], [$1], [pkg-config])]) + +# KPSE_PPLIB_SYSTEM_FLAGS +# ------------------------ +AC_DEFUN([KPSE_PPLIB_SYSTEM_FLAGS], [dnl +_KPSE_PKG_CONFIG_FLAGS([PPLIB], [PPLIB])]) -- cgit v1.2.3