summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-22 18:17:33 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-22 18:17:33 +0000
commit633c2bc993d2ad14ecf137836f22eef08805a3b5 (patch)
tree784c479c7046d0dbf7cbfb9446c7762b5e1bb494 /Build/source/libs
parent62b00fcce4ced507597a1c9b18116b781f0d1a9e (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/libs')
-rwxr-xr-xBuild/source/libs/configure150
-rw-r--r--Build/source/libs/freetype/Makefile.am7
-rw-r--r--Build/source/libs/freetype/Makefile.in4
-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
9 files changed, 90 insertions, 191 deletions
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 243aa4c8b5c..189c6d7e4f2 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -774,6 +774,7 @@ enable_mktextex_default
with_system_teckit
with_teckit_includes
with_teckit_libdir
+with_graphite
with_system_graphite
with_graphite_includes
with_graphite_libdir
@@ -781,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
@@ -1552,6 +1551,7 @@ Optional Packages:
teckit headers installed in DIR
--with-teckit-libdir=DIR
teckit library installed in DIR
+ --without-graphite build XeTeX without graphite support
--with-system-graphite use installed graphite headers and library
--with-graphite-includes=DIR
graphite headers installed in DIR
@@ -1561,11 +1561,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
@@ -2177,11 +2173,11 @@ if test "x$enable_multiplatform" = xyes; then
fi
-## ac/withenable.ac
+## ac/withenable.ac: configure.ac fragment for the TeX Live top-level
-## utils/ac/withenable.ac
+## utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/
-## utils/dialog/ac/withenable.ac
+## utils/dialog/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/dialog/
## configure options and TL libraries required for dialog
# Check whether --enable-dialog was given.
if test "${enable_dialog+set}" = set; then
@@ -2196,7 +2192,7 @@ $as_echo "$as_me: Assuming \`--enable-dialog=$enable_dialog'" >&6;}
esac
-## utils/pdfopen/ac/withenable.ac
+## utils/pdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pdfopen/
## configure options and TL libraries required for pdfopen
# Check whether --enable-pdfopen was given.
if test "${enable_pdfopen+set}" = set; then
@@ -2211,7 +2207,7 @@ $as_echo "$as_me: Assuming \`--enable-pdfopen=$enable_pdfopen'" >&6;}
esac
-## utils/ps2eps/ac/withenable.ac
+## utils/ps2eps/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ps2eps/
## configure options and TL libraries required for ps2eps
# Check whether --enable-ps2eps was given.
if test "${enable_ps2eps+set}" = set; then
@@ -2226,7 +2222,7 @@ $as_echo "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;}
esac
-## utils/psutils/ac/withenable.ac
+## utils/psutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/psutils/
## configure options and TL libraries required for psutils
# Check whether --enable-psutils was given.
if test "${enable_psutils+set}" = set; then
@@ -2241,7 +2237,7 @@ $as_echo "$as_me: Assuming \`--enable-psutils=$enable_psutils'" >&6;}
esac
-## utils/t1utils/ac/withenable.ac
+## utils/t1utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/t1utils/
## configure options and TL libraries required for t1utils
# Check whether --enable-t1utils was given.
if test "${enable_t1utils+set}" = set; then
@@ -2256,7 +2252,7 @@ $as_echo "$as_me: Assuming \`--enable-t1utils=$enable_t1utils'" >&6;}
esac
-## utils/tpic2pdftex/ac/withenable.ac
+## utils/tpic2pdftex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/tpic2pdftex/
## configure options and TL libraries required for tpic2pdftex
# Check whether --enable-tpic2pdftex was given.
if test "${enable_tpic2pdftex+set}" = set; then
@@ -2271,7 +2267,7 @@ $as_echo "$as_me: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&6;}
esac
-## utils/vlna/ac/withenable.ac
+## utils/vlna/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/vlna/
## configure options and TL libraries required for vlna
# Check whether --enable-vlna was given.
if test "${enable_vlna+set}" = set; then
@@ -2287,7 +2283,7 @@ esac
-## texk/ac/withenable.ac
+## texk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/
## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
## configure options and TL libraries required for web2c
@@ -2459,7 +2455,7 @@ if test "${enable_web_progs+set}" = set; then
fi
-## texk/afm2pl/ac/withenable.ac
+## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/
## configure options and TL libraries required for afm2pl
# Check whether --enable-afm2pl was given.
if test "${enable_afm2pl+set}" = set; then
@@ -2478,7 +2474,7 @@ test "x$enable_afm2pl" = xno || {
}
-## texk/bibtex8/ac/withenable.ac
+## texk/bibtex8/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex8/
## configure options and TL libraries required for bibtex8
# Check whether --enable-bibtex8 was given.
if test "${enable_bibtex8+set}" = set; then
@@ -2497,7 +2493,7 @@ test "x$enable_bibtex8" = xno || {
}
-## texk/cjkutils/ac/withenable.ac
+## texk/cjkutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/cjkutils/
## configure options and TL libraries required for cjkutils
# Check whether --enable-cjkutils was given.
if test "${enable_cjkutils+set}" = set; then
@@ -2516,7 +2512,7 @@ test "x$enable_cjkutils" = xno || {
}
-## texk/detex/ac/withenable.ac
+## texk/detex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/detex/
## configure options and TL libraries required for detex
# Check whether --enable-detex was given.
if test "${enable_detex+set}" = set; then
@@ -2535,7 +2531,7 @@ test "x$enable_detex" = xno || {
}
-## texk/devnag/ac/withenable.ac
+## texk/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/devnag/
## configure options and TL libraries required for devnag
# Check whether --enable-devnag was given.
if test "${enable_devnag+set}" = set; then
@@ -2550,7 +2546,7 @@ $as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
esac
-## texk/dtl/ac/withenable.ac
+## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/
## configure options and TL libraries required for dtl
# Check whether --enable-dtl was given.
if test "${enable_dtl+set}" = set; then
@@ -2569,7 +2565,7 @@ test "x$enable_dtl" = xno || {
}
-## texk/dvi2tty/ac/withenable.ac
+## texk/dvi2tty/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvi2tty/
## configure options and TL libraries required for dvi2tty
# Check whether --enable-dvi2tty was given.
if test "${enable_dvi2tty+set}" = set; then
@@ -2588,7 +2584,7 @@ test "x$enable_dvi2tty" = xno || {
}
-## texk/dvidvi/ac/withenable.ac
+## texk/dvidvi/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvidvi/
## configure options and TL libraries required for dvidvi
# Check whether --enable-dvidvi was given.
if test "${enable_dvidvi+set}" = set; then
@@ -2607,7 +2603,7 @@ test "x$enable_dvidvi" = xno || {
}
-## texk/dviljk/ac/withenable.ac
+## texk/dviljk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviljk/
## configure options and TL libraries required for dviljk
# Check whether --enable-dviljk was given.
if test "${enable_dviljk+set}" = set; then
@@ -2626,7 +2622,7 @@ test "x$enable_dviljk" = xno || {
}
-## texk/dvipdfm/ac/withenable.ac
+## texk/dvipdfm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm/
## configure options and TL libraries required for dvipdfm
# Check whether --enable-dvipdfm was given.
if test "${enable_dvipdfm+set}" = set; then
@@ -2646,7 +2642,7 @@ test "x$enable_dvipdfm" = xno || {
}
-## texk/dvipdfmx/ac/withenable.ac
+## texk/dvipdfmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfmx/
## configure options and TL libraries required for dvipdfmx
# Check whether --enable-dvipdfmx was given.
if test "${enable_dvipdfmx+set}" = set; then
@@ -2666,7 +2662,7 @@ test "x$enable_dvipdfmx" = xno || {
}
-## texk/dvipng/ac/withenable.ac
+## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/
## configure options and TL libraries required for dvipng
# Check whether --enable-dvipng was given.
if test "${enable_dvipng+set}" = set; then
@@ -2687,7 +2683,7 @@ test "x$enable_dvipng" = xno || {
need_t1lib=yes
}
-## texk/dvipng/ac/dvipng.ac
+## texk/dvipng/ac/dvipng.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/
## configure options for dvipng
# Check whether --enable-debug was given.
if test "${enable_debug+set}" = set; then
@@ -2707,7 +2703,7 @@ fi
-## texk/dvipos/ac/withenable.ac
+## texk/dvipos/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipos/
## configure options and TL libraries required for dvipos
# Check whether --enable-dvipos was given.
if test "${enable_dvipos+set}" = set; then
@@ -2726,7 +2722,7 @@ test "x$enable_dvipos" = xno || {
}
-## texk/dvipsk/ac/withenable.ac
+## texk/dvipsk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipsk/
## configure options and TL libraries required for dvipsk
# Check whether --enable-dvipsk was given.
if test "${enable_dvipsk+set}" = set; then
@@ -2745,7 +2741,7 @@ test "x$enable_dvipsk" = xno || {
}
-## texk/gsftopk/ac/withenable.ac
+## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
## configure options and TL libraries required for gsftopk
# Check whether --enable-gsftopk was given.
if test "${enable_gsftopk+set}" = set; then
@@ -2764,7 +2760,7 @@ test "x$enable_gsftopk" = xno || {
}
-## texk/lacheck/ac/withenable.ac
+## texk/lacheck/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lacheck/
## configure options and TL libraries required for lacheck
# Check whether --enable-lacheck was given.
if test "${enable_lacheck+set}" = set; then
@@ -2783,7 +2779,7 @@ test "x$enable_lacheck" = xno || {
}
-## texk/lcdf-typetools/ac/withenable.ac
+## texk/lcdf-typetools/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/
## configure options and TL libraries required for lcdf-typetools
# Check whether --enable-lcdf-typetools was given.
if test "${enable_lcdf_typetools+set}" = set; then
@@ -2801,7 +2797,7 @@ test "x$enable_lcdf_typetools" = xno || {
need_kpathsea=yes
}
-## texk/lcdf-typetools/ac/lcdf-typetools.ac
+## texk/lcdf-typetools/ac/lcdf-typetools.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/
## configure options for lcdf-typetools
# Check whether --enable-cfftot1 was given.
if test "${enable_cfftot1+set}" = set; then
@@ -2863,7 +2859,7 @@ fi
-## texk/makeindexk/ac/withenable.ac
+## texk/makeindexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makeindexk/
## configure options and TL libraries required for makeindexk
# Check whether --enable-makeindexk was given.
if test "${enable_makeindexk+set}" = set; then
@@ -2882,7 +2878,7 @@ test "x$enable_makeindexk" = xno || {
}
-## texk/musixflx/ac/withenable.ac
+## texk/musixflx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixflx/
## configure options and TL libraries required for musixflx
# Check whether --enable-musixflx was given.
if test "${enable_musixflx+set}" = set; then
@@ -2897,7 +2893,7 @@ $as_echo "$as_me: Assuming \`--enable-musixflx=$enable_musixflx'" >&6;}
esac
-## texk/ps2pkm/ac/withenable.ac
+## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/
## configure options and TL libraries required for ps2pkm
# Check whether --enable-ps2pkm was given.
if test "${enable_ps2pkm+set}" = set; then
@@ -2916,7 +2912,7 @@ test "x$enable_ps2pkm" = xno || {
}
-## texk/seetexk/ac/withenable.ac
+## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/
## configure options and TL libraries required for seetexk
# Check whether --enable-seetexk was given.
if test "${enable_seetexk+set}" = set; then
@@ -2935,7 +2931,7 @@ test "x$enable_seetexk" = xno || {
}
-## texk/tex4htk/ac/withenable.ac
+## texk/tex4htk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tex4htk/
## configure options and TL libraries required for tex4htk
# Check whether --enable-tex4htk was given.
if test "${enable_tex4htk+set}" = set; then
@@ -2954,7 +2950,7 @@ test "x$enable_tex4htk" = xno || {
}
-## texk/ttf2pk/ac/withenable.ac
+## texk/ttf2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk/
## configure options and TL libraries required for ttf2pk
# Check whether --enable-ttf2pk was given.
if test "${enable_ttf2pk+set}" = set; then
@@ -2974,7 +2970,7 @@ test "x$enable_ttf2pk" = xno || {
}
-## texk/ttfdump/ac/withenable.ac
+## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/
## configure options and TL libraries required for ttfdump
# Check whether --enable-ttfdump was given.
if test "${enable_ttfdump+set}" = set; then
@@ -2993,7 +2989,7 @@ test "x$enable_ttfdump" = xno || {
}
-## texk/xdv2pdf/ac/withenable.ac
+## texk/xdv2pdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdv2pdf/
## configure options and TL libraries required for xdv2pdf
# Check whether --enable-xdv2pdf was given.
if test "${enable_xdv2pdf+set}" = set; then
@@ -3012,7 +3008,7 @@ test "x$enable_xdv2pdf" = xno || {
}
-## texk/xdvik/ac/withenable.ac
+## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/
## configure options and TL libraries required for xdvik
# Check whether --enable-xdvik was given.
if test "${enable_xdvik+set}" = set; then
@@ -3031,7 +3027,7 @@ test "x$enable_xdvik" = xno || {
need_t1lib=yes
}
-## texk/xdvik/ac/xdvik.ac
+## texk/xdvik/ac/xdvik.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/
## configure options for xdvik
# Check whether --with-xdvi-x-toolkit was given.
@@ -3041,7 +3037,7 @@ fi
-## texk/xdvipdfmx/ac/withenable.ac
+## texk/xdvipdfmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvipdfmx/
## configure options and TL libraries required for xdvipdfmx
# Check whether --enable-xdvipdfmx was given.
if test "${enable_xdvipdfmx+set}" = set; then
@@ -3062,7 +3058,7 @@ test "x$enable_xdvipdfmx" = xno || {
}
-## texk/tetex/ac/withenable.ac
+## texk/tetex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tetex/
## configure options and TL libraries required for tetex
# Check whether --enable-tetex was given.
if test "${enable_tetex+set}" = set; then
@@ -3077,7 +3073,7 @@ $as_echo "$as_me: Assuming \`--enable-tetex=$enable_tetex'" >&6;}
esac
-## texk/texlive/ac/withenable.ac
+## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
## configure options and TL libraries required for texlive
# Check whether --enable-texlive was given.
if test "${enable_texlive+set}" = set; then
@@ -3183,13 +3179,13 @@ case $enable_mktextex_default in
esac
-## libs/ac/withenable.ac
+## libs/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/
## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/
## configure options and TL libraries required for icu (modified for XeTeX)
-## libs/teckit/ac/withenable.ac
+## libs/teckit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/
## configure options and TL libraries required for teckit
# Check whether --with-system-teckit was given.
@@ -3236,7 +3232,15 @@ test "x$need_teckit" = xyes && {
}
-## libs/graphite/ac/withenable.ac
+## libs/graphite/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite/
+## XeTeX can be built without graphite support
+
+# Check whether --with-graphite was given.
+if test "${with_graphite+set}" = set; then
+ withval=$with_graphite;
+fi
+
+test "x$with_graphite" = xno && need_graphite=no
## configure options and TL libraries required for graphite
# Check whether --with-system-graphite was given.
@@ -3267,11 +3271,11 @@ $as_echo "$as_me: Assuming installed \`graphite' headers and library" >&6;}
fi
-## libs/xpdf/ac/withenable.ac
+## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/
## configure options and TL libraries required for xpdf
-## libs/gd/kpse/withenable.ac
+## libs/gd/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
## configure options and TL libraries required for gd
# Check whether --with-system-gd was given.
@@ -3318,23 +3322,13 @@ test "x$need_gd" = xyes && {
}
-## libs/freetype2/ac/withenable.ac
+## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/
## configure options and TL libraries required for freetype2
# Check whether --with-system-freetype2 was given.
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
@@ -3347,25 +3341,9 @@ $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
+## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/
## configure options and TL libraries required for freetype
# Check whether --with-system-freetype was given.
@@ -3396,7 +3374,7 @@ $as_echo "$as_me: Assuming installed \`freetype' headers and library" >&6;}
fi
-## libs/t1lib/ac/withenable.ac
+## libs/t1lib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/t1lib/
## configure options and TL libraries required for t1lib
# Check whether --with-system-t1lib was given.
@@ -3427,11 +3405,11 @@ $as_echo "$as_me: Assuming installed \`t1lib' headers and library" >&6;}
fi
-## libs/obsdcompat/ac/withenable.ac
+## libs/obsdcompat/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/obsdcompat/
## configure options and TL libraries required for obsdcompat
-## libs/libpng/kpse/withenable.ac
+## libs/libpng/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/
## configure options and TL libraries required for libpng
# Check whether --with-system-libpng was given.
@@ -3478,7 +3456,7 @@ test "x$need_libpng" = xyes && {
}
-## libs/zlib/ac/withenable.ac
+## libs/zlib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/
## configure options and TL libraries required for zlib
# Check whether --with-system-zlib was given.
diff --git a/Build/source/libs/freetype/Makefile.am b/Build/source/libs/freetype/Makefile.am
index 0dd6397767a..e5842f97d36 100644
--- a/Build/source/libs/freetype/Makefile.am
+++ b/Build/source/libs/freetype/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,8 +31,8 @@ ft-build/Makefile:
--prefix=$(abs_builddir)/ft-install \
--includedir=$(abs_builddir)
-## 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.
+# 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.
libttf.a: ft-build/Makefile
rm -rf ft-install
cd ft-build/lib \
@@ -41,7 +41,6 @@ libttf.a: ft-build/Makefile
mv ft-install/lib/libttf.a .
sleep 1
touch libttf.a
- rm -rf ft-install
clean-local:
rm -rf libttf.a freetype ft-build ft-install
diff --git a/Build/source/libs/freetype/Makefile.in b/Build/source/libs/freetype/Makefile.in
index 4120063de74..3ce20b9fd07 100644
--- a/Build/source/libs/freetype/Makefile.in
+++ b/Build/source/libs/freetype/Makefile.in
@@ -416,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`
@@ -428,6 +429,8 @@ ft-build/Makefile:
--prefix=$(abs_builddir)/ft-install \
--includedir=$(abs_builddir)
+# 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.
libttf.a: ft-build/Makefile
rm -rf ft-install
cd ft-build/lib \
@@ -436,7 +439,6 @@ libttf.a: ft-build/Makefile
mv ft-install/lib/libttf.a .
sleep 1
touch libttf.a
- rm -rf ft-install
clean-local:
rm -rf libttf.a freetype ft-build ft-install
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