diff options
Diffstat (limited to 'Build/source/m4/kpse-cairo-flags.m4')
| -rw-r--r-- | Build/source/m4/kpse-cairo-flags.m4 | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Build/source/m4/kpse-cairo-flags.m4 b/Build/source/m4/kpse-cairo-flags.m4 index f9c38f2e588..8e093e8643c 100644 --- a/Build/source/m4/kpse-cairo-flags.m4 +++ b/Build/source/m4/kpse-cairo-flags.m4 @@ -1,35 +1,35 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2012-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_CAIRO_FLAGS -# --------------- +# ---------------- # Provide the configure options '--with-system-pixman' (if in the TL tree). # # Set the make variables CAIRO_INCLUDES and CAIRO_LIBS to the CPPFLAGS and # LIBS required for the `-lcairo' library in libs/cairo/ of the TL tree. -AC_DEFUN([KPSE_CAIRO_FLAGS], -[_KPSE_LIB_FLAGS([cairo], [cairo], [], - [-IBLD/libs/cairo/cairo], [BLD/libs/cairo/libcairo.a], [], - [], [${top_builddir}/../../libs/cairo/cairo/cairo.h])[]dnl +AC_DEFUN([KPSE_CAIRO_FLAGS], [dnl +_KPSE_LIB_FLAGS([cairo], [cairo], [], + [-IBLD/libs/cairo/cairo], [BLD/libs/cairo/libcairo.a], [], + [], [${top_builddir}/../../libs/cairo/cairo/cairo.h])[]dnl ]) # KPSE_CAIRO_FLAGS # KPSE_CAIRO_OPTIONS([WITH-SYSTEM]) -# -------------------------------- -AC_DEFUN([KPSE_CAIRO_OPTIONS], -[m4_ifval([$1], - [AC_ARG_WITH([system-cairo], - AS_HELP_STRING([--with-system-cairo], +# --------------------------------- +AC_DEFUN([KPSE_CAIRO_OPTIONS], [dnl +m4_ifval([$1], + [AC_ARG_WITH([system-cairo], + AS_HELP_STRING([--with-system-cairo], [use installed cairo headers and library (requires pkg-config)]))])[]dnl ]) # KPSE_CAIRO_OPTIONS # KPSE_CAIRO_SYSTEM_FLAGS -# ---------------------- -AC_DEFUN([KPSE_CAIRO_SYSTEM_FLAGS], -[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl +# ----------------------- +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` |