diff options
Diffstat (limited to 'Build/source/libs/harfbuzz/configure')
| -rwxr-xr-x | Build/source/libs/harfbuzz/configure | 350 |
1 files changed, 9 insertions, 341 deletions
diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure index f475d730251..3df2bb0934b 100755 --- a/Build/source/libs/harfbuzz/configure +++ b/Build/source/libs/harfbuzz/configure @@ -633,21 +633,16 @@ AM_CXXFLAGS EGREP GREP CPP -GRAPHITE2_RULE -GRAPHITE2_DEPEND -GRAPHITE2_LIBS -GRAPHITE2_INCLUDES -PKG_CONFIG ICU_RULE ICU_DEPEND ICU_LIBS ICU_INCLUDES ICU_CONFIG -FREETYPE2_RULE -FREETYPE2_DEPEND -FREETYPE2_LIBS -FREETYPE2_INCLUDES -FT2_CONFIG +GRAPHITE2_RULE +GRAPHITE2_DEPEND +GRAPHITE2_LIBS +GRAPHITE2_INCLUDES +PKG_CONFIG host_os host_vendor host_cpu @@ -656,10 +651,6 @@ build_os build_vendor build_cpu build -ZLIB_RULE -ZLIB_DEPEND -ZLIB_LIBS -ZLIB_INCLUDES LN_S RANLIB WARNING_CXXFLAGS @@ -766,12 +757,8 @@ enable_silent_rules enable_maintainer_mode enable_dependency_tracking enable_compiler_warnings -with_system_zlib -with_zlib_includes -with_zlib_libdir -with_system_freetype2 -with_system_icu with_system_graphite2 +with_system_icu ' ac_precious_vars='build_alias host_alias @@ -1420,16 +1407,10 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-system-zlib use installed zlib headers and library - --with-zlib-includes=DIR - zlib headers installed in DIR - --with-zlib-libdir=DIR zlib library installed in DIR - --with-system-freetype2 use installed freetype2 headers and library - (requires freetype-config) - --with-system-icu use installed ICU headers and libraries (requires - icu-config) --with-system-graphite2 use installed graphite2 headers and library (requires pkg-config) + --with-system-icu use installed ICU headers and libraries (requires + icu-config) Some influential environment variables: CC C compiler command @@ -5489,89 +5470,10 @@ $as_echo "no, using $LN_S" >&6; } fi -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS - ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` -## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags - -# Check whether --with-system-zlib was given. -if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; -fi - -# Check whether --with-zlib-includes was given. -if test "${with_zlib_includes+set}" = set; then : - withval=$with_zlib_includes; -fi - -# Check whether --with-zlib-libdir was given. -if test "${with_zlib_libdir+set}" = set; then : - withval=$with_zlib_libdir; -fi -if test "x$with_system_zlib" = xyes; then - if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then - ZLIB_INCLUDES="-I$with_zlib_includes" -fi -ZLIB_LIBS="-lz" -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="-I$kpse_BLD/libs/zlib/include" - ZLIB_LIBS="$kpse_BLD/libs/zlib/libz.a" - ZLIB_DEPEND='${top_builddir}/../../libs/zlib/libz.a' - ZLIB_RULE='# Rebuild libz -$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h - cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/zlib/include/zconf.h: - cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if <zlib.h> defines 'z_const'" >&5 -$as_echo_n "checking if <zlib.h> defines 'z_const'... " >&6; } -if ${kpse_cv_have_decl_z_const+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\" -eval LIBS=\"$ZLIB_LIBS \$LIBS\" - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <zlib.h> -int -main () -{ -z_const char * foo(); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - kpse_cv_have_decl_z_const=yes -else - kpse_cv_have_decl_z_const=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$kpse_save_CPPFLAGS -LIBS=$kpse_save_LIBS - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_decl_z_const" >&5 -$as_echo "$kpse_cv_have_decl_z_const" >&6; } -case $kpse_cv_have_decl_z_const in #( - yes) : - -$as_echo "#define ZLIB_CONST 1" >>confdefs.h - ;; #( - *) : - -$as_echo "#define z_const /**/" >>confdefs.h - ;; -esac - # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 @@ -5643,238 +5545,6 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags - -# Check whether --with-system-freetype2 was given. -if test "${with_system_freetype2+set}" = set; then : - withval=$with_system_freetype2; -fi -if test "x$with_system_freetype2" = xyes; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}freetype-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}freetype-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_FT2_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$FT2_CONFIG"; then - ac_cv_prog_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_FT2_CONFIG="${ac_tool_prefix}freetype-config" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -FT2_CONFIG=$ac_cv_prog_FT2_CONFIG -if test -n "$FT2_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FT2_CONFIG" >&5 -$as_echo "$FT2_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_FT2_CONFIG"; then - ac_ct_FT2_CONFIG=$FT2_CONFIG - # Extract the first word of "freetype-config", so it can be a program name with args. -set dummy freetype-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_FT2_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_FT2_CONFIG"; then - ac_cv_prog_ac_ct_FT2_CONFIG="$ac_ct_FT2_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_FT2_CONFIG="freetype-config" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_FT2_CONFIG=$ac_cv_prog_ac_ct_FT2_CONFIG -if test -n "$ac_ct_FT2_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FT2_CONFIG" >&5 -$as_echo "$ac_ct_FT2_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_FT2_CONFIG" = x; then - FT2_CONFIG="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - FT2_CONFIG=$ac_ct_FT2_CONFIG - fi -else - FT2_CONFIG="$ac_cv_prog_FT2_CONFIG" -fi -if $FT2_CONFIG --ftversion >/dev/null 2>&1; then - FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` - FREETYPE2_LIBS=`$FT2_CONFIG --libs` -elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then - as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5 -fi -else - FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2" - FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a" - FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a' - FREETYPE2_RULE='# Rebuild libfreetype -$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h - cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/freetype2/freetype2/ft2build.h: - cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - -## _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags - -# Check whether --with-system-icu was given. -if test "${with_system_icu+set}" = set; then : - withval=$with_system_icu; -fi -if test "x$with_system_icu" = xyes; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}icu-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}icu-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ICU_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ICU_CONFIG"; then - ac_cv_prog_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ICU_CONFIG="${ac_tool_prefix}icu-config" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ICU_CONFIG=$ac_cv_prog_ICU_CONFIG -if test -n "$ICU_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ICU_CONFIG" >&5 -$as_echo "$ICU_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_ICU_CONFIG"; then - ac_ct_ICU_CONFIG=$ICU_CONFIG - # Extract the first word of "icu-config", so it can be a program name with args. -set dummy icu-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_ICU_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_ICU_CONFIG"; then - ac_cv_prog_ac_ct_ICU_CONFIG="$ac_ct_ICU_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_ICU_CONFIG="icu-config" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_ICU_CONFIG=$ac_cv_prog_ac_ct_ICU_CONFIG -if test -n "$ac_ct_ICU_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_ICU_CONFIG" >&5 -$as_echo "$ac_ct_ICU_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_ICU_CONFIG" = x; then - ICU_CONFIG="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - ICU_CONFIG=$ac_ct_ICU_CONFIG - fi -else - ICU_CONFIG="$ac_cv_prog_ICU_CONFIG" -fi -if $ICU_CONFIG --version >/dev/null 2>&1; then - ICU_INCLUDES=`$ICU_CONFIG --cppflags` - # Work around bug in icu-config version 4.4 - ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath ` - ICU_LIBS="$ICU_LIBS `$ICU_CONFIG --ldflags-libsonly --ldflags-system`" -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="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include" - ICU_LIBS=" $kpse_BLD/libs/icu/icu-build/lib/libicuuc.a $kpse_BLD/libs/icu/icu-build/lib/libicudata.a" - ICU_DEPEND=' ${top_builddir}/../../libs/icu/icu-build/lib/libicuuc.a ${top_builddir}/../../libs/icu/icu-build/lib/libicudata.a' - ICU_RULE='# Rebuild libicuxxx -$(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h - cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/icu/include/unicode/uversion.h: - cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 @@ -6091,9 +5761,7 @@ else fi if $ICU_CONFIG --version >/dev/null 2>&1; then ICU_INCLUDES=`$ICU_CONFIG --cppflags` - # Work around bug in icu-config version 4.4 - ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath ` - ICU_LIBS="$ICU_LIBS `$ICU_CONFIG --ldflags-libsonly --ldflags-system`" + ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-system` 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 |