diff options
24 files changed, 73 insertions, 91 deletions
diff --git a/Build/source/configure b/Build/source/configure index ec0695aaa2d..6302531abf5 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -4859,7 +4859,6 @@ esac test "x$enable_dvipng" = xno || { need_kpathsea=yes - need_freetype2=yes need_gd=yes need_t1lib=yes } @@ -20183,12 +20182,11 @@ elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then as_fn_error $? "did not find poppler-0.12 or better" "$LINENO" 5 fi -if $PKG_CONFIG poppler --atleast-version=0.12; then - POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"' - POPPLER_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`" +if $PKG_CONFIG poppler --atleast-version=0.20; then + POPPLER_INCLUDES=`$PKG_CONFIG poppler --cflags` POPPLER_LIBS=`$PKG_CONFIG poppler --libs` elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then - as_fn_error $? "did not find poppler-0.12 or better" "$LINENO" 5 + as_fn_error $? "did not find poppler-0.20 or better" "$LINENO" 5 fi if $PKG_CONFIG zziplib --atleast-version=0.12; then diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 660c2f307ce..5ca2dba6b5a 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -4053,7 +4053,6 @@ esac test "x$enable_dvipng" = xno || { need_kpathsea=yes - need_freetype2=yes need_gd=yes need_t1lib=yes } diff --git a/Build/source/libs/freetype2/ChangeLog b/Build/source/libs/freetype2/ChangeLog index ee53338cd77..5c74dd5a849 100644 --- a/Build/source/libs/freetype2/ChangeLog +++ b/Build/source/libs/freetype2/ChangeLog @@ -1,3 +1,7 @@ +2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Better dependencies for parallel build. + 2012-05-15 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Use $(SHELL) for sub-configure. diff --git a/Build/source/libs/freetype2/Makefile.am b/Build/source/libs/freetype2/Makefile.am index 5fb9ba4cad8..6f660a049b5 100644 --- a/Build/source/libs/freetype2/Makefile.am +++ b/Build/source/libs/freetype2/Makefile.am @@ -14,8 +14,6 @@ rebuild: all ## We want to re-distribute the whole original FreeType source tree. ## -## With current automake (1.10.2) 'make distcheck' fails when -## DISTFILES contains a directory and files in that directory. EXTRA_DIST = $(FREETYPE_TREE) ## Changes applied to the original source tree @@ -28,7 +26,12 @@ dist-hook: noinst_DATA = libfreetype.a -ft-build/Makefile: +# On MacOSX, using our zlib from TL results in a .a that is unusable; ld +# warns "file is not of required architecture", and does not read it. +# There is no apparent reason for this. Using --without-zlib evidently +# causes freetype2 to use its internal zlib, so no functionality should +# be lost, even though it is not the cleanest solution. +ft-config: rm -rf ft-build $(MKDIR_P) ft-build cd ft-build && \ @@ -41,24 +44,15 @@ ft-build/Makefile: --prefix=$(abs_builddir)/ft-install \ --libdir=$(abs_builddir) \ --includedir=$(abs_builddir) + echo timestamp >ft-config -# On MacOSX, using our zlib from TL results in a .a that is unusable; ld -# warns "file is not of required architecture", and does not read it. -# There is no apparent reason for this. Using --without-zlib evidently -# causes freetype2 to use its internal zlib, so no functionality should -# be lost, even though it is not the cleanest solution. -# --with-zlib $(ZLIB_FLAGS_FOR_FREETYPE) \ -# # Unfortunately the FreeType build system installs the headers after the library; # to get our dependencies right we wait for a second and then touch the library. -libfreetype.a: ft-build/Makefile $(ZLIB_DEPEND) +libfreetype.a: ft-config rm -rf ft-install cd ft-build \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) install - ft-install/bin/freetype-config --cflags >ft-includes - ft-install/bin/freetype-config --libs \ - | sed -e 's,-L\(.*\) -lfreetype,\1/libfreetype.la,' >ft-libs sleep 1 @for f in libfreetype.*; do touch $$f; done diff --git a/Build/source/libs/freetype2/Makefile.in b/Build/source/libs/freetype2/Makefile.in index f34d4c55700..2d24b5205ce 100644 --- a/Build/source/libs/freetype2/Makefile.in +++ b/Build/source/libs/freetype2/Makefile.in @@ -512,7 +512,12 @@ rebuild: all dist-hook: rm -rf `find $(distdir) -name .svn` -ft-build/Makefile: +# On MacOSX, using our zlib from TL results in a .a that is unusable; ld +# warns "file is not of required architecture", and does not read it. +# There is no apparent reason for this. Using --without-zlib evidently +# causes freetype2 to use its internal zlib, so no functionality should +# be lost, even though it is not the cleanest solution. +ft-config: rm -rf ft-build $(MKDIR_P) ft-build cd ft-build && \ @@ -525,24 +530,15 @@ ft-build/Makefile: --prefix=$(abs_builddir)/ft-install \ --libdir=$(abs_builddir) \ --includedir=$(abs_builddir) + echo timestamp >ft-config -# On MacOSX, using our zlib from TL results in a .a that is unusable; ld -# warns "file is not of required architecture", and does not read it. -# There is no apparent reason for this. Using --without-zlib evidently -# causes freetype2 to use its internal zlib, so no functionality should -# be lost, even though it is not the cleanest solution. -# --with-zlib $(ZLIB_FLAGS_FOR_FREETYPE) \ -# # Unfortunately the FreeType build system installs the headers after the library; # to get our dependencies right we wait for a second and then touch the library. -libfreetype.a: ft-build/Makefile $(ZLIB_DEPEND) +libfreetype.a: ft-config rm -rf ft-install cd ft-build \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) install - ft-install/bin/freetype-config --cflags >ft-includes - ft-install/bin/freetype-config --libs \ - | sed -e 's,-L\(.*\) -lfreetype,\1/libfreetype.la,' >ft-libs sleep 1 @for f in libfreetype.*; do touch $$f; done diff --git a/Build/source/libs/gd/ChangeLog b/Build/source/libs/gd/ChangeLog index 192f7533b02..137444028e8 100644 --- a/Build/source/libs/gd/ChangeLog +++ b/Build/source/libs/gd/ChangeLog @@ -1,3 +1,9 @@ +2012-11-24 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Better dependencies for parallel build. + * configure.ac: Make sure 'config.status --recheck' leaves the + generated config.h unchanged. + 2012-11-16 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Avoid use of deprecated INCLUDES. diff --git a/Build/source/libs/gd/Makefile.am b/Build/source/libs/gd/Makefile.am index 2cfc5e4bc81..7467539c065 100644 --- a/Build/source/libs/gd/Makefile.am +++ b/Build/source/libs/gd/Makefile.am @@ -14,9 +14,6 @@ rebuild: all ## We want to re-distribute the whole original libpng source tree. ## -## With current automake (1.10.2) 'make distcheck' fails when -## DISTFILES contains a directory and files in that directory. -## Thus nodist_* for all files in $(GD_TREE). EXTRA_DIST = $(GD_TREE) ## Changes applied to the original source tree @@ -46,7 +43,7 @@ AM_CPPFLAGS += -DNONDLL noinst_LIBRARIES=libgd.a -nodist_libgd_a_SOURCES = \ +libgd_a_SOURCES = \ $(GD_TREE)/gd.c \ $(GD_TREE)/gd_gd.c \ $(GD_TREE)/gd_gd2.c \ @@ -78,14 +75,12 @@ nodist_libgd_a_SOURCES = \ $(libgd_a_OBJECTS): config.force -config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) +config.force: $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) echo timestamp >config.force $(SHELL) ./config.status --recheck DISTCLEANFILES = config.force -## Rebuild zlib -@ZLIB_RULE@ ## Rebuild libpng @LIBPNG_RULE@ ## Rebuild libfreetype diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in index ae45659ab36..250924fc847 100644 --- a/Build/source/libs/gd/Makefile.in +++ b/Build/source/libs/gd/Makefile.in @@ -86,7 +86,7 @@ LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libgd_a_AR = $(AR) $(ARFLAGS) libgd_a_LIBADD = -nodist_libgd_a_OBJECTS = gd.$(OBJEXT) gd_gd.$(OBJEXT) gd_gd2.$(OBJEXT) \ +am_libgd_a_OBJECTS = gd.$(OBJEXT) gd_gd.$(OBJEXT) gd_gd2.$(OBJEXT) \ gd_gif_in.$(OBJEXT) gd_gif_out.$(OBJEXT) gd_io.$(OBJEXT) \ gd_io_dp.$(OBJEXT) gd_io_file.$(OBJEXT) gd_io_ss.$(OBJEXT) \ gd_jpeg.$(OBJEXT) gd_png.$(OBJEXT) gd_security.$(OBJEXT) \ @@ -96,7 +96,7 @@ nodist_libgd_a_OBJECTS = gd.$(OBJEXT) gd_gd.$(OBJEXT) gd_gd2.$(OBJEXT) \ gdft.$(OBJEXT) gdfx.$(OBJEXT) gdhelpers.$(OBJEXT) \ gdkanji.$(OBJEXT) gdtables.$(OBJEXT) gdxpm.$(OBJEXT) \ wbmp.$(OBJEXT) -libgd_a_OBJECTS = $(nodist_libgd_a_OBJECTS) +libgd_a_OBJECTS = $(am_libgd_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles @@ -110,8 +110,8 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(nodist_libgd_a_SOURCES) -DIST_SOURCES = +SOURCES = $(libgd_a_SOURCES) +DIST_SOURCES = $(libgd_a_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -307,7 +307,7 @@ SUBDIRS = include AM_CPPFLAGS = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) \ $(LIBPNG_INCLUDES) $(FREETYPE2_INCLUDES) -DNONDLL noinst_LIBRARIES = libgd.a -nodist_libgd_a_SOURCES = \ +libgd_a_SOURCES = \ $(GD_TREE)/gd.c \ $(GD_TREE)/gd_gd.c \ $(GD_TREE)/gd_gd2.c \ @@ -1333,11 +1333,10 @@ dist-hook: $(libgd_a_OBJECTS): config.force -config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) +config.force: $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) echo timestamp >config.force $(SHELL) ./config.status --recheck -@ZLIB_RULE@ @LIBPNG_RULE@ @FREETYPE2_RULE@ diff --git a/Build/source/libs/gd/configure b/Build/source/libs/gd/configure index b09e4048b0d..242b7639f9f 100755 --- a/Build/source/libs/gd/configure +++ b/Build/source/libs/gd/configure @@ -13449,10 +13449,8 @@ 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="$kpse_BLD/libs/freetype2" + FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2" FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la" - FREETYPE2_LIBS="\`cat $FREETYPE2_INCLUDES/ft-libs\`" - FREETYPE2_INCLUDES="\`cat $FREETYPE2_INCLUDES/ft-includes\`" FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la' FREETYPE2_RULE='# Rebuild libfreetype $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h @@ -13561,12 +13559,18 @@ fi $as_echo "#define HAVE_LIBZ 1" >>confdefs.h +$as_echo "#define HAVE_ZLIB_H 1" >>confdefs.h + $as_echo "#define HAVE_LIBPNG 1" >>confdefs.h +$as_echo "#define HAVE_PNG_H 1" >>confdefs.h + $as_echo "#define HAVE_LIBFREETYPE 1" >>confdefs.h +$as_echo "#define HAVE_FT2BUILD_H 1" >>confdefs.h + GD_TREE=gd-2.0.35 diff --git a/Build/source/libs/gd/configure.ac b/Build/source/libs/gd/configure.ac index 6d6226f4484..49da40fa3f1 100644 --- a/Build/source/libs/gd/configure.ac +++ b/Build/source/libs/gd/configure.ac @@ -63,8 +63,11 @@ echo timestamp >config.force fi AC_DEFINE([HAVE_LIBZ], 1, [Define if you have zlib.]) +AC_DEFINE([HAVE_ZLIB_H], 1) AC_DEFINE([HAVE_LIBPNG], 1, [Define if you have the png library.]) +AC_DEFINE([HAVE_PNG_H], 1) AC_DEFINE([HAVE_LIBFREETYPE], 1, [ Define if you have the freetype library.]) +AC_DEFINE([HAVE_FT2BUILD_H], 1) AC_SUBST([GD_TREE], [gd-]gd_version) diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index d617e2f6fbc..b0bf1658fc8 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,6 +1,12 @@ +2012-11-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * kpse-poppler-flags.m4: Require poppler-0.20 or better for + definition of POPPLER_VERSION in <poppler-config.h>. + 2012-11-20 Peter Breitenlohner <peb@mppmu.mpg.de> * kpse-poppler-flags.m4: Require poppler-0.18 or better. + * kpse-freetype2-flags.m4: Simplify flags for lib from TL tree. 2012-10-19 Peter Breitenlohner <peb@mppmu.mpg.de> diff --git a/Build/source/m4/kpse-freetype2-flags.m4 b/Build/source/m4/kpse-freetype2-flags.m4 index 40d4e2a6fb0..18f0edaba5c 100644 --- a/Build/source/m4/kpse-freetype2-flags.m4 +++ b/Build/source/m4/kpse-freetype2-flags.m4 @@ -17,10 +17,8 @@ AC_DEFUN([KPSE_FREETYPE2_FLAGS], [AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl AC_REQUIRE([_KPSE_CHECK_FT2_CONFIG])[]dnl _KPSE_LIB_FLAGS([freetype2], [freetype], [lt], - [BLD/libs/freetype2], - [BLD/libs/freetype2/libfreetype.la], - [FREETYPE2_LIBS="\`cat $FREETYPE2_INCLUDES/ft-libs\`" - FREETYPE2_INCLUDES="\`cat $FREETYPE2_INCLUDES/ft-includes\`"], + [-IBLD/libs/freetype2/freetype2 -IBLD/libs/freetype2], + [BLD/libs/freetype2/libfreetype.la], [], [], [${top_builddir}/../../libs/freetype2/ft2build.h])[]dnl ]) # KPSE_FREETYPE2_FLAGS diff --git a/Build/source/m4/kpse-poppler-flags.m4 b/Build/source/m4/kpse-poppler-flags.m4 index 4e3823f0036..40371a11161 100644 --- a/Build/source/m4/kpse-poppler-flags.m4 +++ b/Build/source/m4/kpse-poppler-flags.m4 @@ -33,10 +33,10 @@ AC_DEFUN([KPSE_POPPLER_OPTIONS], # ---------------------- AC_DEFUN([KPSE_POPPLER_SYSTEM_FLAGS], [AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl -if $PKG_CONFIG poppler --atleast-version=0.18; then +if $PKG_CONFIG poppler --atleast-version=0.20; then POPPLER_INCLUDES=`$PKG_CONFIG poppler --cflags` POPPLER_LIBS=`$PKG_CONFIG poppler --libs` elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then - AC_MSG_ERROR([did not find poppler-0.18 or better]) + AC_MSG_ERROR([did not find poppler-0.20 or better]) fi ]) # KPSE_POPPLER_SYSTEM_FLAGS diff --git a/Build/source/texk/configure b/Build/source/texk/configure index a59659437f8..04109ee88cc 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -4075,7 +4075,6 @@ esac test "x$enable_dvipng" = xno || { need_kpathsea=yes - need_freetype2=yes need_gd=yes need_t1lib=yes } diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog index 5afb2a3c1fd..5797412bf00 100644 --- a/Build/source/texk/dvipng/ChangeLog +++ b/Build/source/texk/dvipng/ChangeLog @@ -1,3 +1,7 @@ +2012-11-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (dvipng_dependencies): Drop indirect dependencies. + 2012-07-25 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Drop check for 64-bit integer types, already diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am index bdbff49a2f5..3b6e5c8dd67 100644 --- a/Build/source/texk/dvipng/Makefile.am +++ b/Build/source/texk/dvipng/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/dvipng/ ## -## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## #************************************************************************ @@ -75,8 +75,7 @@ nodist_dvipng_SOURCES += \ $(DVIPNG_TREE)/tfm.c endif have_ft2_or_t1 -dvipng_dependencies = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) $(LIBPNG_DEPEND) -dvipng_dependencies += $(T1LIB_DEPEND) $(FREETYPE2_DEPEND) $(GD_DEPEND) +dvipng_dependencies = $(KPATHSEA_DEPEND) $(T1LIB_DEPEND) $(GD_DEPEND) $(dvipng_OBJECTS): config.force @@ -98,16 +97,10 @@ dvigif_LDADD = ## Rebuild libkpathsea @KPATHSEA_RULE@ -## Rebuild libfreetype -@FREETYPE2_RULE@ ## Rebuild libgd @GD_RULE@ ## Rebuild libt1 @T1LIB_RULE@ -## Rebuild libpng -@LIBPNG_RULE@ -## Rebuild libz -@ZLIB_RULE@ include $(srcdir)/../am/bin_links.am diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in index 8f0762fe0ac..0dc599e543b 100644 --- a/Build/source/texk/dvipng/Makefile.in +++ b/Build/source/texk/dvipng/Makefile.in @@ -377,9 +377,7 @@ nodist_dvipng_SOURCES = $(DVIPNG_TREE)/color.c $(DVIPNG_TREE)/draw.c \ $(DVIPNG_TREE)/ppagelist.c $(DVIPNG_TREE)/set.c \ $(DVIPNG_TREE)/special.c $(DVIPNG_TREE)/vf.c $(am__append_1) \ $(am__append_2) $(am__append_3) -dvipng_dependencies = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) \ - $(LIBPNG_DEPEND) $(T1LIB_DEPEND) $(FREETYPE2_DEPEND) \ - $(GD_DEPEND) +dvipng_dependencies = $(KPATHSEA_DEPEND) $(T1LIB_DEPEND) $(GD_DEPEND) DISTCLEANFILES = config.force LDADD = $(KPATHSEA_LIBS) $(GD_LIBS) $(FREETYPE2_LIBS) $(T1LIB_LIBS) \ $(LIBPNG_LIBS) $(ZLIB_LIBS) @@ -1389,11 +1387,8 @@ config.force: $(dvipng_dependencies) $(SHELL) ./config.status Makefile config.h @KPATHSEA_RULE@ -@FREETYPE2_RULE@ @GD_RULE@ @T1LIB_RULE@ -@LIBPNG_RULE@ -@ZLIB_RULE@ .PHONY: install-bin-links uninstall-bin-links install-bin-links: diff --git a/Build/source/texk/dvipng/ac/withenable.ac b/Build/source/texk/dvipng/ac/withenable.ac index 0ccd52f780e..07865f537fb 100644 --- a/Build/source/texk/dvipng/ac/withenable.ac +++ b/Build/source/texk/dvipng/ac/withenable.ac @@ -1,8 +1,8 @@ ## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/ dnl -dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for dvipng -KPSE_ENABLE_PROG([dvipng], [kpathsea freetype2 gd t1lib]) +KPSE_ENABLE_PROG([dvipng], [kpathsea gd t1lib]) m4_include(kpse_TL[texk/dvipng/ac/dvipng.ac]) diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure index 9773095216b..32ec48f1a8b 100755 --- a/Build/source/texk/dvipng/configure +++ b/Build/source/texk/dvipng/configure @@ -16204,10 +16204,8 @@ 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="$kpse_BLD/libs/freetype2" + FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2" FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la" - FREETYPE2_LIBS="\`cat $FREETYPE2_INCLUDES/ft-libs\`" - FREETYPE2_INCLUDES="\`cat $FREETYPE2_INCLUDES/ft-includes\`" FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la' FREETYPE2_RULE='# Rebuild libfreetype $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure index 20e68f890a3..68ef082e93d 100755 --- a/Build/source/texk/dvisvgm/configure +++ b/Build/source/texk/dvisvgm/configure @@ -18931,10 +18931,8 @@ 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="$kpse_BLD/libs/freetype2" + FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2" FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la" - FREETYPE2_LIBS="\`cat $FREETYPE2_INCLUDES/ft-libs\`" - FREETYPE2_INCLUDES="\`cat $FREETYPE2_INCLUDES/ft-includes\`" FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la' FREETYPE2_RULE='# Rebuild libfreetype $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h diff --git a/Build/source/texk/ttf2pk2/configure b/Build/source/texk/ttf2pk2/configure index 22d9efbba0f..83be7dca592 100755 --- a/Build/source/texk/ttf2pk2/configure +++ b/Build/source/texk/ttf2pk2/configure @@ -14440,10 +14440,8 @@ 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="$kpse_BLD/libs/freetype2" + FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2" FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la" - FREETYPE2_LIBS="\`cat $FREETYPE2_INCLUDES/ft-libs\`" - FREETYPE2_INCLUDES="\`cat $FREETYPE2_INCLUDES/ft-includes\`" FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la' FREETYPE2_RULE='# Rebuild libfreetype $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 3a1ca87248c..c3856551c70 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -22688,11 +22688,11 @@ if test "${with_system_poppler+set}" = set; then : withval=$with_system_poppler; fi if test "x$with_system_poppler" = xyes; then - if $PKG_CONFIG poppler --atleast-version=0.18; then + if $PKG_CONFIG poppler --atleast-version=0.20; then POPPLER_INCLUDES=`$PKG_CONFIG poppler --cflags` POPPLER_LIBS=`$PKG_CONFIG poppler --libs` elif test "x$need_poppler:$with_system_poppler" = xyes:yes; then - as_fn_error $? "did not find poppler-0.18 or better" "$LINENO" 5 + as_fn_error $? "did not find poppler-0.20 or better" "$LINENO" 5 fi else POPPLER_INCLUDES="-I$kpse_BLD/libs/poppler -I$kpse_BLD/libs/poppler/goo -I$kpse_BLD/libs/poppler/poppler" @@ -22860,10 +22860,8 @@ 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="$kpse_BLD/libs/freetype2" + FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2" FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la" - FREETYPE2_LIBS="\`cat $FREETYPE2_INCLUDES/ft-libs\`" - FREETYPE2_INCLUDES="\`cat $FREETYPE2_INCLUDES/ft-includes\`" FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la' FREETYPE2_RULE='# Rebuild libfreetype $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure index cd6123f032a..7ce8b83ca7a 100755 --- a/Build/source/texk/xdvipdfmx/configure +++ b/Build/source/texk/xdvipdfmx/configure @@ -15513,10 +15513,8 @@ 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="$kpse_BLD/libs/freetype2" + FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2" FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la" - FREETYPE2_LIBS="\`cat $FREETYPE2_INCLUDES/ft-libs\`" - FREETYPE2_INCLUDES="\`cat $FREETYPE2_INCLUDES/ft-includes\`" FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la' FREETYPE2_RULE='# Rebuild libfreetype $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h diff --git a/Build/source/utils/configure b/Build/source/utils/configure index 14c0bf68fc7..3517beaa910 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -4051,7 +4051,6 @@ esac test "x$enable_dvipng" = xno || { need_kpathsea=yes - need_freetype2=yes need_gd=yes need_t1lib=yes } |