diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-22 18:17:33 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-22 18:17:33 +0000 |
commit | 633c2bc993d2ad14ecf137836f22eef08805a3b5 (patch) | |
tree | 784c479c7046d0dbf7cbfb9446c7762b5e1bb494 /Build/source/texk | |
parent | 62b00fcce4ced507597a1c9b18116b781f0d1a9e (diff) |
build fix for freetype2 and macosx (preliminary)
git-svn-id: svn://tug.org/texlive/trunk@12798 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rwxr-xr-x | Build/source/texk/configure | 34 | ||||
-rw-r--r-- | Build/source/texk/dvipng/Makefile.in | 1 | ||||
-rwxr-xr-x | Build/source/texk/dvipng/configure | 233 | ||||
-rw-r--r-- | Build/source/texk/dvipng/configure.ac | 15 | ||||
-rw-r--r-- | Build/source/texk/web2c/Makefile.in | 12 | ||||
-rwxr-xr-x | Build/source/texk/web2c/configure | 152 | ||||
-rw-r--r-- | Build/source/texk/web2c/doc/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/lib/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/man/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/mplibdir/am/mplib.am | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/mpware/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegafonts/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/otps/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/window/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/Makefile.in | 1 | ||||
-rwxr-xr-x | Build/source/texk/xdvipdfmx/configure | 148 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/configure.ac | 8 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/Makefile.in | 1 |
18 files changed, 469 insertions, 145 deletions
diff --git a/Build/source/texk/configure b/Build/source/texk/configure index ae418ab913e..47f47afedbd 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -782,8 +782,6 @@ with_system_gd with_gd_includes with_gd_libdir with_system_freetype2 -with_freetype2_includes -with_freetype2_libdir with_system_freetype with_freetype_includes with_freetype_libdir @@ -1582,11 +1580,7 @@ Optional Packages: --with-gd-includes=DIR gd headers installed in DIR --with-gd-libdir=DIR gd library installed in DIR --with-system-freetype2 use installed freetype2 headers and library - --with-freetype2-includes=DIR - freetype2 headers installed in DIR (both -IDIR and - -IDIR/freetype2) - --with-freetype2-libdir=DIR - freetype2 library installed in DIR + (requires freetype-config) --with-system-freetype use installed freetype headers and library --with-freetype-includes=DIR freetype headers installed in DIR @@ -3354,16 +3348,6 @@ test "x$need_gd" = xyes && { if test "${with_system_freetype2+set}" = set; then withval=$with_system_freetype2; fi - -# Check whether --with-freetype2-includes was given. -if test "${with_freetype2_includes+set}" = set; then - withval=$with_freetype2_includes; -fi - -# Check whether --with-freetype2-libdir was given. -if test "${with_freetype2_libdir+set}" = set; then - withval=$with_freetype2_libdir; -fi if test "x$with_system_freetype2" = x; then if test -f $srcdir/../libs/freetype2/configure; then { $as_echo "$as_me:$LINENO: Assuming \`freetype2' headers and library from TL tree" >&5 @@ -3376,22 +3360,6 @@ $as_echo "$as_me: Assuming installed \`freetype2' headers and library" >&6;} fi ac_configure_args="$ac_configure_args '--with-system-freetype2=$with_system_freetype2'" fi -if test "x$with_system_freetype2" = xyes; then - if test "x$with_system_zlib" = x; then - { $as_echo "$as_me:$LINENO: -> installed \`zlib' headers and library" >&5 -$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;} - with_system_zlib=yes - ac_configure_args="$ac_configure_args '--with-system-zlib'" - elif test "x$with_system_zlib" != xyes; then - { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&5 -$as_echo "$as_me: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&2;} - { (exit 1); exit 1; }; } - fi -fi - -test "x$need_freetype2" = xyes && { - need_zlib=yes -} ## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/ diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in index d719af981a3..842a1cf6d1d 100644 --- a/Build/source/texk/dvipng/Makefile.in +++ b/Build/source/texk/dvipng/Makefile.in @@ -174,6 +174,7 @@ FGREP = @FGREP@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ +FT2_CONFIG = @FT2_CONFIG@ GD_DEPEND = @GD_DEPEND@ GD_INCLUDES = @GD_INCLUDES@ GD_LIBS = @GD_LIBS@ diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index e4f5a7ec9cc..32189fb41c6 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -796,14 +796,15 @@ have_ft2_FALSE have_ft2_TRUE have_t1_FALSE have_t1_TRUE -FREETYPE2_RULE -FREETYPE2_DEPEND -FREETYPE2_LIBS -FREETYPE2_INCLUDES GD_RULE GD_DEPEND GD_LIBS GD_INCLUDES +FREETYPE2_RULE +FREETYPE2_DEPEND +FREETYPE2_LIBS +FREETYPE2_INCLUDES +FT2_CONFIG T1LIB_RULE T1LIB_DEPEND T1LIB_LIBS @@ -959,12 +960,12 @@ with_libpng_libdir with_system_t1lib with_t1lib_includes with_t1lib_libdir -with_system_gd -with_gd_includes -with_gd_libdir with_system_freetype2 with_freetype2_includes with_freetype2_libdir +with_system_gd +with_gd_includes +with_gd_libdir ' ac_precious_vars='build_alias host_alias @@ -1643,14 +1644,14 @@ Optional Packages: --with-t1lib-includes=DIR t1lib headers installed in DIR --with-t1lib-libdir=DIR t1lib library installed in DIR - --with-system-gd use installed gd headers and library - --with-gd-includes=DIR gd headers installed in DIR - --with-gd-libdir=DIR gd library installed in DIR --with-system-freetype2 use installed freetype2 headers and library --with-freetype2-includes=DIR freetype2 headers installed in DIR --with-freetype2-libdir=DIR freetype2 library installed in DIR + --with-system-gd use installed gd headers and library + --with-gd-includes=DIR gd headers installed in DIR + --with-gd-libdir=DIR gd library installed in DIR Some influential environment variables: CC C compiler command @@ -4243,13 +4244,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:4246: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4247: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4249: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4250: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4252: output\"" >&5) + (eval echo "\"\$as_me:4253: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5455,7 +5456,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5458 "configure"' > conftest.$ac_ext + echo '#line 5459 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7502,11 +7503,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:7505: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7506: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7509: \$? = $ac_status" >&5 + echo "$as_me:7510: \$? = $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. @@ -7841,11 +7842,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:7844: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7845: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7848: \$? = $ac_status" >&5 + echo "$as_me:7849: \$? = $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. @@ -7946,11 +7947,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:7949: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7950: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7953: \$? = $ac_status" >&5 + echo "$as_me:7954: \$? = $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 @@ -8001,11 +8002,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:8004: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8005: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8008: \$? = $ac_status" >&5 + echo "$as_me:8009: \$? = $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 @@ -10801,7 +10802,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10804 "configure" +#line 10805 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10897,7 +10898,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10900 "configure" +#line 10901 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18116,43 +18117,96 @@ ${top_builddir}/../../libs/t1lib/t1lib.h: cd ${top_builddir}/../../libs/t1lib && $(MAKE) $(AM_MAKEFLAGS)' fi -## _KPSE_LIB_FLAGS: Setup gd (-lgd) flags +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 -# Check whether --with-system-gd was given. -if test "${with_system_gd+set}" = set; then - withval=$with_system_gd; +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 -# Check whether --with-gd-includes was given. -if test "${with_gd_includes+set}" = set; then - withval=$with_gd_includes; + 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 -# Check whether --with-gd-libdir was given. -if test "${with_gd_libdir+set}" = set; then - withval=$with_gd_libdir; fi -if test "x$with_system_gd" = xyes; then - if test "x$with_gd_includes" != x && test "x$with_gd_includes" != xyes; then - GD_INCLUDES="-I$with_gd_includes" fi -GD_LIBS="-lgd" -if test "x$with_gd_libdir" != x && test "x$with_gd_libdir" != xyes; then - GD_LIBS="-L$with_gd_libdir $GD_LIBS" +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 - GD_INCLUDES=`echo '-IBLD/libs/gd' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - GD_LIBS=`echo 'BLD/libs/gd/libgd.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - GD_DEPEND=`echo 'BLD/libs/gd/libgd.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - GD_RULE='# Rebuild libgd -$(GD_DEPEND): ${top_builddir}/../../libs/gd/gd.h - cd ${top_builddir}/../../libs/gd && $(MAKE) $(AM_MAKEFLAGS) -${top_builddir}/../../libs/gd/gd.h: - cd ${top_builddir}/../../libs/gd && $(MAKE) $(AM_MAKEFLAGS)' + FT2_CONFIG="$ac_cv_prog_FT2_CONFIG" fi ## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags @@ -18172,15 +18226,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 \ @@ -18193,6 +18248,51 @@ $(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_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES +kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS +## _KPSE_LIB_FLAGS: Setup gd (-lgd) flags + +# Check whether --with-system-gd was given. +if test "${with_system_gd+set}" = set; then + withval=$with_system_gd; +fi + +# Check whether --with-gd-includes was given. +if test "${with_gd_includes+set}" = set; then + withval=$with_gd_includes; +fi + +# Check whether --with-gd-libdir was given. +if test "${with_gd_libdir+set}" = set; then + withval=$with_gd_libdir; +fi +if test "x$with_system_gd" = xyes; then + if test "x$with_gd_includes" != x && test "x$with_gd_includes" != xyes; then + GD_INCLUDES="-I$with_gd_includes" +fi +GD_LIBS="-lgd" +if test "x$with_gd_libdir" != x && test "x$with_gd_libdir" != xyes; then + GD_LIBS="-L$with_gd_libdir $GD_LIBS" +fi +else + GD_INCLUDES=`echo '-IBLD/libs/gd' | sed \ + -e "s,SRC/,$kpse_SRC/,g" \ + -e "s,BLD/,$kpse_BLD/,g"` + GD_LIBS=`echo 'BLD/libs/gd/libgd.a' | sed \ + -e "s,BLD/,$kpse_BLD/,g"` + GD_DEPEND=`echo 'BLD/libs/gd/libgd.a' | sed \ + -e 's,BLD/,${top_builddir}/../../,g'` + GD_RULE='# Rebuild libgd +$(GD_DEPEND): ${top_builddir}/../../libs/gd/gd.h + cd ${top_builddir}/../../libs/gd && $(MAKE) $(AM_MAKEFLAGS) +${top_builddir}/../../libs/gd/gd.h: + cd ${top_builddir}/../../libs/gd && $(MAKE) $(AM_MAKEFLAGS)' +fi @@ -18406,6 +18506,19 @@ fi 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 +{ $as_echo "$as_me:$LINENO: FREETYPE2_INCLUDES=\"$FREETYPE2_INCLUDES\"" >&5 +$as_echo "$as_me: FREETYPE2_INCLUDES=\"$FREETYPE2_INCLUDES\"" >&6;} +{ $as_echo "$as_me:$LINENO: FREETYPE2_LIBS=\"$FREETYPE2_LIBS\"" >&5 +$as_echo "$as_me: FREETYPE2_LIBS=\"$FREETYPE2_LIBS\"" >&6;} +CPPFLAGS="$CPPFLAGS $FREETYPE2_INCLUDES" +LIBS="$FREETYPE2_LIBS $LIBS" + CPPFLAGS="$CPPFLAGS $GD_INCLUDES" LIBS="$GD_LIBS $LIBS" @@ -19353,6 +19466,8 @@ fi CPPFLAGS=$kpse_save_CPPFLAGS LIBS=$kpse_save_LIBS +FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES +FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS DVIPNG_VERSION=1.12 diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac index 44d552c2970..135f48276c2 100644 --- a/Build/source/texk/dvipng/configure.ac +++ b/Build/source/texk/dvipng/configure.ac @@ -98,8 +98,10 @@ KPSE_KPATHSEA_FLAGS KPSE_ZLIB_FLAGS KPSE_LIBPNG_FLAGS KPSE_T1LIB_FLAGS -KPSE_GD_FLAGS KPSE_FREETYPE2_FLAGS +kpse_save_FREETYPE2_INCLUDES=$FREETYPE2_INCLUDES +kpse_save_FREETYPE2_LIBS=$FREETYPE2_LIBS +KPSE_GD_FLAGS dnl We have to check properties of libraries, either installed (system) dnl libraries or unistalled (possibly libtool) ones from the TL tree. @@ -117,6 +119,15 @@ AC_CHECK_FUNC([png_read_image], [Define to 1 if you have the `png' library (-lpng).])], [KPSE_MSG_ERROR([dvipng], [cannot find/use libpng])]) +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 +AC_MSG_NOTICE([FREETYPE2_INCLUDES=\"$FREETYPE2_INCLUDES\"]) +AC_MSG_NOTICE([FREETYPE2_LIBS=\"$FREETYPE2_LIBS\"]) +KPSE_ADD_FLAGS([freetype2]) KPSE_ADD_FLAGS([gd]) AC_CHECK_FUNC([gdImageCreate], [AC_DEFINE([HAVE_LIBGD], 1, @@ -163,6 +174,8 @@ AC_CHECK_FUNCS([gdImageCreateTrueColor gdImageCreateFromJpeg gdImagePngEx gdImag AM_CONDITIONAL([have_gif], [test "x$ac_cv_func_gdImageGif" = xyes]) KPSE_RESTORE_FLAGS +FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES +FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS DVIPNG_VERSION=dvipng_version AC_SUBST([DVIPNG_VERSION]) diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index fff4c930327..26c5b1b3441 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -823,6 +823,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ +FT2_CONFIG = @FT2_CONFIG@ GRAPHITE_DEPEND = @GRAPHITE_DEPEND@ GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@ GRAPHITE_LIBS = @GRAPHITE_LIBS@ @@ -981,9 +982,9 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \ tmf-pool.h mf.web mf-binpool.ch mf.ch mftalk.h lib/texmfmp.c \ tmf-pool.h mp.web mp.ch lib/texmfmp.c mpdir/mp.defines \ mpdir/mplib.h metapost.mk mpdir/Makefile.in.orig \ - mpdir/mpostlib.mk $(mpost_web) $(libmplib_web) \ - mplibdir/lmplib.c $(etex_web_srcs) $(etex_ch_srcs) \ - etexdir/etexextra.in lib/texmfmp.c tmf-pool.h \ + mpdir/mpostlib.mk mplibdir/ChangeLog $(mpost_web) \ + $(libmplib_web) mplibdir/lmplib.c $(etex_web_srcs) \ + $(etex_ch_srcs) etexdir/etexextra.in lib/texmfmp.c tmf-pool.h \ etexdir/ChangeLog etexdir/INSTALL etexdir/README \ etexdir/etex_gen.tex etexdir/etex.mak etexdir/etex.mk \ $(pdftex_ch_srcs) pdftexdir/pdftex.defines pdftexdir/pdftex.h \ @@ -1655,11 +1656,15 @@ libluatex_a_SOURCES = \ luatexdir/image/epdf.h \ luatexdir/image/image.h \ luatexdir/image/pdftoepdf.cc \ + luatexdir/image/pdftoepdf.h \ luatexdir/image/writeimg.c \ + luatexdir/image/writeimg.h \ luatexdir/image/writejbig2.c \ luatexdir/image/writejbig2.h \ luatexdir/image/writejpg.c \ + luatexdir/image/writejpg.h \ luatexdir/image/writepng.c \ + luatexdir/image/writepng.h \ luatexdir/lang/hnjalloc.c \ luatexdir/lang/hnjalloc.h \ luatexdir/lang/hyphen.c \ @@ -1717,6 +1722,7 @@ libluatex_a_SOURCES = \ luatexdir/utils/synctex.h \ luatexdir/utils/synctex.c \ luatexdir/utils/utils.c \ + luatexdir/utils/utils.h \ luatexdir/utils/writezip.c \ mplibdir/lmplib.c diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index fe0ad37648d..c4ee2195f78 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -813,6 +813,7 @@ FREETYPE2_RULE FREETYPE2_DEPEND FREETYPE2_LIBS FREETYPE2_INCLUDES +FT2_CONFIG GRAPHITE_RULE GRAPHITE_DEPEND GRAPHITE_LIBS @@ -4406,13 +4407,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:4409: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4410: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4412: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4413: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4415: output\"" >&5) + (eval echo "\"\$as_me:4416: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5618,7 +5619,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5621 "configure"' > conftest.$ac_ext + echo '#line 5622 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7665,11 +7666,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:7668: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7669: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7672: \$? = $ac_status" >&5 + echo "$as_me:7673: \$? = $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. @@ -8004,11 +8005,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:8007: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8008: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8011: \$? = $ac_status" >&5 + echo "$as_me:8012: \$? = $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. @@ -8109,11 +8110,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:8112: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8113: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8116: \$? = $ac_status" >&5 + echo "$as_me:8117: \$? = $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 @@ -8164,11 +8165,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:8167: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8168: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8171: \$? = $ac_status" >&5 + echo "$as_me:8172: \$? = $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 @@ -10964,7 +10965,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10967 "configure" +#line 10968 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11060,7 +11061,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11063 "configure" +#line 11064 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16076,11 +16077,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:16079: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16080: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16083: \$? = $ac_status" >&5 + echo "$as_me:16084: \$? = $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. @@ -16175,11 +16176,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:16178: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16179: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16182: \$? = $ac_status" >&5 + echo "$as_me:16183: \$? = $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 @@ -16227,11 +16228,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:16230: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16231: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16234: \$? = $ac_status" >&5 + echo "$as_me:16235: \$? = $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 @@ -23505,6 +23506,98 @@ $(GRAPHITE_DEPEND): cd ${top_builddir}/../../libs/graphite && $(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. @@ -23522,15 +23615,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 \ @@ -23543,6 +23637,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_LIB_FLAGS: Setup teckit (-lTECkit) flags diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in index 20a787d481e..88b37dfb66b 100644 --- a/Build/source/texk/web2c/doc/Makefile.in +++ b/Build/source/texk/web2c/doc/Makefile.in @@ -125,6 +125,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ +FT2_CONFIG = @FT2_CONFIG@ GRAPHITE_DEPEND = @GRAPHITE_DEPEND@ GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@ GRAPHITE_LIBS = @GRAPHITE_LIBS@ diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in index c47c893cffd..9a6800de692 100644 --- a/Build/source/texk/web2c/lib/Makefile.in +++ b/Build/source/texk/web2c/lib/Makefile.in @@ -130,6 +130,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ +FT2_CONFIG = @FT2_CONFIG@ GRAPHITE_DEPEND = @GRAPHITE_DEPEND@ GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@ GRAPHITE_LIBS = @GRAPHITE_LIBS@ diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in index 8d0979871db..c238f0bda1a 100644 --- a/Build/source/texk/web2c/man/Makefile.in +++ b/Build/source/texk/web2c/man/Makefile.in @@ -120,6 +120,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ +FT2_CONFIG = @FT2_CONFIG@ GRAPHITE_DEPEND = @GRAPHITE_DEPEND@ GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@ GRAPHITE_LIBS = @GRAPHITE_LIBS@ diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am index 3256bc925c3..a4aad4b0290 100644 --- a/Build/source/texk/web2c/mplibdir/am/mplib.am +++ b/Build/source/texk/web2c/mplibdir/am/mplib.am @@ -31,7 +31,7 @@ mpost_web = mplibdir/mpost.w mplibdir/mpxout.w $(mpost_OBJECTS): $(nodist_mpost_SOURCES) libmplib.a -EXTRA_DIST += $(mpost_web) +EXTRA_DIST += mplibdir/ChangeLog $(mpost_web) DISTCLEANFILES += $(nodist_mpost_SOURCES) mpxout-ctangle diff --git a/Build/source/texk/web2c/mpware/Makefile.in b/Build/source/texk/web2c/mpware/Makefile.in index bdeeb1a74b4..4e95ffc7ede 100644 --- a/Build/source/texk/web2c/mpware/Makefile.in +++ b/Build/source/texk/web2c/mpware/Makefile.in @@ -140,6 +140,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ +FT2_CONFIG = @FT2_CONFIG@ GRAPHITE_DEPEND = @GRAPHITE_DEPEND@ GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@ GRAPHITE_LIBS = @GRAPHITE_LIBS@ diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index 65766345166..e6f250633fc 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -146,6 +146,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ +FT2_CONFIG = @FT2_CONFIG@ GRAPHITE_DEPEND = @GRAPHITE_DEPEND@ GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@ GRAPHITE_LIBS = @GRAPHITE_LIBS@ diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in index 8bfd5e4ece8..444be45f025 100644 --- a/Build/source/texk/web2c/otps/Makefile.in +++ b/Build/source/texk/web2c/otps/Makefile.in @@ -148,6 +148,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ +FT2_CONFIG = @FT2_CONFIG@ GRAPHITE_DEPEND = @GRAPHITE_DEPEND@ GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@ GRAPHITE_LIBS = @GRAPHITE_LIBS@ diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in index f157e292a89..d09dbcc5dae 100644 --- a/Build/source/texk/web2c/window/Makefile.in +++ b/Build/source/texk/web2c/window/Makefile.in @@ -135,6 +135,7 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ +FT2_CONFIG = @FT2_CONFIG@ GRAPHITE_DEPEND = @GRAPHITE_DEPEND@ GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@ GRAPHITE_LIBS = @GRAPHITE_LIBS@ diff --git a/Build/source/texk/xdvipdfmx/Makefile.in b/Build/source/texk/xdvipdfmx/Makefile.in index a05d3f3a546..8d9f36da05f 100644 --- a/Build/source/texk/xdvipdfmx/Makefile.in +++ b/Build/source/texk/xdvipdfmx/Makefile.in @@ -118,6 +118,7 @@ FGREP = @FGREP@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ +FT2_CONFIG = @FT2_CONFIG@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ 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 diff --git a/Build/source/texk/xdvipdfmx/configure.ac b/Build/source/texk/xdvipdfmx/configure.ac index db6fd5ee46e..08fc22347a6 100644 --- a/Build/source/texk/xdvipdfmx/configure.ac +++ b/Build/source/texk/xdvipdfmx/configure.ac @@ -59,10 +59,18 @@ CHO_CHECK_ZLIB KPSE_ADD_FLAGS([libpng]) CHO_CHECK_LIBPNG +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 KPSE_ADD_FLAGS([freetype2]) CHO_CHECK_LIBFREETYPE([xdvipdfmx]) KPSE_RESTORE_FLAGS +FREETYPE2_INCLUDES=$kpse_save_FREETYPE2_INCLUDES +FREETYPE2_LIBS=$kpse_save_FREETYPE2_LIBS dnl We do not provide the configure option '--enable-tetex-build', but may dnl inherit enable_tetex_build when part of a teTeX / TeX Live installation. diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.in b/Build/source/texk/xdvipdfmx/src/Makefile.in index 4640e60fe57..24b43bf29fa 100644 --- a/Build/source/texk/xdvipdfmx/src/Makefile.in +++ b/Build/source/texk/xdvipdfmx/src/Makefile.in @@ -128,6 +128,7 @@ FGREP = @FGREP@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ +FT2_CONFIG = @FT2_CONFIG@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ |