libs/pixman, libs/cairo: Added for future MetaPost

git-svn-id: svn://tug.org/texlive/trunk@28383 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 69 insertions, 1 deletions

diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index 1d91a27fff7..072b9a9e12a 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -60,7 +60,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	../build-aux/ltmain.sh ../build-aux/missing \
 	../build-aux/texinfo.tex ../build-aux/ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
+	$(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../m4/kpse-freetype-flags.m4 \
 	$(top_srcdir)/../m4/kpse-freetype2-flags.m4 \
@@ -72,6 +73,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../m4/kpse-lt-hack.m4 \
 	$(top_srcdir)/../m4/kpse-mktex.m4 \
 	$(top_srcdir)/../m4/kpse-options.m4 \
+	$(top_srcdir)/../m4/kpse-pixman-flags.m4 \
 	$(top_srcdir)/../m4/kpse-pkgs.m4 \
 	$(top_srcdir)/../m4/kpse-poppler-flags.m4 \
 	$(top_srcdir)/../m4/kpse-ptexenc-flags.m4 \
@@ -141,6 +143,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../libs/zziplib/ac/withenable.ac \
 	$(top_srcdir)/../libs/xpdf/ac/withenable.ac \
 	$(top_srcdir)/../libs/poppler/ac/withenable.ac \
+	$(top_srcdir)/../libs/cairo/ac/withenable.ac \
+	$(top_srcdir)/../libs/pixman/ac/withenable.ac \
 	$(top_srcdir)/../libs/gd/ac/withenable.ac \
 	$(top_srcdir)/../libs/freetype2/ac/withenable.ac \
 	$(top_srcdir)/../libs/freetype/ac/withenable.ac \
diff --git a/Build/source/utils/aclocal.m4 b/Build/source/utils/aclocal.m4
index b4de49d7f48..4bcf9b5f511 100644
--- a/Build/source/utils/aclocal.m4
+++ b/Build/source/utils/aclocal.m4
@@ -980,6 +980,7 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../m4/kpse-cairo-flags.m4])
 m4_include([../m4/kpse-common.m4])
 m4_include([../m4/kpse-cxx-hack.m4])
 m4_include([../m4/kpse-freetype-flags.m4])
@@ -992,6 +993,7 @@ m4_include([../m4/kpse-libpng-flags.m4])
 m4_include([../m4/kpse-lt-hack.m4])
 m4_include([../m4/kpse-mktex.m4])
 m4_include([../m4/kpse-options.m4])
+m4_include([../m4/kpse-pixman-flags.m4])
 m4_include([../m4/kpse-pkgs.m4])
 m4_include([../m4/kpse-poppler-flags.m4])
 m4_include([../m4/kpse-ptexenc-flags.m4])
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 3517beaa910..50f096bcdfa 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -804,6 +804,8 @@ with_system_graphite
 with_system_zziplib
 with_system_xpdf
 with_system_poppler
+with_system_cairo
+with_system_pixman
 with_system_gd
 with_gd_includes
 with_gd_libdir
@@ -1634,6 +1636,10 @@ Optional Packages:
                           xpdf library from TL (requires pkg-config)
   --with-system-poppler   use installed poppler headers and library (requires
                           pkg-config)
+  --with-system-cairo     use installed cairo headers and library (requires
+                          pkg-config)
+  --with-system-pixman    use installed pixman headers and library (requires
+                          pkg-config)
   --with-system-gd        use installed gd headers and library
   --with-gd-includes=DIR  gd headers installed in DIR
   --with-gd-libdir=DIR    gd library installed in DIR
@@ -4827,6 +4833,62 @@ test "x$need_poppler" = xyes && {
 }
 
 
+## libs/cairo/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/cairo/
+## configure options and TL libraries required for cairo
+
+# Check whether --with-system-cairo was given.
+if test "${with_system_cairo+set}" = set; then :
+  withval=$with_system_cairo;
+fi
+if test "x$with_system_cairo" = x; then
+  if test -f $srcdir/../libs/cairo/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`cairo' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`cairo' headers and library from TL tree" >&6;}
+    with_system_cairo=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`cairo' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`cairo' headers and library" >&6;}
+    with_system_cairo=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-cairo=$with_system_cairo'"
+fi
+if test "x$with_system_cairo" = xyes; then
+  if test "x$with_system_pixman" = x; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}:   ->  installed \`pixman' headers and library" >&5
+$as_echo "$as_me:   ->  installed \`pixman' headers and library" >&6;}
+    with_system_pixman=yes
+    ac_configure_args="$ac_configure_args '--with-system-pixman'"
+  elif test "x$with_system_pixman" != xyes; then
+    as_fn_error $? "Sorry, \`--with-system-cairo' requires \`--with-system-pixman'" "$LINENO" 5
+  fi
+fi
+
+test "x$need_cairo" = xyes && {
+  need_pixman=yes
+}
+
+
+## libs/pixman/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pixman/
+## configure options and TL libraries required for pixman
+
+# Check whether --with-system-pixman was given.
+if test "${with_system_pixman+set}" = set; then :
+  withval=$with_system_pixman;
+fi
+if test "x$with_system_pixman" = x; then
+  if test -f $srcdir/../libs/pixman/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`pixman' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`pixman' headers and library from TL tree" >&6;}
+    with_system_pixman=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`pixman' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`pixman' headers and library" >&6;}
+    with_system_pixman=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-pixman=$with_system_pixman'"
+fi
+
+
 ## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
 ## configure options and TL libraries required for gd