From e96d533771de7ceeb155f9e2a093e67e0dc40ab1 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 12 Mar 2015 14:42:02 +0000 Subject: Build system: Reorganize flags for system (installed) libraries git-svn-id: svn://tug.org/texlive/trunk@36495 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/m4/ChangeLog | 5 ++++ Build/source/m4/kpse-cairo-flags.m4 | 9 +----- Build/source/m4/kpse-common.m4 | 17 +++++++++-- Build/source/m4/kpse-graphite2-flags.m4 | 17 ++++------- Build/source/m4/kpse-harfbuzz-flags.m4 | 17 ++++------- Build/source/m4/kpse-kpathsea-flags.m4 | 53 ++++++++++++++++----------------- Build/source/m4/kpse-libpng-flags.m4 | 17 ++++------- Build/source/m4/kpse-pixman-flags.m4 | 11 ++----- Build/source/m4/kpse-poppler-flags.m4 | 11 ++----- Build/source/m4/kpse-ptexenc-flags.m4 | 10 +++---- Build/source/m4/kpse-teckit-flags.m4 | 9 +----- Build/source/m4/kpse-xpdf-flags.m4 | 15 ++++------ Build/source/m4/kpse-zziplib-flags.m4 | 11 ++----- 13 files changed, 79 insertions(+), 123 deletions(-) (limited to 'Build/source/m4') diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index 90582391f89..a0bf42795c8 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,8 @@ +2015-03-12 Peter Breitenlohner + + * kpse-{kpathsea,ptexenc}-flags.m4: Use pkg-config. + * kpse-common.m4 (_KPSE_PKG_CONFIG_FLAGS): Common code. + 2015-03-10 Peter Breitenlohner * kpse-common.m4 (KPSE_COMMON): Drop checks for strcasecmp, diff --git a/Build/source/m4/kpse-cairo-flags.m4 b/Build/source/m4/kpse-cairo-flags.m4 index b6f2d6839d4..a41c7df6d2a 100644 --- a/Build/source/m4/kpse-cairo-flags.m4 +++ b/Build/source/m4/kpse-cairo-flags.m4 @@ -25,11 +25,4 @@ AC_DEFUN([KPSE_CAIRO_OPTIONS], [_KPSE_LIB_OPTIONS([cairo], [$1], [pkg-config])]) # KPSE_CAIRO_SYSTEM_FLAGS # ----------------------- AC_DEFUN([KPSE_CAIRO_SYSTEM_FLAGS], [dnl -AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl -if $PKG_CONFIG cairo --atleast-version=1.12; then - CAIRO_INCLUDES=`$PKG_CONFIG cairo --cflags` - CAIRO_LIBS=`$PKG_CONFIG cairo --libs` -elif test "x$need_cairo:$with_system_cairo" = xyes:yes; then - AC_MSG_ERROR([did not find cairo-1.12 or better]) -fi -]) # KPSE_CAIRO_SYSTEM_FLAGS +_KPSE_PKG_CONFIG_FLAGS([cairo], [cairo], [1.12])]) diff --git a/Build/source/m4/kpse-common.m4 b/Build/source/m4/kpse-common.m4 index dfd98d9cbb8..9c98f349e8c 100644 --- a/Build/source/m4/kpse-common.m4 +++ b/Build/source/m4/kpse-common.m4 @@ -288,11 +288,24 @@ AC_DEFUN([_KPSE_MSG_WARN_PREPARE], # _KPSE_CHECK_PKG_CONFIG # ---------------------- # Check for pkg-config -AC_DEFUN([_KPSE_CHECK_PKG_CONFIG], -[AC_REQUIRE([AC_CANONICAL_HOST])[]dnl +AC_DEFUN([_KPSE_CHECK_PKG_CONFIG], [dnl +AC_REQUIRE([AC_CANONICAL_HOST])[]dnl AC_CHECK_TOOL([PKG_CONFIG], [pkg-config], [false])[]dnl ]) # _KPSE_CHECK_PKG_CONFIG +# _KPSE_PKG_CONFIG_FLAGS(PACKAGE-NAME, PKG_CONFIG_NAME, [AT_LEAST]) +# ----------------------------------------------------------------- +# Use pkg-config to determine INCLUDES and LIBS for a system library. +AC_DEFUN([_KPSE_PKG_CONFIG_FLAGS], [dnl +AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl +if $PKG_CONFIG $2[]m4_ifval([$3], [ --atleast-version=$3]); then + AS_TR_CPP($1)_INCLUDES=`$PKG_CONFIG $2 --cflags` + AS_TR_CPP($1)_LIBS=`$PKG_CONFIG $2 --libs` +elif test "x$need_[]AS_TR_SH($1):$with_system_[]AS_TR_SH($1)" = xyes:yes; then + AC_MSG_ERROR([did not find $2[]m4_ifval([$3], [ $3 or better])]) +fi +]) # _KPSE_PKG_CONFIG_FLAGS + # KPSE_CANONICAL_HOST # ------------------- # Require both --host and --build for cross compilations; set kpse_build_alias. diff --git a/Build/source/m4/kpse-graphite2-flags.m4 b/Build/source/m4/kpse-graphite2-flags.m4 index 7c853707458..aae7c0b3f7f 100644 --- a/Build/source/m4/kpse-graphite2-flags.m4 +++ b/Build/source/m4/kpse-graphite2-flags.m4 @@ -1,5 +1,5 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2012-2014 Peter Breitenlohner +# Copyright (C) 2012-2015 Peter Breitenlohner # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -11,8 +11,8 @@ # # Set the make variables GRAPHITE2_INCLUDES and GRAPHITE2_LIBS to the CPPFLAGS and # LIBS required for the `-lgraphite2' library in libs/graphite2/ of the TL tree. -AC_DEFUN([KPSE_GRAPHITE2_FLAGS], -[AC_REQUIRE([KPSE_FREETYPE2_FLAGS])[]dnl +AC_DEFUN([KPSE_GRAPHITE2_FLAGS], [dnl +AC_REQUIRE([KPSE_FREETYPE2_FLAGS])[]dnl AC_REQUIRE([KPSE_ICU_FLAGS])[]dnl _KPSE_LIB_FLAGS([graphite2], [graphite2], [], [-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC], @@ -26,12 +26,5 @@ AC_DEFUN([KPSE_GRAPHITE2_OPTIONS], [_KPSE_LIB_OPTIONS([graphite2], [$1], [pkg-co # KPSE_GRAPHITE2_SYSTEM_FLAGS # --------------------------- -AC_DEFUN([KPSE_GRAPHITE2_SYSTEM_FLAGS], -[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl -if $PKG_CONFIG graphite2; then - GRAPHITE2_INCLUDES=`$PKG_CONFIG graphite2 --cflags` - GRAPHITE2_LIBS=`$PKG_CONFIG graphite2 --libs` -elif test "x$need_graphite2:$with_system_graphite2" = xyes:yes; then - AC_MSG_ERROR([did not find graphite2]) -fi -]) # KPSE_GRAPHITE2_SYSTEM_FLAGS +AC_DEFUN([KPSE_GRAPHITE2_SYSTEM_FLAGS], [dnl +_KPSE_PKG_CONFIG_FLAGS([graphite2], [graphite2])]) diff --git a/Build/source/m4/kpse-harfbuzz-flags.m4 b/Build/source/m4/kpse-harfbuzz-flags.m4 index 716ab28a3b9..51bc12d60b9 100644 --- a/Build/source/m4/kpse-harfbuzz-flags.m4 +++ b/Build/source/m4/kpse-harfbuzz-flags.m4 @@ -1,5 +1,5 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2012-2014 Peter Breitenlohner +# Copyright (C) 2012-2015 Peter Breitenlohner # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -11,8 +11,8 @@ # # Set the make variables HARFBUZZ_INCLUDES and HARFBUZZ_LIBS to the CPPFLAGS and # LIBS required for the `-lharfbuzz' library in libs/harfbuzz/ of the TL tree. -AC_DEFUN([KPSE_HARFBUZZ_FLAGS], -[AC_REQUIRE([KPSE_GRAPHITE2_FLAGS])[]dnl +AC_DEFUN([KPSE_HARFBUZZ_FLAGS], [dnl +AC_REQUIRE([KPSE_GRAPHITE2_FLAGS])[]dnl AC_REQUIRE([KPSE_ICU_FLAGS])[]dnl _KPSE_LIB_FLAGS([harfbuzz], [harfbuzz], [], [-IBLD/libs/harfbuzz/include], [BLD/libs/harfbuzz/libharfbuzz.a], [], @@ -25,12 +25,5 @@ AC_DEFUN([KPSE_HARFBUZZ_OPTIONS], [_KPSE_LIB_OPTIONS([harfbuzz], [$1], [pkg-conf # KPSE_HARFBUZZ_SYSTEM_FLAGS # -------------------------- -AC_DEFUN([KPSE_HARFBUZZ_SYSTEM_FLAGS], -[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl -if $PKG_CONFIG harfbuzz-icu; then - HARFBUZZ_INCLUDES=`$PKG_CONFIG harfbuzz-icu --cflags` - HARFBUZZ_LIBS=`$PKG_CONFIG harfbuzz-icu --libs` -elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then - AC_MSG_ERROR([did not find harfbuzz-icu]) -fi -]) # KPSE_HARFBUZZ_SYSTEM_FLAGS +AC_DEFUN([KPSE_HARFBUZZ_SYSTEM_FLAGS], [dnl +_KPSE_PKG_CONFIG_FLAGS([harfbuzz], [harfbuzz-icu])]) diff --git a/Build/source/m4/kpse-kpathsea-flags.m4 b/Build/source/m4/kpse-kpathsea-flags.m4 index 7e5ed3273a5..f0bae6f8067 100644 --- a/Build/source/m4/kpse-kpathsea-flags.m4 +++ b/Build/source/m4/kpse-kpathsea-flags.m4 @@ -1,23 +1,20 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2009, 2010 Peter Breitenlohner +# 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_KPATHSEA_FLAGS([OPTIONS]) # ------------------------------ -# Provide the configure options '--with-system-kpathsea' (if in the TL tree), -# '--with-kpathsea-includes', and '--with-kpathsea-libdir'. +# Provide the configure options '--with-system-kpathsea' (if in the TL tree). # Options: # no-debug - add '-DNO_DEBUG' to KPATHSEA_INCLUDES even if not needed # # Set the make variables KPATHSEA_INCLUDES and KPATHSEA_LIBS to the CPPFLAGS and # LIBS required for the `-lkpathsea' library in texk/kpathsea/ of the TL tree. -AC_DEFUN([KPSE_KPATHSEA_FLAGS], -[AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl +AC_DEFUN([KPSE_KPATHSEA_FLAGS], [dnl +AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl _KPSE_TEXLIB_FLAGS([kpathsea], [kpathsea], [lt], [-IBLD/texk -ISRC/texk], [BLD/texk/kpathsea/libkpathsea.la], [], [${top_srcdir}/../kpathsea/*.[ch]], @@ -29,46 +26,46 @@ m4_if(m4_index([ $1 ], [ no-debug ]), [-1], # KPSE_KPATHSEA_OPTIONS([WITH-SYSTEM]) # ------------------------------------ -AC_DEFUN([KPSE_KPATHSEA_OPTIONS], [_KPSE_LIB_OPTIONS([kpathsea], [$1])]) +AC_DEFUN([KPSE_KPATHSEA_OPTIONS], [_KPSE_LIB_OPTIONS([kpathsea], [$1], [pkg-config])]) # _KPSE_CHECK_KPSE_DEBUG # ---------------------- # Internal subroutine to check if libkpathsea supports debugging. -m4_define([_KPSE_CHECK_KPSE_DEBUG], -[AC_CACHE_CHECK([if libkpathsea supports debugging], - [kpse_cv_kpse_debug], - [KPSE_ADD_FLAGS([kpathsea]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [[FILE *f = fopen("f", "r")]])], - [kpse_cv_kpse_debug=yes], - [kpse_cv_kpse_debug=no]) - KPSE_RESTORE_FLAGS]) +m4_define([_KPSE_CHECK_KPSE_DEBUG], [dnl +AC_CACHE_CHECK([if libkpathsea supports debugging], + [kpse_cv_kpse_debug], + [KPSE_ADD_FLAGS([kpathsea]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[FILE *f = fopen("f", "r")]])], + [kpse_cv_kpse_debug=yes], + [kpse_cv_kpse_debug=no]) + KPSE_RESTORE_FLAGS]) AS_IF([test "x$kpse_cv_kpse_debug" != xyes], [KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"])[]dnl ]) # _KPSE_CHECK_KPSE_DEBUG # KPSE_KPATHSEA_SYSTEM_FLAGS # -------------------------- -AC_DEFUN([KPSE_KPATHSEA_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([kpathsea], [kpathsea])]) +AC_DEFUN([KPSE_KPATHSEA_SYSTEM_FLAGS], [dnl +_KPSE_PKG_CONFIG_FLAGS([kpathsea], [kpathsea])]) # KPSE_CHECK_KPSE_FORMAT(FORMAT, # [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # ---------------------------------------------------------------- # Check whether kpathsea declares the kpse_FORMAT_format. -AC_DEFUN([KPSE_CHECK_KPSE_FORMAT], -[AC_CACHE_CHECK([whether kpathsea declares the kpse_$1_format], - [kpse_cv_have_$1_format], - [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [[kpse_$1_format]])], - [kpse_cv_have_$1_format=yes], - [kpse_cv_have_$1_format=no])]) +AC_DEFUN([KPSE_CHECK_KPSE_FORMAT], [dnl +AC_CACHE_CHECK([whether kpathsea declares the kpse_$1_format], + [kpse_cv_have_$1_format], + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[kpse_$1_format]])], + [kpse_cv_have_$1_format=yes], + [kpse_cv_have_$1_format=no])]) AS_IF([test "x$kpse_cv_have_$1_format" = xyes], [$2], [$3]) ]) # KPSE_CHECK_KPSE_FORMAT # KPSE_CHECK_XBASENAME([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # -------------------------------------------------------------- # Check whether kpathsea declares xbasename(). -AC_DEFUN([KPSE_CHECK_XBASENAME], -[AC_CHECK_DECL([xbasename], [$1], [$2], - [[#include ]]) +AC_DEFUN([KPSE_CHECK_XBASENAME], [dnl +AC_CHECK_DECL([xbasename], [$1], [$2], [[#include ]]) ]) # KPSE_CHECK_XBASENAME diff --git a/Build/source/m4/kpse-libpng-flags.m4 b/Build/source/m4/kpse-libpng-flags.m4 index a2bb76c6814..a832e96a621 100644 --- a/Build/source/m4/kpse-libpng-flags.m4 +++ b/Build/source/m4/kpse-libpng-flags.m4 @@ -1,5 +1,5 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2009-2014 Peter Breitenlohner +# Copyright (C) 2009-2015 Peter Breitenlohner # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -13,8 +13,8 @@ # # Set the make variables LIBPNG_INCLUDES and LIBPNG_LIBS to the CPPFLAGS and # LIBS required for the `-lpng' library in libs/libpng/ of the TL tree. -AC_DEFUN([KPSE_LIBPNG_FLAGS], -[AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl +AC_DEFUN([KPSE_LIBPNG_FLAGS], [dnl +AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl _KPSE_LIB_FLAGS([libpng], [png], [], [-IBLD/libs/libpng/include], [BLD/libs/libpng/libpng.a], [], [], [${top_builddir}/../../libs/libpng/include/png.h])[]dnl @@ -26,12 +26,5 @@ AC_DEFUN([KPSE_LIBPNG_OPTIONS], [_KPSE_LIB_OPTIONS([libpng], [$1], [pkg-config]) # KPSE_LIBPNG_SYSTEM_FLAGS # ------------------------ -AC_DEFUN([KPSE_LIBPNG_SYSTEM_FLAGS], -[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl -if $PKG_CONFIG libpng; then - LIBPNG_INCLUDES=`$PKG_CONFIG libpng --cflags` - LIBPNG_LIBS=`$PKG_CONFIG libpng --libs` -elif test "x$need_libpng:$with_system_libpng" = xyes:yes; then - AC_MSG_ERROR([did not find libpng]) -fi -]) # KPSE_LIBPNG_SYSTEM_FLAGS +AC_DEFUN([KPSE_LIBPNG_SYSTEM_FLAGS], [dnl +_KPSE_PKG_CONFIG_FLAGS([libpng], [libpng])]) diff --git a/Build/source/m4/kpse-pixman-flags.m4 b/Build/source/m4/kpse-pixman-flags.m4 index d0266535028..4f4f3e3d62d 100644 --- a/Build/source/m4/kpse-pixman-flags.m4 +++ b/Build/source/m4/kpse-pixman-flags.m4 @@ -1,5 +1,5 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2012-2014 Peter Breitenlohner +# Copyright (C) 2012-2015 Peter Breitenlohner # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -24,11 +24,4 @@ AC_DEFUN([KPSE_PIXMAN_OPTIONS], [_KPSE_LIB_OPTIONS([pixman], [$1], [pkg-config]) # KPSE_PIXMAN_SYSTEM_FLAGS # ------------------------ AC_DEFUN([KPSE_PIXMAN_SYSTEM_FLAGS], [dnl -AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl -if $PKG_CONFIG pixman-1 --atleast-version=0.18; then - PIXMAN_INCLUDES=`$PKG_CONFIG pixman-1 --cflags` - PIXMAN_LIBS=`$PKG_CONFIG pixman-1 --libs` -elif test "x$need_pixman:$with_system_pixman" = xyes:yes; then - AC_MSG_ERROR([did not find pixman-0.18 or better]) -fi -]) # KPSE_PIXMAN_SYSTEM_FLAGS +_KPSE_PKG_CONFIG_FLAGS([pixman], [pixman-1], [0.18])]) diff --git a/Build/source/m4/kpse-poppler-flags.m4 b/Build/source/m4/kpse-poppler-flags.m4 index 1ba2d5bf729..2883395cfdb 100644 --- a/Build/source/m4/kpse-poppler-flags.m4 +++ b/Build/source/m4/kpse-poppler-flags.m4 @@ -28,12 +28,7 @@ AC_DEFUN([KPSE_POPPLER_OPTIONS], [_KPSE_LIB_OPTIONS([poppler], [$1], [pkg-config # KPSE_POPPLER_SYSTEM_FLAGS # ------------------------- AC_DEFUN([KPSE_POPPLER_SYSTEM_FLAGS], [dnl -AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl -if $PKG_CONFIG poppler --atleast-version=0.18; then - POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' - POPPLER_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`" - POPPLER_LIBS=`$PKG_CONFIG poppler --libs` -elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then - AC_MSG_ERROR([did not find poppler-0.18 or better]) -fi +_KPSE_PKG_CONFIG_FLAGS([poppler], [poppler], [0.18]) +POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' +POPPLER_INCLUDES="$POPPLER_VERSION $POPPLER_INCLUDES" ]) # KPSE_POPPLER_SYSTEM_FLAGS diff --git a/Build/source/m4/kpse-ptexenc-flags.m4 b/Build/source/m4/kpse-ptexenc-flags.m4 index 8d151660bdb..12e374e3e3a 100644 --- a/Build/source/m4/kpse-ptexenc-flags.m4 +++ b/Build/source/m4/kpse-ptexenc-flags.m4 @@ -1,5 +1,5 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2010-2014 Peter Breitenlohner +# Copyright (C) 2010-2015 Peter Breitenlohner # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -7,8 +7,7 @@ # KPSE_PTEXENC_FLAGS # ------------------ -# Provide the configure options '--with-system-ptexenc' (if in the TL tree), -# '--with-ptexenc-includes', and '--with-ptexenc-libdir'. +# Provide the configure options '--with-system-ptexenc' (if in the TL tree). # # Set the make variables PTEXENC_INCLUDES and PTEXENC_LIBS to the CPPFLAGS and # LIBS required for the `-lptexenc' library in texk/ptexenc/ of the TL tree. @@ -21,8 +20,9 @@ _KPSE_TEXLIB_FLAGS([ptexenc], [ptexenc], [lt], # KPSE_PTEXENC_OPTIONS([WITH-SYSTEM]) # ----------------------------------- -AC_DEFUN([KPSE_PTEXENC_OPTIONS], [_KPSE_LIB_OPTIONS([ptexenc], [$1])]) +AC_DEFUN([KPSE_PTEXENC_OPTIONS], [_KPSE_LIB_OPTIONS([ptexenc], [$1], [pkg-config])]) # KPSE_PTEXENC_SYSTEM_FLAGS # ------------------------- -AC_DEFUN([KPSE_PTEXENC_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([ptexenc], [ptexenc])]) +AC_DEFUN([KPSE_PTEXENC_SYSTEM_FLAGS], [dnl +_KPSE_PKG_CONFIG_FLAGS([ptexenc], [ptexenc])]) diff --git a/Build/source/m4/kpse-teckit-flags.m4 b/Build/source/m4/kpse-teckit-flags.m4 index 7e027c0e1d4..dd7fe706579 100644 --- a/Build/source/m4/kpse-teckit-flags.m4 +++ b/Build/source/m4/kpse-teckit-flags.m4 @@ -25,11 +25,4 @@ AC_DEFUN([KPSE_TECKIT_OPTIONS], [_KPSE_LIB_OPTIONS([teckit], [$1], [pkg-config]) # KPSE_TECKIT_SYSTEM_FLAGS # ------------------------- AC_DEFUN([KPSE_TECKIT_SYSTEM_FLAGS], [dnl -AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl -if $PKG_CONFIG teckit; then - TECKIT_INCLUDES=`$PKG_CONFIG teckit --cflags` - TECKIT_LIBS=`$PKG_CONFIG teckit --libs` -elif test "x$need_teckit:$with_system_teckit" = xyes:yes; then - AC_MSG_ERROR([did not find teckit]) -fi -]) # KPSE_TECKIT_SYSTEM_FLAGS +_KPSE_PKG_CONFIG_FLAGS([teckit], [teckit])]) diff --git a/Build/source/m4/kpse-xpdf-flags.m4 b/Build/source/m4/kpse-xpdf-flags.m4 index 8b3afd369a2..e2207b8ad5e 100644 --- a/Build/source/m4/kpse-xpdf-flags.m4 +++ b/Build/source/m4/kpse-xpdf-flags.m4 @@ -1,5 +1,5 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2009-2012 Peter Breitenlohner +# Copyright (C) 2009-2015 Peter Breitenlohner # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -31,13 +31,8 @@ AC_DEFUN([KPSE_XPDF_OPTIONS], # KPSE_XPDF_SYSTEM_FLAGS # ---------------------- -AC_DEFUN([KPSE_XPDF_SYSTEM_FLAGS], -[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl -if $PKG_CONFIG poppler --atleast-version=0.12; then - POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' - XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`" - XPDF_LIBS=`$PKG_CONFIG poppler --libs` -elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then - AC_MSG_ERROR([did not find poppler-0.12 or better]) -fi +AC_DEFUN([KPSE_XPDF_SYSTEM_FLAGS], [dnl +_KPSE_PKG_CONFIG_FLAGS([xpdf], [poppler], [0.12]) +POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' +XPDF_INCLUDES="$POPPLER_VERSION $XPDF_INCLUDES" ]) # KPSE_XPDF_SYSTEM_FLAGS diff --git a/Build/source/m4/kpse-zziplib-flags.m4 b/Build/source/m4/kpse-zziplib-flags.m4 index 7f48c3cb379..88eed9721ff 100644 --- a/Build/source/m4/kpse-zziplib-flags.m4 +++ b/Build/source/m4/kpse-zziplib-flags.m4 @@ -1,5 +1,5 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2010-2014 Peter Breitenlohner +# Copyright (C) 2010-2015 Peter Breitenlohner # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -26,11 +26,4 @@ AC_DEFUN([KPSE_ZZIPLIB_OPTIONS], [_KPSE_LIB_OPTIONS([zziplib], [$1], [pkg-config # KPSE_ZZIPLIB_SYSTEM_FLAGS # ------------------------- AC_DEFUN([KPSE_ZZIPLIB_SYSTEM_FLAGS], [dnl -AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl -if $PKG_CONFIG zziplib --atleast-version=0.12; then - ZZIPLIB_INCLUDES=`$PKG_CONFIG zziplib --cflags` - ZZIPLIB_LIBS=`$PKG_CONFIG zziplib --libs` -elif test "x$need_zziplib:$with_system_zziplib" = xyes:yes; then - AC_MSG_ERROR([did not find zziplib-0.12 or better]) -fi -]) # KPSE_ZZIPLIB_SYSTEM_FLAGS +_KPSE_PKG_CONFIG_FLAGS([zziplib], [zziplib], [0.12])]) -- cgit v1.2.3