From e88aafe4ca4779a73487925dea63e8b55dc5e251 Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Wed, 26 Jul 2006 09:19:11 +0000 Subject: added teckit support to configure/make scripts git-svn-id: svn://tug.org/texlive/trunk@1919 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/Makefile.in | 3 + Build/source/configure | 138 +++++++++++++++++++++++++---------------- Build/source/configure.in | 13 +++- Build/source/libs/configure | 21 +++++++ Build/source/libs/configure.in | 4 ++ 5 files changed, 123 insertions(+), 56 deletions(-) (limited to 'Build') diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in index 3a3cc9dce14..e5cc335fa5a 100644 --- a/Build/source/Makefile.in +++ b/Build/source/Makefile.in @@ -40,6 +40,7 @@ GDDIR=libs/gd FREETYPEDIR=libs/freetype FREETYPE2DIR=libs/freetype2 ICUDIR=libs/icu-xetex +TECKITDIR=libs/teckit # Subdirectories that have makefiles ESUBDIRS = @ESUBDIRS@ texk @@ -172,6 +173,8 @@ $(FREETYPE2DIR)/.libs/libfreetype.a: cd $(FREETYPE2DIR); $(MAKE) $(ICUDIR)/lib/libsicuuc.a $(ICUDIR)/lib/libsicule.a $(ICUDIR)/lib/libsicudata.a: cd $(ICUDIR); $(MAKE) +$(TECKITDIR)/lib/.libs/libTECkit.a: + cd $(TECKITDIR); $(MAKE) # Prevent GNU make v3 from overflowing arg limit on SysV. .NOEXPORT: diff --git a/Build/source/configure b/Build/source/configure index 0dda9e49ab9..7a28d03cd89 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -3329,6 +3329,8 @@ if test "${with_icu_include+set}" = set; then fi +# we don't currently support use of an installed teckit lib + NCURSESDIR=libs/ncurses LIBT1DIR=libs/t1lib @@ -3339,6 +3341,7 @@ LIBXPDFDIR=libs/xpdf FREETYPEDIR=libs/freetype FREETYPE2DIR=libs/freetype2 ICUDIR=libs/icu-xetex +TECKITDIR=libs/teckit GDDIR=libs/gd test "$no_x" = yes && { with_xdvik=no; with_oxdvik=no; } @@ -3410,6 +3413,12 @@ test "$with_xetex" != no && : ${needs_icu=yes} : ${needs_icu=no} export needs_icu +# we need teckit for xetex +test ! -d $srcdir/$TECKITDIR && : ${needs_teckit=no} +test "$with_xetex" != no && : ${needs_teckit=yes} +: ${needs_teckit=no} +export needs_teckit + if test "$needs_pnglib" = no; then LIBPNGCPPFLAGS= LDLIBPNG= @@ -3436,7 +3445,7 @@ else if test "$with_system_pnglib" = yes; then echo $ac_n "checking for png_set_read_fn in -lpng""... $ac_c" 1>&6 -echo "configure:3440: checking for png_set_read_fn in -lpng" >&5 +echo "configure:3449: checking for png_set_read_fn in -lpng" >&5 ac_lib_var=`echo png'_'png_set_read_fn | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3444,7 +3453,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3526,7 +3535,7 @@ else if test "$with_system_zlib" = yes; then echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:3530: checking for inflate in -lz" >&5 +echo "configure:3539: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3534,7 +3543,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3581,17 +3590,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3585: checking for $ac_hdr" >&5 +echo "configure:3594: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3677,7 +3686,7 @@ else CURSESCPPFLAGS= if test "$try_ncurses" = yes; then echo $ac_n "checking for wresize in -lncurses""... $ac_c" 1>&6 -echo "configure:3681: checking for wresize in -lncurses" >&5 +echo "configure:3690: checking for wresize in -lncurses" >&5 ac_lib_var=`echo ncurses'_'wresize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3685,7 +3694,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3727,17 +3736,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3731: checking for $ac_hdr" >&5 +echo "configure:3740: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3778,17 +3787,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3782: checking for $ac_hdr" >&5 +echo "configure:3791: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3836,17 +3845,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3840: checking for $ac_hdr" >&5 +echo "configure:3849: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3955,7 +3964,7 @@ else if test "$with_system_t1lib" = yes; then echo $ac_n "checking for T1_AddFont in -lt1""... $ac_c" 1>&6 -echo "configure:3959: checking for T1_AddFont in -lt1" >&5 +echo "configure:3968: checking for T1_AddFont in -lt1" >&5 ac_lib_var=`echo t1'_'T1_AddFont | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3963,7 +3972,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lt1 -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4001,13 +4010,13 @@ fi LIBS="-lt1 -lm $LIBS" if test "$with_system_t1lib" = yes; then echo $ac_n "checking whether installed T1 lib is >= v 5.0.0 ""... $ac_c" 1>&6 -echo "configure:4005: checking whether installed T1 lib is >= v 5.0.0 " >&5 +echo "configure:4014: checking whether installed T1 lib is >= v 5.0.0 " >&5 if test "$cross_compiling" = yes; then ac_compile_t1lib=1 ] else cat > conftest.$ac_ext < @@ -4039,7 +4048,7 @@ int main() { } EOF -if { (eval echo configure:4043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_compile_t1lib=0 else @@ -4107,7 +4116,7 @@ else if test "$with_system_gd" = yes; then echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6 -echo "configure:4111: checking for gdImageCreateFromPng in -lgd" >&5 +echo "configure:4120: checking for gdImageCreateFromPng in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4115,7 +4124,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4159,7 +4168,7 @@ fi if test "$with_system_gd" = yes; then echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6 -echo "configure:4163: checking for gdImageGif in -lgd" >&5 +echo "configure:4172: checking for gdImageGif in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageGif | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4167,7 +4176,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4214,17 +4223,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4218: checking for $ac_hdr" >&5 +echo "configure:4227: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4303,7 +4312,7 @@ else if test "$with_system_freetype" = yes; then echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6 -echo "configure:4307: checking for TT_Init_FreeType in -lttf" >&5 +echo "configure:4316: checking for TT_Init_FreeType in -lttf" >&5 ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4311,7 +4320,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lttf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4358,17 +4367,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4362: checking for $ac_hdr" >&5 +echo "configure:4371: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4447,7 +4456,7 @@ else if test "$with_system_freetype2" = yes; then echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6 -echo "configure:4451: checking for FT_Init_FreeType in -lfreetype" >&5 +echo "configure:4460: checking for FT_Init_FreeType in -lfreetype" >&5 ac_lib_var=`echo freetype'_'FT_Init_FreeType | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4455,7 +4464,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfreetype $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4502,17 +4511,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4506: checking for $ac_hdr" >&5 +echo "configure:4515: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4591,7 +4600,7 @@ else if test "$with_system_icu" = yes; then echo $ac_n "checking for ubidi_open in -licuuc""... $ac_c" 1>&6 -echo "configure:4595: checking for ubidi_open in -licuuc" >&5 +echo "configure:4604: checking for ubidi_open in -licuuc" >&5 ac_lib_var=`echo icuuc'_'ubidi_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4599,7 +4608,7 @@ else ac_save_LIBS="$LIBS" LIBS="-licuuc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4646,17 +4655,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4650: checking for $ac_hdr" >&5 +echo "configure:4659: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4709,8 +4718,22 @@ fi +if test "$needs_teckit" = no; then + TECKITCPPFLAGS= + LDTECKIT= + TECKITDEP= +else + TECKITCPPFLAGS='-I$(TECKITSRCDIR)/source/Public-headers' + LDTECKIT='$(TECKITDIR)/lib/.libs/libTECkit.a' + TECKITDEP='$(TECKITDIR)/lib/.libs/libTECkit.a' +fi + + + + + -LIBSDEP="$CURSESDEP $ZLIBDEP $LIBPNGDEP $LIBXPDFDEP $LIBT1DEP $GDDEP $FREETYPEDEP $FREETYPE2DEP $ICUDEP" +LIBSDEP="$CURSESDEP $ZLIBDEP $LIBPNGDEP $LIBXPDFDEP $LIBT1DEP $GDDEP $FREETYPEDEP $FREETYPE2DEP $ICUDEP $TECKITDEP" LIBSDIRS= test "$needs_ncurses" = yes && test "$using_system_ncurses" != yes \ @@ -4731,6 +4754,8 @@ test "$needs_freetype2" = yes && test "$using_system_freetype2" != yes \ && LIBSDIRS="$FREETYPE2DIR $LIBSDIRS" test "$needs_icu" = yes && test "$using_system_icu" != yes \ && LIBSDIRS="$ICUDIR $LIBSDIRS" +test "$needs_teckit" = yes \ + && LIBSDIRS="$TECKITDIR $LIBSDIRS" subdirs="$subdirs libs" @@ -4975,6 +5000,9 @@ s%@FREETYPE2DEP@%$FREETYPE2DEP%g s%@ICUCPPFLAGS@%$ICUCPPFLAGS%g s%@LDICU@%$LDICU%g s%@ICUDEP@%$ICUDEP%g +s%@TECKITCPPFLAGS@%$TECKITCPPFLAGS%g +s%@LDTECKIT@%$LDTECKIT%g +s%@TECKITDEP@%$TECKITDEP%g s%@subdirs@%$subdirs%g s%@ESUBDIRS@%$ESUBDIRS%g s%@LIBSDEP@%$LIBSDEP%g diff --git a/Build/source/configure.in b/Build/source/configure.in index cf8da05bf39..964bc673e0e 100644 --- a/Build/source/configure.in +++ b/Build/source/configure.in @@ -101,6 +101,7 @@ sinclude(libs/gd/withenable.ac) sinclude(libs/freetype/withenable.ac) sinclude(libs/freetype2/withenable.ac) sinclude(libs/icu-xetex/withenable.ac) +sinclude(libs/teckit/withenable.ac) NCURSESDIR=libs/ncurses LIBT1DIR=libs/t1lib @@ -111,6 +112,7 @@ LIBXPDFDIR=libs/xpdf FREETYPEDIR=libs/freetype FREETYPE2DIR=libs/freetype2 ICUDIR=libs/icu-xetex +TECKITDIR=libs/teckit GDDIR=libs/gd test "$no_x" = yes && { with_xdvik=no; with_oxdvik=no; } @@ -182,6 +184,12 @@ test "$with_xetex" != no && : ${needs_icu=yes} : ${needs_icu=no} export needs_icu +# we need teckit for xetex +test ! -d $srcdir/$TECKITDIR && : ${needs_teckit=no} +test "$with_xetex" != no && : ${needs_teckit=yes} +: ${needs_teckit=no} +export needs_teckit + dnl We cannot use variables (e.g. $LIBPNGDIR) for sinclude, so... sinclude(libs/libpng/libpng.ac) sinclude(libs/zlib/zlib.ac) @@ -192,8 +200,9 @@ sinclude(libs/gd/gd.ac) sinclude(libs/freetype/freetype.ac) sinclude(libs/freetype2/freetype2.ac) sinclude(libs/icu-xetex/icu-xetex.ac) +sinclude(libs/teckit/teckit.ac) -LIBSDEP="$CURSESDEP $ZLIBDEP $LIBPNGDEP $LIBXPDFDEP $LIBT1DEP $GDDEP $FREETYPEDEP $FREETYPE2DEP $ICUDEP" +LIBSDEP="$CURSESDEP $ZLIBDEP $LIBPNGDEP $LIBXPDFDEP $LIBT1DEP $GDDEP $FREETYPEDEP $FREETYPE2DEP $ICUDEP $TECKITDEP" LIBSDIRS= test "$needs_ncurses" = yes && test "$using_system_ncurses" != yes \ @@ -214,6 +223,8 @@ test "$needs_freetype2" = yes && test "$using_system_freetype2" != yes \ && LIBSDIRS="$FREETYPE2DIR $LIBSDIRS" test "$needs_icu" = yes && test "$using_system_icu" != yes \ && LIBSDIRS="$ICUDIR $LIBSDIRS" +test "$needs_teckit" = yes \ + && LIBSDIRS="$TECKITDIR $LIBSDIRS" AC_CONFIG_SUBDIRS([libs]) diff --git a/Build/source/libs/configure b/Build/source/libs/configure index b160afe3263..c441b160fee 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -3100,6 +3100,20 @@ fi +if test "$needs_teckit" = no; then + TECKITCPPFLAGS= + LDTECKIT= + TECKITDEP= +else + TECKITCPPFLAGS='-I$(TECKITSRCDIR)/source/Public-headers' + LDTECKIT='$(TECKITDIR)/lib/.libs/libTECkit.a' + TECKITDEP='$(TECKITDIR)/lib/.libs/libTECkit.a' +fi + + + + + # The following line helps, e.g. for ncurses which properly detects the # system's terminfo definitions if configured without explicit --prefix. @@ -3133,6 +3147,10 @@ if test "x$needs_icu" != xno && test "$using_system_icu" != yes; then ac_configure_args="$ac_configure_args --enable-static" subdirs="$subdirs icu-xetex" +fi +if test "x$needs_teckit" != xno; then + subdirs="$subdirs teckit" + fi if test "x$needs_pnglib" != xno && test "$using_system_pnglib" != yes; then @@ -3336,6 +3354,9 @@ s%@FREETYPE2DEP@%$FREETYPE2DEP%g s%@ICUCPPFLAGS@%$ICUCPPFLAGS%g s%@LDICU@%$LDICU%g s%@ICUDEP@%$ICUDEP%g +s%@TECKITCPPFLAGS@%$TECKITCPPFLAGS%g +s%@LDTECKIT@%$LDTECKIT%g +s%@TECKITDEP@%$TECKITDEP%g s%@subdirs@%$subdirs%g CEOF diff --git a/Build/source/libs/configure.in b/Build/source/libs/configure.in index 6b767a056d0..0344c31a1f3 100644 --- a/Build/source/libs/configure.in +++ b/Build/source/libs/configure.in @@ -28,6 +28,7 @@ sinclude(freetype2/withenable.ac) sinclude(freetype2/freetype2.ac) sinclude(icu-xetex/withenable.ac) sinclude(icu-xetex/icu-xetex.ac) +sinclude(teckit/teckit.ac) # The following line helps, e.g. for ncurses which properly detects the # system's terminfo definitions if configured without explicit --prefix. @@ -55,6 +56,9 @@ if test "x$needs_icu" != xno && test "$using_system_icu" != yes; then ac_configure_args="$ac_configure_args --enable-static" AC_CONFIG_SUBDIRS([icu-xetex]) fi +if test "x$needs_teckit" != xno; then + AC_CONFIG_SUBDIRS([teckit]) +fi if test "x$needs_pnglib" != xno && test "$using_system_pnglib" != yes; then KPSE_CONFIG_FILES([libpng/Makefile]) -- cgit v1.2.3