summaryrefslogtreecommitdiff
path: root/Build/source/configure
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/configure')
-rwxr-xr-xBuild/source/configure31
1 files changed, 7 insertions, 24 deletions
diff --git a/Build/source/configure b/Build/source/configure
index ef81b2059b2..5c9ea4f9407 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -764,7 +764,6 @@ utils/ps2eps
utils/psutils
utils/t1utils
utils/texcount
-utils/texi2html
utils/texinfo
utils/tpic2pdftex
texk'
@@ -1372,7 +1371,6 @@ Optional Packages:
--without-psutils do not build the psutils package
--without-t1utils do not build the t1utils package
--without-texcount do not build the texcount package
- --without-texi2html do not build the texi2html package
--without-texinfo do not build the texinfo package
--without-tpic2pdftex do not build the tpic2pdftex package
--without-afm2pl do not build the afm2pl package
@@ -1474,7 +1472,6 @@ Optional Packages:
--with-freetype2-include=DIR
Specify the freetype2 header files location.
(both DIR and DIR/freetype2 will be added to the include paths)
- --with-system-icu use installed ICU library
--with-icu-libdir=DIR
Specify directory where the ICU library resides.
--with-icu-include=DIR
@@ -5366,11 +5363,6 @@ if test "${with_texcount+set}" = set; then
withval=$with_texcount;
fi
-# Check whether --with-texi2html was given.
-if test "${with_texi2html+set}" = set; then
- withval=$with_texi2html;
-fi
-
# Check whether --with-texinfo was given.
if test "${with_texinfo+set}" = set; then
withval=$with_texinfo;
@@ -6508,12 +6500,9 @@ if test "${with_freetype2_include+set}" = set; then
fi
-
-# Check whether --with-system_icu was given.
-if test "${with_system_icu+set}" = set; then
- withval=$with_system_icu;
-fi
-
+# Not available because xetex uses a customized ICU layout engine
+# AC_ARG_WITH(system_icu,
+# [ --with-system-icu use installed ICU library])
# Check whether --with-icu_libdir was given.
@@ -8984,7 +8973,7 @@ else
EXTRA_ICU_INCLUDE=
EXTRA_ICU_LIBDIR=
- if test "$with_system_icu" = yes; then
+ if test x"$with_system_icu" = xyes; then
if test "x$with_icu_libdir" != x; then
EXTRA_ICU_LIBDIR="-L$with_icu_libdir"
fi
@@ -9000,7 +8989,7 @@ else
LDFLAGS="$LDFLAGS $EXTRA_ICU_LIBDIR"
CPP="$CPP $EXTRA_ICU_INCLUDE"
- if test "$with_system_icu" = yes; then
+ if test x"$with_system_icu" = xyes; then
{ echo "$as_me:$LINENO: checking for ubidi_open in -licuuc" >&5
echo $ECHO_N "checking for ubidi_open in -licuuc... $ECHO_C" >&6; }
@@ -9078,7 +9067,7 @@ fi
fi
- if test "$with_system_icu" = yes; then
+ if test x"$with_system_icu" = xyes; then
for ac_header in ubidi.h
do
@@ -9230,7 +9219,7 @@ echo "$as_me: WARNING: ubidi.h not found. Using my own ICU sources." >&2;}
CPP=$OLD_CPP
LIBS=$OLD_LIBS
- if test "$with_system_icu" != yes; then
+ if test x"$with_system_icu" != xyes; then
ICUCPPFLAGS='-I$(ICUDIR)/common -I$(ICUSRCDIR)/common -I$(ICUSRCDIR)/layout'
LDICU='$(ICUDIR)/lib/libsicuuc.a $(ICUDIR)/lib/libsicule.a $(ICUDIR)/lib/libsicudata.a'
ICUDEP='$(ICUDIR)/lib/libsicuuc.a $(ICUDIR)/lib/libsicule.a $(ICUDIR)/lib/libsicudata.a'
@@ -9365,12 +9354,6 @@ if test -d $srcdir/utils/texcount; then
subdirs="$subdirs utils/texcount"
fi
fi
-if test -d $srcdir/utils/texi2html; then
- if test "x$with_texi2html" != xno; then
- ESUBDIRS="$ESUBDIRS utils/texi2html"
- subdirs="$subdirs utils/texi2html"
- fi
-fi
if test -d $srcdir/utils/texinfo; then
if test "x$with_texinfo" != xno; then
ESUBDIRS="$ESUBDIRS utils/texinfo"