summaryrefslogtreecommitdiff
path: root/Build/source/m4/kpse-web2c.m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-07-20 07:00:05 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-07-20 07:00:05 +0000
commit89755f7344de571c4b1b7c68e90de39363a4d1ff (patch)
treed735587f7030f0536272048df7a4b53cefc133a4 /Build/source/m4/kpse-web2c.m4
parent713aef9b071ca2b5dd68d014e99897f0e5e2036c (diff)
libs/t1lib + texk/ps2pkm: bug fix and update
git-svn-id: svn://tug.org/texlive/trunk@23187 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4/kpse-web2c.m4')
-rw-r--r--Build/source/m4/kpse-web2c.m455
1 files changed, 21 insertions, 34 deletions
diff --git a/Build/source/m4/kpse-web2c.m4 b/Build/source/m4/kpse-web2c.m4
index 0f30a2a270a..2a108f8b0ff 100644
--- a/Build/source/m4/kpse-web2c.m4
+++ b/Build/source/m4/kpse-web2c.m4
@@ -1,52 +1,33 @@
# Private macros for the TeX Live (TL) tree.
-# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2011 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_WEB2C_PREPARE
# ------------------
# AC_DEFUN'ed so it can enforce inclusion of this file.
AC_DEFUN([KPSE_WEB2C_PREPARE], [])
-# KPSE_WITH_MKTEX(PROG, YES-OR-NO, TEXT, STEM)
-# --------------------------------------------
-# Provide configure options --enable-mktex*-default and normalize result.
-m4_define([KPSE_WITH_MKTEX],
-[AC_ARG_ENABLE([$1-default],
- AS_HELP_STRING([--]m4_if($2, [yes], [dis], [en])[able-$1-default],
- m4_if($2, [yes],
- [do not ])[run $1 if $3 missing],
- m4_eval(kpse_indent_26+2)))[]dnl
-AS_CASE([$enable_$1_default], [yes|no], ,
- [enable_$1_default=$2])
-]) # KPSE_WITH_MKTEX
-
-# KPSE_MKTEX_DEFINE(PROG, YES-OR-NO, TEXT, STEM)
-# ----------------------------------------------
-# Defines for enable-mktex*-default
-m4_define([KPSE_MKTEX_DEFINE],
-[AS_IF([test "x$enable_$1_default" = xyes],
- [AC_DEFINE([MAKE_$4_BY_DEFAULT], 1,
- [Define to 1 if you want to run $1 if $3 is missing,
- and to 0 if you don't])],
- [AC_DEFINE([MAKE_$4_BY_DEFAULT], 0)])
-]) # KPSE_MKTEX_DEFINE
-
# KPSE_WITH_XTEX(PROG, BUILD-OR-NO, SYNC-OR-NO, TEXT, REQUIRED-LIBS)
# ------------------------------------------------------------------
-# Provide configure options --enable-*tex and normalize result.
+# Provide and normalize the configure options --enable-*tex.
m4_define([KPSE_WITH_XTEX],
[AC_ARG_ENABLE([$1],
- AS_HELP_STRING([--]m4_if($2, [yes], [dis], [en])[able-$1],
- m4_if($2, [yes],
+ AS_HELP_STRING([--]m4_if([$2], [yes], [dis], [en])[able-$1],
+ m4_if([$2], [yes],
[do not ])[compile and install $4],
kpse_indent_26))[]dnl
-AS_CASE([$enable_$1], [yes|no], ,
- [enable_$1=$2])
+AS_CASE([$enable_$1],
+ [yes | no], ,
+ [enable_$1=$2])
+m4_ifval([$3], [
+AC_ARG_ENABLE([$1-synctex],
+ AS_HELP_STRING([--]m4_if([$3], [yes], [dis], [en])[able-$1-synctex],
+ [build $4 with]m4_if([$3], [yes], [out])[ SyncTeX support],
+ m4_eval(kpse_indent_26+2)))[]dnl
+])[]dnl m4_ifval
m4_ifval([$5], [
test "x$enable_web2c:$enable_$1" = xyes:yes && {
AC_FOREACH([Kpse_Lib], [$5], [ need_[]AS_TR_SH(Kpse_Lib)=yes
@@ -56,10 +37,16 @@ AC_FOREACH([Kpse_Lib], [$5], [ need_[]AS_TR_SH(Kpse_Lib)=yes
# KPSE_XTEX_COND(PROG, BUILD-OR-NO, SYNC-OR-NO, TEXT, REQUIRED-LIBS)
# ------------------------------------------------------------------
-# Conditionals for --with-*tex
+# Normalize --enable-*tex-synctex configure option and build conditionals.
m4_define([KPSE_XTEX_COND],
[AM_CONDITIONAL(AS_TR_CPP($1), [test "x$enable_$1" = xyes])[]dnl
-AM_CONDITIONAL(AS_TR_CPP($1)[_SYNCTEX], m4_if([$3], [yes], [true], [false]))[]dnl
+m4_ifval([$3], [
+AS_CASE([$enable_native_texlive_build:$enable_$1_synctex],
+ [yes:$3 | no:yes | no:no], ,
+ [enable_$1_synctex=$3
+ AC_MSG_WARN([Enforcing `--enable-$1-synctex=$3' (native TeX Live build)])])
+AM_CONDITIONAL(AS_TR_CPP($1)[_SYNCTEX], [test "x$enable_$1_synctex" = xyes])[]dnl
+])[]dnl m4_ifval
]) # KPSE_XTEX_COND
# KPSE_WITH_MFWIN(WINDOW, DEFINE, TEXT)