summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/freetype2')
-rw-r--r--Build/source/libs/freetype2/Makefile.am19
-rw-r--r--Build/source/libs/freetype2/Makefile.in23
-rw-r--r--Build/source/libs/freetype2/ac/withenable.ac4
-rw-r--r--Build/source/libs/freetype2/aclocal.m42
-rwxr-xr-xBuild/source/libs/freetype2/configure65
-rw-r--r--Build/source/libs/freetype2/configure.ac7
6 files changed, 20 insertions, 100 deletions
diff --git a/Build/source/libs/freetype2/Makefile.am b/Build/source/libs/freetype2/Makefile.am
index edfe538a56e..5f6bbe0fdf4 100644
--- a/Build/source/libs/freetype2/Makefile.am
+++ b/Build/source/libs/freetype2/Makefile.am
@@ -14,7 +14,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
## DISTFILES contains a directory and files in that directory.
EXTRA_DIST = $(FREETYPE_TREE)
-## in case of an SVN repository
+# in case of an SVN repository
dist-hook:
rm -rf `find $(distdir)/$(FREETYPE_TREE) -name .svn`
@@ -31,6 +31,7 @@ ft-build/Makefile:
--with-old-mac-fonts \
--without-zlib \
--prefix=$(abs_builddir)/ft-install \
+ --libdir=$(abs_builddir) \
--includedir=$(abs_builddir)
# On MacOSX, using our zlib from TL results in a .a that is unusable; ld
@@ -40,22 +41,18 @@ ft-build/Makefile:
# 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;
-## get our dependencies right we wait for a second and then touch the library.
+# 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)
rm -rf ft-install
cd ft-build \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) install
- mv ft-install/lib/libfreetype.a .
+ ft-install/bin/freetype-config --cflags >ft-includes
+ ft-install/bin/freetype-config --libs >ft-libs
sleep 1
- touch libfreetype.a
- rm -rf ft-install
-
-## Rebuild zlib
-@ZLIB_RULE@
+ @for f in libfreetype.*; do touch $$f; done
clean-local:
- rm -rf libfreetype.a ft2build.h freetype2 ft-build ft-install
+ rm -rf freetype* ft2build.h ft-* libfreetype.* pkgconfig
diff --git a/Build/source/libs/freetype2/Makefile.in b/Build/source/libs/freetype2/Makefile.in
index 9ce9c30555b..c8e60494663 100644
--- a/Build/source/libs/freetype2/Makefile.in
+++ b/Build/source/libs/freetype2/Makefile.in
@@ -40,9 +40,7 @@ DIST_COMMON = $(am__configure_deps) \
../../build-aux/ltmain.sh ../../build-aux/missing \
../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
- $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -97,10 +95,6 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
-ZLIB_DEPEND = @ZLIB_DEPEND@
-ZLIB_FLAGS_FOR_FREETYPE = @ZLIB_FLAGS_FOR_FREETYPE@
-ZLIB_INCLUDES = @ZLIB_INCLUDES@
-ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -422,6 +416,7 @@ uninstall-am:
pdf-am ps ps-am uninstall uninstall-am
+# in case of an SVN repository
dist-hook:
rm -rf `find $(distdir)/$(FREETYPE_TREE) -name .svn`
@@ -434,6 +429,7 @@ ft-build/Makefile:
--with-old-mac-fonts \
--without-zlib \
--prefix=$(abs_builddir)/ft-install \
+ --libdir=$(abs_builddir) \
--includedir=$(abs_builddir)
# On MacOSX, using our zlib from TL results in a .a that is unusable; ld
@@ -443,21 +439,20 @@ ft-build/Makefile:
# 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)
rm -rf ft-install
cd ft-build \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) install
- mv ft-install/lib/libfreetype.a .
+ ft-install/bin/freetype-config --cflags >ft-includes
+ ft-install/bin/freetype-config --libs >ft-libs
sleep 1
- touch libfreetype.a
- rm -rf ft-install
-
-@ZLIB_RULE@
+ @for f in libfreetype.*; do touch $$f; done
clean-local:
- rm -rf libfreetype.a ft2build.h freetype2 ft-build ft-install
+ rm -rf freetype* ft2build.h ft-* libfreetype.* pkgconfig
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/Build/source/libs/freetype2/ac/withenable.ac b/Build/source/libs/freetype2/ac/withenable.ac
index 1ac95763640..26d7144f440 100644
--- a/Build/source/libs/freetype2/ac/withenable.ac
+++ b/Build/source/libs/freetype2/ac/withenable.ac
@@ -4,4 +4,6 @@ dnl Copyright (C) 2009 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 freetype2
-KPSE_WITH_LIB([freetype2], [zlib], , , [both -IDIR and -IDIR/freetype2])
+dnl Due to Mac OS X problems we use the internal zlib code.
+dnl KPSE_WITH_LIB([freetype2], [zlib], [nodirs])
+KPSE_WITH_LIB([freetype2], , [nodirs], [requires freetype-config])
diff --git a/Build/source/libs/freetype2/aclocal.m4 b/Build/source/libs/freetype2/aclocal.m4
index addc3e47032..a249a8e6d87 100644
--- a/Build/source/libs/freetype2/aclocal.m4
+++ b/Build/source/libs/freetype2/aclocal.m4
@@ -616,5 +616,3 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-m4_include([../../m4/kpse-common.m4])
-m4_include([../../m4/kpse-zlib-flags.m4])
diff --git a/Build/source/libs/freetype2/configure b/Build/source/libs/freetype2/configure
index a0280b46d2a..7a1f760fe2d 100755
--- a/Build/source/libs/freetype2/configure
+++ b/Build/source/libs/freetype2/configure
@@ -607,11 +607,6 @@ FREETYPE_TREE
config_args
build_FALSE
build_TRUE
-ZLIB_FLAGS_FOR_FREETYPE
-ZLIB_RULE
-ZLIB_DEPEND
-ZLIB_LIBS
-ZLIB_INCLUDES
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -679,9 +674,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
-with_system_zlib
-with_zlib_includes
-with_zlib_libdir
'
ac_precious_vars='build_alias
host_alias
@@ -1316,14 +1308,6 @@ Optional Features:
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
-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
-
Report bugs to <tex-k@tug.org>.
_ACEOF
ac_status=$?
@@ -2286,55 +2270,6 @@ fi
-## _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=`echo '-IBLD/libs/zlib' | sed \
- -e "s,SRC/,$kpse_SRC/,g" \
- -e "s,BLD/,$kpse_BLD/,g"`
- ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \
- -e "s,BLD/,$kpse_BLD/,g"`
- ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \
- -e 's,BLD/,${top_builddir}/../../,g'`
- ZLIB_RULE='# Rebuild libz
-$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h
- cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS)
-${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h:
- cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS)'
-fi
-
-
-ZLIB_FLAGS_FOR_FREETYPE="LIBZ='$ZLIB_LIBS'"
-test -n "$ZLIB_INCLUDES" && \
- ZLIB_FLAGS_FOR_FREETYPE="CPPFLAGS='$ZLIB_INCLUDES' $ZLIB_FLAGS_FOR_FREETYPE"
-
-
if test "x$enable_build" != xno; then
build_TRUE=
build_FALSE='#'
diff --git a/Build/source/libs/freetype2/configure.ac b/Build/source/libs/freetype2/configure.ac
index 45b775d5f18..aef7b5b3d30 100644
--- a/Build/source/libs/freetype2/configure.ac
+++ b/Build/source/libs/freetype2/configure.ac
@@ -16,13 +16,6 @@ AC_CONFIG_MACRO_DIR([../../m4])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-KPSE_ZLIB_FLAGS
-
-ZLIB_FLAGS_FOR_FREETYPE="LIBZ='$ZLIB_LIBS'"
-test -n "$ZLIB_INCLUDES" && \
- ZLIB_FLAGS_FOR_FREETYPE="CPPFLAGS='$ZLIB_INCLUDES' $ZLIB_FLAGS_FOR_FREETYPE"
-AC_SUBST([ZLIB_FLAGS_FOR_FREETYPE])
-
AM_CONDITIONAL([build], [test "x$enable_build" != xno])
if test "x$host" = x; then