summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-10-25 08:53:49 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-10-25 08:53:49 +0000
commitedc3291a11eb0048e750f5861e9dd447a7e959a4 (patch)
treef00a5ea83a3c0b66c0cd4b7ef86f227c2562ecb0 /Build/source/m4
parent68440ee4d894f56b49a82533ecb3f215964bc5b1 (diff)
Update libs/paper and use it for dvipdfm-x
git-svn-id: svn://tug.org/texlive/trunk@31994 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/kpse-libpaper.m449
-rw-r--r--Build/source/m4/kpse-paper-flags.m44
2 files changed, 2 insertions, 51 deletions
diff --git a/Build/source/m4/kpse-libpaper.m4 b/Build/source/m4/kpse-libpaper.m4
deleted file mode 100644
index 36703b446fc..00000000000
--- a/Build/source/m4/kpse-libpaper.m4
+++ /dev/null
@@ -1,49 +0,0 @@
-# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 1998-2008 Jin-Hwan Cho <chofchof@ktug.or.kr>
-# Copyright (C) 2008-2013 Peter Breitenlohner <tex-live@tug.org>
-#
-# This file is free software; the copyright holders
-# give unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# KPSE_LIBPAPER
-# -------------
-# Provide the configure options '--with-paper-includes', '--with-paper-libdir'
-# and check for the ortional libpaper. If found define HAVE_LIBPAPER.
-# Set the make variables PAPER_INCLUDES and PAPER_LIBS to the CPPFLAGS and
-# LIBS required for the installed (system) library.
-AC_DEFUN([KPSE_LIBPAPER], [dnl
-AC_REQUIRE([KPSE_SAVE_FLAGS])
-AC_ARG_WITH([paper-includes],
- AS_HELP_STRING([--with-paper-includes=DIR],
- [paper headers installed in DIR]))[]dnl
-AC_ARG_WITH([paper-libdir],
- AS_HELP_STRING([--with-paper-libdir=DIR],
- [paper library installed in DIR]))[]dnl
-AS_CASE([$with_paper_includes],
- ["" | yes], [PAPER_INCLUDES=],
- [PAPER_INCLUDES="-I$with_paper_includes"])
-AS_CASE([$with_paper_libdir],
- ["" | yes], [PAPER_LIBS=],
- [PAPER_LIBS="-L$with_paper_libdir"])
-CPPFLAGS="$CPPFLAGS $PAPER_INCLUDES"
-LIBS="$LIBS $PAPER_LIBS"
-AC_MSG_CHECKING([for paper header files])
-result=no
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <paper.h>]],
- [[struct paper *p;]])],
- [AC_SEARCH_LIBS([paperpswidth], [paper])
- AS_CASE([$ac_cv_search_paperpswidth],
- [no], [:],
- ["none required"], [result=yes],
- [result=yes
- PAPER_LIBS="$PAPER_LIBS $ac_cv_search_paperpswidth"])])
-AS_CASE([$result],
- [no], [PAPER_INCLUDES= PAPER_LIBS=],
- [AC_DEFINE([HAVE_LIBPAPER], 1, [Define if you have libpaper])])
-AC_MSG_RESULT([$result])
-AC_SUBST([PAPER_INCLUDES])
-AC_SUBST([PAPER_LIBS])
-KPSE_RESTORE_FLAGS
-])# KPSE_LIBPAPER
-
diff --git a/Build/source/m4/kpse-paper-flags.m4 b/Build/source/m4/kpse-paper-flags.m4
index b29e2953815..c8e0e761e6e 100644
--- a/Build/source/m4/kpse-paper-flags.m4
+++ b/Build/source/m4/kpse-paper-flags.m4
@@ -15,7 +15,7 @@
AC_DEFUN([KPSE_PAPER_FLAGS], [dnl
AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
_KPSE_LIB_FLAGS([paper], [paper], [],
- [-IBLD/libs/paper/include], [BLD/libs/paper/libz.a], [],
+ [-IBLD/libs/paper/include], [BLD/libs/paper/libpaper.a], [],
[], [${top_builddir}/../../libs/paper/include/paper.h])[]dnl
]) # KPSE_PAPER_FLAGS
@@ -25,4 +25,4 @@ AC_DEFUN([KPSE_PAPER_OPTIONS], [_KPSE_LIB_OPTIONS([paper], [$1])])
# KPSE_PAPER_SYSTEM_FLAGS
# ----------------------
-AC_DEFUN([KPSE_PAPER_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([paper], [z])])
+AC_DEFUN([KPSE_PAPER_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([paper], [paper])])