diff options
Diffstat (limited to 'Build/source/texk/xdvipdfmx/configure')
-rwxr-xr-x | Build/source/texk/xdvipdfmx/configure | 148 |
1 files changed, 127 insertions, 21 deletions
diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure index 6aa442472e9..4e1b5058133 100755 --- a/Build/source/texk/xdvipdfmx/configure +++ b/Build/source/texk/xdvipdfmx/configure @@ -795,6 +795,7 @@ FREETYPE2_RULE FREETYPE2_DEPEND FREETYPE2_LIBS FREETYPE2_INCLUDES +FT2_CONFIG LIBPNG_RULE LIBPNG_DEPEND LIBPNG_LIBS @@ -4211,13 +4212,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4214: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4215: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4217: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4218: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4220: output\"" >&5) + (eval echo "\"\$as_me:4221: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5423,7 +5424,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5426 "configure"' > conftest.$ac_ext + echo '#line 5427 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7470,11 +7471,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7473: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7474: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7477: \$? = $ac_status" >&5 + echo "$as_me:7478: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7809,11 +7810,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7812: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7813: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7816: \$? = $ac_status" >&5 + echo "$as_me:7817: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7914,11 +7915,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7917: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7918: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7921: \$? = $ac_status" >&5 + echo "$as_me:7922: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7969,11 +7970,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7972: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7973: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7976: \$? = $ac_status" >&5 + echo "$as_me:7977: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10769,7 +10770,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10772 "configure" +#line 10773 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10865,7 +10866,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10868 "configure" +#line 10869 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17348,6 +17349,98 @@ ${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngcon cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS)' fi +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:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_FT2_CONFIG+set}" = set; 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_FT2_CONFIG="${ac_tool_prefix}freetype-config" + $as_echo "$as_me:$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:$LINENO: result: $FT2_CONFIG" >&5 +$as_echo "$FT2_CONFIG" >&6; } +else + { $as_echo "$as_me:$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:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_FT2_CONFIG+set}" = set; 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_FT2_CONFIG="freetype-config" + $as_echo "$as_me:$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:$LINENO: result: $ac_ct_FT2_CONFIG" >&5 +$as_echo "$ac_ct_FT2_CONFIG" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_FT2_CONFIG" = x; then + FT2_CONFIG=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$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 + ## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags # Check whether --with-system-freetype2 was given. @@ -17365,15 +17458,16 @@ if test "${with_freetype2_libdir+set}" = set; then withval=$with_freetype2_libdir; fi if test "x$with_system_freetype2" = xyes; then - if test "x$with_freetype2_includes" != x && test "x$with_freetype2_includes" != xyes; then - FREETYPE2_INCLUDES="-I$with_freetype2_includes/freetype2 -I$with_freetype2_includes" -fi -FREETYPE2_LIBS="-lfreetype" -if test "x$with_freetype2_libdir" != x && test "x$with_freetype2_libdir" != xyes; then - FREETYPE2_LIBS="-L$with_freetype2_libdir $FREETYPE2_LIBS" + if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then + FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` + FREETYPE2_LIBS=`$FT2_CONFIG --libs` +else + { { $as_echo "$as_me:$LINENO: error: Can not use installed freetype2 headers and library" >&5 +$as_echo "$as_me: error: Can not use installed freetype2 headers and library" >&2;} + { (exit 1); exit 1; }; } fi else - FREETYPE2_INCLUDES=`echo '-IBLD/libs/freetype2/freetype2 -IBLD/libs/freetype2' | sed \ + FREETYPE2_INCLUDES=`echo 'cat BLD/libs/freetype2/ft-' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \ @@ -17386,6 +17480,10 @@ $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h ${top_builddir}/../../libs/freetype2/ft2build.h: cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS)' fi +if test "x$with_system_freetype2" = xno; then + FREETYPE2_LIBS='`'"$FREETYPE2_INCLUDES"'libs`' + FREETYPE2_INCLUDES='`'"$FREETYPE2_INCLUDES"'includes`' +fi kpse_save_CPPFLAGS=$CPPFLAGS @@ -18096,6 +18194,12 @@ fi +set -x +kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES +kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS +eval FREETYPE2_INCLUDES="$FREETYPE2_INCLUDES" +eval FREETYPE2_LIBS="$FREETYPE2_LIBS" +set +x CPPFLAGS="$CPPFLAGS $FREETYPE2_INCLUDES" LIBS="$FREETYPE2_LIBS $LIBS" @@ -18289,6 +18393,8 @@ fi CPPFLAGS=$kpse_save_CPPFLAGS LIBS=$kpse_save_LIBS +FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES +FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS if test "x$enable_tetex_build" != xyes || test ! -d $srdir/../kpathsea; then _cppflags=$CPPFLAGS _ldflags=$LDFLAGS |