diff options
Diffstat (limited to 'Build/source/texk')
-rwxr-xr-x | Build/source/texk/bibtexu/configure | 6 | ||||
-rwxr-xr-x | Build/source/texk/dvipdfmx/configure | 12 | ||||
-rwxr-xr-x | Build/source/texk/dvipng/configure | 12 | ||||
-rwxr-xr-x | Build/source/texk/dvisvgm/configure | 6 | ||||
-rwxr-xr-x | Build/source/texk/web2c/configure | 24 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeX_ext.c | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeX_mac.c | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/xetex.h | 2 | ||||
-rwxr-xr-x | Build/source/texk/xdvipdfmx/configure | 12 |
10 files changed, 46 insertions, 39 deletions
diff --git a/Build/source/texk/bibtexu/configure b/Build/source/texk/bibtexu/configure index 5f760e372d0..064d940328e 100755 --- a/Build/source/texk/bibtexu/configure +++ b/Build/source/texk/bibtexu/configure @@ -17447,7 +17447,7 @@ elif test "x$need_icu:$with_system_icu" = 'xyes:yes'; then as_fn_error "did not find icu-config required for system icu libraries" "$LINENO" 5 fi else - ICU_INCLUDES=`echo '-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/icu-incl' | sed \ + ICU_INCLUDES=`echo '-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` ICU_LIBS=`echo 'BLD/libs/icu/icu-build/lib/libsicuio.a BLD/libs/icu/icu-build/lib/libsicui18n.a BLD/libs/icu/icu-build/lib/libsicuuc.a BLD/libs/icu/icu-build/lib/libsicudata.a' | sed \ @@ -17456,9 +17456,9 @@ else ICU_DEPEND=`echo 'BLD/libs/icu/icu-build/lib/libsicuio.a BLD/libs/icu/icu-build/lib/libsicui18n.a BLD/libs/icu/icu-build/lib/libsicuuc.a BLD/libs/icu/icu-build/lib/libsicudata.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ICU_RULE='# Rebuild libicuxxx -$(ICU_DEPEND): ${top_builddir}/../../libs/icu/icu-incl/unicode/uversion.h +$(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/icu/icu-incl/unicode/uversion.h: +${top_builddir}/../../libs/icu/include/unicode/uversion.h: cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure index 4adfb2af7d2..d6999595c36 100755 --- a/Build/source/texk/dvipdfmx/configure +++ b/Build/source/texk/dvipdfmx/configure @@ -13845,7 +13845,7 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib' | sed \ + ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ @@ -13854,9 +13854,9 @@ else ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ZLIB_RULE='# Rebuild libz -$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h +$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h: +${top_builddir}/../../libs/zlib/include/zconf.h: cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi @@ -13885,7 +13885,7 @@ if test "x$with_libpng_libdir" != x && test "x$with_libpng_libdir" != xyes; then LIBPNG_LIBS="-L$with_libpng_libdir $LIBPNG_LIBS" fi else - LIBPNG_INCLUDES=`echo '-IBLD/libs/libpng' | sed \ + LIBPNG_INCLUDES=`echo '-IBLD/libs/libpng/include' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ @@ -13894,9 +13894,9 @@ else LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` LIBPNG_RULE='# Rebuild libpng -$(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h +$(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/include/png.h cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h: +${top_builddir}/../../libs/libpng/include/png.h: cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index 014493a98ad..a0b08f94424 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -14688,7 +14688,7 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib' | sed \ + ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ @@ -14697,9 +14697,9 @@ else ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ZLIB_RULE='# Rebuild libz -$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h +$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h: +${top_builddir}/../../libs/zlib/include/zconf.h: cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi @@ -14728,7 +14728,7 @@ if test "x$with_libpng_libdir" != x && test "x$with_libpng_libdir" != xyes; then LIBPNG_LIBS="-L$with_libpng_libdir $LIBPNG_LIBS" fi else - LIBPNG_INCLUDES=`echo '-IBLD/libs/libpng' | sed \ + LIBPNG_INCLUDES=`echo '-IBLD/libs/libpng/include' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ @@ -14737,9 +14737,9 @@ else LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` LIBPNG_RULE='# Rebuild libpng -$(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h +$(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/include/png.h cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h: +${top_builddir}/../../libs/libpng/include/png.h: cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure index 6caabe52475..cef607a01f0 100755 --- a/Build/source/texk/dvisvgm/configure +++ b/Build/source/texk/dvisvgm/configure @@ -17434,7 +17434,7 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib' | sed \ + ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ @@ -17443,9 +17443,9 @@ else ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ZLIB_RULE='# Rebuild libz -$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h +$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h: +${top_builddir}/../../libs/zlib/include/zconf.h: cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 73a8e2d4db2..fb76fdca4c7 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -20337,7 +20337,7 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib' | sed \ + ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ @@ -20346,9 +20346,9 @@ else ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ZLIB_RULE='# Rebuild libz -$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h +$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h: +${top_builddir}/../../libs/zlib/include/zconf.h: cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi @@ -20377,7 +20377,7 @@ if test "x$with_libpng_libdir" != x && test "x$with_libpng_libdir" != xyes; then LIBPNG_LIBS="-L$with_libpng_libdir $LIBPNG_LIBS" fi else - LIBPNG_INCLUDES=`echo '-IBLD/libs/libpng' | sed \ + LIBPNG_INCLUDES=`echo '-IBLD/libs/libpng/include' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ @@ -20386,9 +20386,9 @@ else LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` LIBPNG_RULE='# Rebuild libpng -$(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h +$(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/include/png.h cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h: +${top_builddir}/../../libs/libpng/include/png.h: cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi @@ -20598,7 +20598,7 @@ if test "x$with_teckit_libdir" != x && test "x$with_teckit_libdir" != xyes; then TECKIT_LIBS="-L$with_teckit_libdir $TECKIT_LIBS" fi else - TECKIT_INCLUDES=`echo '-IBLD/libs/teckit/teckit' | sed \ + TECKIT_INCLUDES=`echo '-IBLD/libs/teckit/include' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` TECKIT_LIBS=`echo 'BLD/libs/teckit/libTECkit.a' | sed \ @@ -20607,14 +20607,14 @@ else TECKIT_DEPEND=`echo 'BLD/libs/teckit/libTECkit.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` TECKIT_RULE='# Rebuild libTECkit -$(TECKIT_DEPEND): ${top_builddir}/../../libs/teckit/teckit/TECkit_Common.h +$(TECKIT_DEPEND): ${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/teckit/teckit/TECkit_Common.h: +${top_builddir}/../../libs/teckit/include/teckit/TECkit_Common.h: cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi ## _KPSE_LIB_FLAGS: Setup icu (-lsicuxxx) flags - ICU_INCLUDES=`echo '-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/icu-incl' | sed \ + ICU_INCLUDES=`echo '-DU_STATIC_IMPLEMENTATION -IBLD/libs/icu/include' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` ICU_LIBS=`echo 'BLD/libs/icu/icu-build/lib/libsicule.a BLD/libs/icu/icu-build/lib/libsicuuc.a BLD/libs/icu/icu-build/lib/libsicudata.a' | sed \ @@ -20623,9 +20623,9 @@ fi ICU_DEPEND=`echo 'BLD/libs/icu/icu-build/lib/libsicule.a BLD/libs/icu/icu-build/lib/libsicuuc.a BLD/libs/icu/icu-build/lib/libsicudata.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ICU_RULE='# Rebuild libsicuxxx -$(ICU_DEPEND): ${top_builddir}/../../libs/icu/icu-incl/unicode/uversion.h +$(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/icu/icu-incl/unicode/uversion.h: +${top_builddir}/../../libs/icu/include/unicode/uversion.h: cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild' ## _KPSE_LIB_FLAGS: Setup obsdcompat (-lopenbsd-compat) flags diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index df26ef3e887..2664ea211d8 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -1,3 +1,10 @@ +2009-11-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * XeTeX_ext.c, XeTeX_mac.c: #include <teckit/TECkit_Engine.h> + instead of "TECkit_Engine.h". + * xetex.h: #include <teckit/TECkit_Common.h> instead of + "TECkit_Common.h". + 2009-10-25 Peter Breitenlohner <peb@mppmu.mpg.de> * XeTeXOTLayoutEngine,{cpp,h}: Adjust to ICU-4.2.1. diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c index 4fbb13986db..5394c431eed 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c +++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c @@ -63,7 +63,7 @@ authorization from the copyright holders. #include <ft2build.h> #include FT_FREETYPE_H -#include "TECkit_Engine.h" +#include <teckit/TECkit_Engine.h> #include <kpathsea/c-ctype.h> #include <kpathsea/line.h> diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_mac.c b/Build/source/texk/web2c/xetexdir/XeTeX_mac.c index b3202c283e5..2bedefe6bc7 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeX_mac.c +++ b/Build/source/texk/web2c/xetexdir/XeTeX_mac.c @@ -47,7 +47,7 @@ authorization from the copyright holders. #include <Carbon/Carbon.h> #include <QuickTime/QuickTime.h> -#include "TECkit_Engine.h" +#include <teckit/TECkit_Engine.h> #include "XeTeX_ext.h" #include "XeTeXLayoutInterface.h" diff --git a/Build/source/texk/web2c/xetexdir/xetex.h b/Build/source/texk/web2c/xetexdir/xetex.h index 3ceb847bfc8..65be0c705c1 100644 --- a/Build/source/texk/web2c/xetexdir/xetex.h +++ b/Build/source/texk/web2c/xetexdir/xetex.h @@ -101,6 +101,6 @@ void* getotassemblyptr(int f, int g, int horiz); /* function in XeTeXOTMath.cpp #include "trans.h" /* functions for affine transform operations */ #define Byte my_Byte /* hack to work around typedef conflict with zlib */ -#include "TECkit_Common.h" /* include this before XeTeX_ext.h */ +#include <teckit/TECkit_Common.h> /* include this before XeTeX_ext.h */ #undef Byte #include "XeTeX_ext.h" /* other extension functions */ diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure index 4c6ff4481f5..6b7284832d0 100755 --- a/Build/source/texk/xdvipdfmx/configure +++ b/Build/source/texk/xdvipdfmx/configure @@ -13885,7 +13885,7 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib' | sed \ + ZLIB_INCLUDES=`echo '-IBLD/libs/zlib/include' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ @@ -13894,9 +13894,9 @@ else ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` ZLIB_RULE='# Rebuild libz -$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h +$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h: +${top_builddir}/../../libs/zlib/include/zconf.h: cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi @@ -13925,7 +13925,7 @@ if test "x$with_libpng_libdir" != x && test "x$with_libpng_libdir" != xyes; then LIBPNG_LIBS="-L$with_libpng_libdir $LIBPNG_LIBS" fi else - LIBPNG_INCLUDES=`echo '-IBLD/libs/libpng' | sed \ + LIBPNG_INCLUDES=`echo '-IBLD/libs/libpng/include' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ @@ -13934,9 +13934,9 @@ else LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ -e 's,BLD/,${top_builddir}/../../,g'` LIBPNG_RULE='# Rebuild libpng -$(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h +$(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/include/png.h cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h: +${top_builddir}/../../libs/libpng/include/png.h: cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi |