diff options
author | Taco Hoekwater <taco@elvenkind.com> | 2011-04-12 14:17:47 +0000 |
---|---|---|
committer | Taco Hoekwater <taco@elvenkind.com> | 2011-04-12 14:17:47 +0000 |
commit | 307453997ef030ec4dfa1e876feaf0b8b8125bab (patch) | |
tree | ab2054693ba95e9ac8f6e3478b4d0175d893329f /Build/source/m4 | |
parent | d95b11a25d3d9e17cc4afb9c8713ef4037567527 (diff) |
check in luatex 0.66.0
git-svn-id: svn://tug.org/texlive/trunk@22059 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r-- | Build/source/m4/kpse-pkgs.m4 | 2 | ||||
-rw-r--r-- | Build/source/m4/kpse-poppler-flags.m4 | 44 |
2 files changed, 46 insertions, 0 deletions
diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4 index 42bea6d2286..01efcd12830 100644 --- a/Build/source/m4/kpse-pkgs.m4 +++ b/Build/source/m4/kpse-pkgs.m4 @@ -31,6 +31,7 @@ teckit graphite zziplib xpdf +poppler gd freetype2 freetype @@ -60,6 +61,7 @@ AC_REQUIRE([KPSE_FREETYPE_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_FREETYPE2_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_GD_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_XPDF_SYSTEM_FLAGS])[]dnl +AC_REQUIRE([KPSE_POPPLER_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_ZZIPLIB_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_GRAPHITE_SYSTEM_FLAGS])[]dnl AC_REQUIRE([KPSE_TECKIT_SYSTEM_FLAGS])[]dnl diff --git a/Build/source/m4/kpse-poppler-flags.m4 b/Build/source/m4/kpse-poppler-flags.m4 new file mode 100644 index 00000000000..7ff257ab236 --- /dev/null +++ b/Build/source/m4/kpse-poppler-flags.m4 @@ -0,0 +1,44 @@ +# Public macros for the TeX Live (TL) tree. +# Copyright (C) 2009, 2010 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. + +# serial 0 + +# KPSE_POPPLER_FLAGS +# --------------- +# Provide the configure option '--with-system-poppler' (if in the TL tree). +# +# Set the make variables XPDF_INCLUDES and XPDF_LIBS to the CPPFLAGS and +# LIBS required for the `-lxpdf' library in libs/poppler/ of the TL tree. +AC_DEFUN([KPSE_POPPLER_FLAGS], +[_KPSE_LIB_FLAGS([poppler], [poppler], [], + [-DPDF_PARSER_ONLY -IBLD/libs/poppler -IBLD/libs/poppler/goo -IBLD/libs/poppler/poppler], + [BLD/libs/poppler/libpoppler.a], [], + [], [${top_builddir}/../../libs/poppler/poppler/Stream.h])[]dnl +]) # KPSE_POPPLER_FLAGS + +# KPSE_POPPLER_OPTIONS([WITH-SYSTEM]) +# -------------------------------- +AC_DEFUN([KPSE_POPPLER_OPTIONS], +[m4_ifval([$1], + [AC_ARG_WITH([system-poppler], + AS_HELP_STRING([--with-system-poppler], + [use installed poppler headers and library instead of poppler + (requires pkg-config)]))])[]dnl +]) # KPSE_POPPLER_OPTIONS + +# KPSE_POPPLER_SYSTEM_FLAGS +# ---------------------- +AC_DEFUN([KPSE_POPPLER_SYSTEM_FLAGS], +[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl +if $PKG_CONFIG poppler --atleast-version=0.10; 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.10 or better]) +fi +]) # KPSE_POPPLER_SYSTEM_FLAGS |