diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-11-28 15:20:35 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-11-28 15:20:35 +0000 |
commit | 47baf8a4b3da7f646d9ebd1cf5f8ce3d924ebf23 (patch) | |
tree | ab86056c490995f26ff7fcc1032717efa7db7df4 /Build/source/m4 | |
parent | 64b39cb80d70920b691c3b74550b9431b25de4af (diff) |
libs/pixman, libs/cairo: Added for future MetaPost
git-svn-id: svn://tug.org/texlive/trunk@28383 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r-- | Build/source/m4/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/m4/kpse-cairo-flags.m4 | 39 | ||||
-rw-r--r-- | Build/source/m4/kpse-pixman-flags.m4 | 39 | ||||
-rw-r--r-- | Build/source/m4/kpse-pkgs.m4 | 4 |
4 files changed, 88 insertions, 0 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index a3fb7691a41..17dd40b6761 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,9 @@ +2012-11-28 Peter Breitenlohner <peb@mppmu.mpg.de> + + Add libs/pixman and libs/cairo for future MetaPost. + * kpse-cairo-flags.m4, kpse-pixman-flags.m4: New files. + * kpse-pkgs.m4: Add the new libraries. + 2012-11-26 Peter Breitenlohner <peb@mppmu.mpg.de> * kpse-poppler-flags.m4: Restore -DPOPPLER_VERSION for 0.18. diff --git a/Build/source/m4/kpse-cairo-flags.m4 b/Build/source/m4/kpse-cairo-flags.m4 new file mode 100644 index 00000000000..f957d78a850 --- /dev/null +++ b/Build/source/m4/kpse-cairo-flags.m4 @@ -0,0 +1,39 @@ +# Public macros for the TeX Live (TL) tree. +# Copyright (C) 2012 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], [lt], + [-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], + [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 +if $PKG_CONFIG cairo --atleast-version=1.10; 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.10 or better]) +fi +]) # KPSE_CAIRO_SYSTEM_FLAGS diff --git a/Build/source/m4/kpse-pixman-flags.m4 b/Build/source/m4/kpse-pixman-flags.m4 new file mode 100644 index 00000000000..d3f93cd1669 --- /dev/null +++ b/Build/source/m4/kpse-pixman-flags.m4 @@ -0,0 +1,39 @@ +# Public macros for the TeX Live (TL) tree. +# Copyright (C) 2012 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_PIXMAN_FLAGS +# --------------- +# Provide the configure options '--with-system-pixman' (if in the TL tree). +# +# Set the make variables PIXMAN_INCLUDES and PIXMAN_LIBS to the CPPFLAGS and +# LIBS required for the `-lpixman-1' library in libs/pixman/ of the TL tree. +AC_DEFUN([KPSE_PIXMAN_FLAGS], +[_KPSE_LIB_FLAGS([pixman], [pixman], [lt], + [-IBLD/libs/pixman/include], [BLD/libs/pixman/libpixman.la], [], + [], [${top_builddir}/../../libs/pixman/include/pixman.h])[]dnl +]) # KPSE_PIXMAN_FLAGS + +# KPSE_PIXMAN_OPTIONS([WITH-SYSTEM]) +# -------------------------------- +AC_DEFUN([KPSE_PIXMAN_OPTIONS], +[m4_ifval([$1], + [AC_ARG_WITH([system-pixman], + AS_HELP_STRING([--with-system-pixman], + [use installed pixman headers and library (requires pkg-config)]))])[]dnl +]) # KPSE_PIXMAN_OPTIONS + +# KPSE_PIXMAN_SYSTEM_FLAGS +# ---------------------- +AC_DEFUN([KPSE_PIXMAN_SYSTEM_FLAGS], +[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 diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4 index fa7ac8578e0..292f4a10e5a 100644 --- a/Build/source/m4/kpse-pkgs.m4 +++ b/Build/source/m4/kpse-pkgs.m4 @@ -30,6 +30,8 @@ graphite zziplib xpdf poppler +cairo +pixman gd freetype2 freetype @@ -57,6 +59,8 @@ AC_REQUIRE([KPSE_T1LIB_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_FREETYPE_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_FREETYPE2_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_GD_SYSTEM_FLAGS])[]dnl +AC_REQUIRE([KPSE_PIXMAN_SYSTEM_FLAGS])[]dnl +AC_REQUIRE([KPSE_CAIRO_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_XPDF_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_POPPLER_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_ZZIPLIB_SYSTEM_FLAGS])[]dnl |