diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-20 09:15:29 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-20 09:15:29 +0000 |
| commit | ac005f402389542b123fd41fd9fc54322f3becf1 (patch) | |
| tree | 6234c1b385dd10b6716c676108ecf68856ea7480 /Build/source/m4 | |
| parent | 9301a1dd22ac8cedf4f7f980c96ef9e4f2bd37c2 (diff) | |
somewhat reorganize libs build system
git-svn-id: svn://tug.org/texlive/trunk@16091 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
| -rw-r--r-- | Build/source/m4/kpse-icu-flags.m4 | 4 | ||||
| -rw-r--r-- | Build/source/m4/kpse-libpng-flags.m4 | 4 | ||||
| -rw-r--r-- | Build/source/m4/kpse-teckit-flags.m4 | 4 | ||||
| -rw-r--r-- | Build/source/m4/kpse-zlib-flags.m4 | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/Build/source/m4/kpse-icu-flags.m4 b/Build/source/m4/kpse-icu-flags.m4 index 090ba787b57..6b966d4468c 100644 --- a/Build/source/m4/kpse-icu-flags.m4 +++ b/Build/source/m4/kpse-icu-flags.m4 @@ -37,12 +37,12 @@ AC_DEFUN([KPSE_ICU_XETEX_FLAGS], # MORE-ICU-LIBS: icu libraries from the TL in addition to icuuc and icudata. m4_define([_KPSE_ICU_FLAGS], [_KPSE_LIB_FLAGS([icu], [$1], [$2], - [-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/icu-incl], + [-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include], m4_bpatsubst([$3 icuuc icudata], [icu\([18a-z]*\)], [BLD/libs/icu/icu-build/lib/libsicu\1.a]), [], - [], [${top_builddir}/../../libs/icu/icu-incl/unicode/uversion.h])[]dnl + [], [${top_builddir}/../../libs/icu/include/unicode/uversion.h])[]dnl ]) # _KPSE_ICU_FLAGS # KPSE_ICU_OPTIONS([WITH-SYSTEM]) diff --git a/Build/source/m4/kpse-libpng-flags.m4 b/Build/source/m4/kpse-libpng-flags.m4 index 9a1e2a974ee..a9283884b0f 100644 --- a/Build/source/m4/kpse-libpng-flags.m4 +++ b/Build/source/m4/kpse-libpng-flags.m4 @@ -17,8 +17,8 @@ AC_DEFUN([KPSE_LIBPNG_FLAGS], [AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl _KPSE_LIB_FLAGS([libpng], [png], [], - [-IBLD/libs/libpng], [BLD/libs/libpng/libpng.a], [], - [], [${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h])[]dnl + [-IBLD/libs/libpng/include], [BLD/libs/libpng/libpng.a], [], + [], [${top_builddir}/../../libs/libpng/include/png.h])[]dnl ]) # KPSE_LIBPNG_FLAGS # KPSE_LIBPNG_OPTIONS([WITH-SYSTEM]) diff --git a/Build/source/m4/kpse-teckit-flags.m4 b/Build/source/m4/kpse-teckit-flags.m4 index d0e225ac9d2..52f5d13a0f7 100644 --- a/Build/source/m4/kpse-teckit-flags.m4 +++ b/Build/source/m4/kpse-teckit-flags.m4 @@ -17,8 +17,8 @@ AC_DEFUN([KPSE_TECKIT_FLAGS], [AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl _KPSE_LIB_FLAGS([teckit], [TECkit], [], - [-IBLD/libs/teckit/teckit], [BLD/libs/teckit/libTECkit.a], [], - [], [${top_builddir}/../../libs/teckit/teckit/TECkit_Common.h])[]dnl + [-IBLD/libs/teckit/include], [BLD/libs/teckit/libTECkit.a], [], + [], [${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h])[]dnl ]) # KPSE_TECKIT_FLAGS # KPSE_TECKIT_OPTIONS([WITH-SYSTEM]) diff --git a/Build/source/m4/kpse-zlib-flags.m4 b/Build/source/m4/kpse-zlib-flags.m4 index 15966a6bfb4..d442e941ff0 100644 --- a/Build/source/m4/kpse-zlib-flags.m4 +++ b/Build/source/m4/kpse-zlib-flags.m4 @@ -16,8 +16,8 @@ # LIBS required for the `-lz' library in libs/zlib/ of the TL tree. AC_DEFUN([KPSE_ZLIB_FLAGS], [_KPSE_LIB_FLAGS([zlib], [z], [], - [-IBLD/libs/zlib], [BLD/libs/zlib/libz.a], [], - [], [${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h])[]dnl + [-IBLD/libs/zlib/include], [BLD/libs/zlib/libz.a], [], + [], [${top_builddir}/../../libs/zlib/include/zconf.h])[]dnl ]) # KPSE_ZLIB_FLAGS # KPSE_ZLIB_OPTIONS([WITH-SYSTEM]) |