summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-04-15 15:04:45 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-04-15 15:04:45 +0000
commit440f3a0a24a2061ba24309a1c5538be6ecd4e74a (patch)
tree1e9be1bef248ac63c94d05b11c816c1ebb1da6e2 /Build/source/m4
parentbaca7ad14b15829e67151e08e25e35b916046c4e (diff)
build system: reorganize TeX specific libraries
git-svn-id: svn://tug.org/texlive/trunk@17878 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/kpse-pkgs.m416
-rw-r--r--Build/source/m4/kpse-setup.m42
2 files changed, 14 insertions, 4 deletions
diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4
index 9af39fc6db5..2419c02c2f8 100644
--- a/Build/source/m4/kpse-pkgs.m4
+++ b/Build/source/m4/kpse-pkgs.m4
@@ -16,10 +16,16 @@
# KPSE_LIBS_PKGS()
# ----------------
-# Define the list of library sub-packages, i.e., subdirs 'libs/*'.
+# Define two lists of library sub-packages:
+# generic libraries, i.e., subdirs 'libs/*', that can be used by
+# utility and TeXk sub-packages
+# and
+# TeX specific libraries, i.e., subdirs 'texk/*', that can only
+# be used by TeXk sub-packages and can't use generic libraries
# Each library must precede required other libraries (if any).
AC_DEFUN([KPSE_LIBS_PKGS],
-[m4_define([kpse_libs_pkgs], [
+[dnl generic libraries 'libs/*'
+m4_define([kpse_libs_pkgs], [
icu
teckit
graphite
@@ -32,6 +38,11 @@ t1lib
obsdcompat
libpng
zlib
+])[]dnl
+dnl TeX specific libraries
+m4_define([kpse_texlibs_pkgs], [
+ptexenc
+kpathsea
])]) # KPSE_LIBS_PKGS
# KPSE_ALL_SYSTEM_FLAGS()
@@ -76,7 +87,6 @@ xindy
# excluding 'texk/kpathsea'.
AC_DEFUN([KPSE_TEXK_PKGS],
[m4_define([kpse_texk_pkgs], [
-ptexenc
web2c
afm2pl
bibtex8
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index fec25a13f4d..25ea1825288 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -72,8 +72,8 @@ AS_CASE([$with_x],
ac_configure_args="$ac_configure_args '--with-x'"])
KPSE_FOR_PKGS([utils], [m4_sinclude(kpse_TL[utils/]Kpse_Pkg[/ac/withenable.ac])])
KPSE_FOR_PKGS([texk], [m4_sinclude(kpse_TL[texk/]Kpse_Pkg[/ac/withenable.ac])])
-m4_sinclude(kpse_TL[texk/kpathsea/ac/withenable.ac])
KPSE_FOR_PKGS([libs], [m4_sinclude(kpse_TL[libs/]Kpse_Pkg[/ac/withenable.ac])])
+KPSE_FOR_PKGS([texlibs], [m4_sinclude(kpse_TL[texk/]Kpse_Pkg[/ac/withenable.ac])])
]) # KPSE_SETUP
# KPSE_ENABLE_PROG(PROG, REQUIRED-LIBS, OPTIONS, [COMMENT])