summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source')
-rwxr-xr-xBuild/source/configure9
-rwxr-xr-xBuild/source/libs/configure9
-rw-r--r--Build/source/libs/harfbuzz/ChangeLog6
-rw-r--r--Build/source/libs/harfbuzz/Makefile.am7
-rw-r--r--Build/source/libs/harfbuzz/Makefile.in16
-rw-r--r--Build/source/libs/harfbuzz/ac/withenable.ac2
-rw-r--r--Build/source/libs/harfbuzz/config.h.in6
-rwxr-xr-xBuild/source/libs/harfbuzz/configure23
-rw-r--r--Build/source/libs/harfbuzz/configure.ac8
-rw-r--r--Build/source/libs/harfbuzz/include/Makefile.am3
-rw-r--r--Build/source/libs/harfbuzz/include/Makefile.in2
-rw-r--r--Build/source/m4/kpse-harfbuzz-flags.m43
-rwxr-xr-xBuild/source/texk/configure9
-rwxr-xr-xBuild/source/utils/configure9
14 files changed, 13 insertions, 99 deletions
diff --git a/Build/source/configure b/Build/source/configure
index 90aa9d8f94a..f678c787d54 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -5501,14 +5501,6 @@ $as_echo "$as_me: Using \`harfbuzz' headers and library from TL tree" >&6;}
fi
fi
if test "x$with_system_harfbuzz" = xyes; then
- if test "x$with_system_freetype2" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`freetype2' headers and library" >&5
-$as_echo "$as_me: -> installed \`freetype2' headers and library" >&6;}
- with_system_freetype2=yes
- ac_configure_args="$ac_configure_args '--with-system-freetype2'"
- elif test "x$with_system_freetype2" != xyes; then
- as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-freetype2'" "$LINENO" 5
- fi
if test "x$with_system_graphite2" = x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`graphite2' headers and library" >&5
$as_echo "$as_me: -> installed \`graphite2' headers and library" >&6;}
@@ -5528,7 +5520,6 @@ $as_echo "$as_me: -> installed \`icu' headers and library" >&6;}
fi
test "x$need_harfbuzz" = xyes && {
- need_freetype2=yes
need_graphite2=yes
need_icu=yes
}
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 6b7dcb7d663..b656fc5d459 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -4739,14 +4739,6 @@ $as_echo "$as_me: Assuming installed \`harfbuzz' headers and library" >&6;}
ac_configure_args="$ac_configure_args '--with-system-harfbuzz=$with_system_harfbuzz'"
fi
if test "x$with_system_harfbuzz" = xyes; then
- if test "x$with_system_freetype2" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`freetype2' headers and library" >&5
-$as_echo "$as_me: -> installed \`freetype2' headers and library" >&6;}
- with_system_freetype2=yes
- ac_configure_args="$ac_configure_args '--with-system-freetype2'"
- elif test "x$with_system_freetype2" != xyes; then
- as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-freetype2'" "$LINENO" 5
- fi
if test "x$with_system_graphite2" = x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`graphite2' headers and library" >&5
$as_echo "$as_me: -> installed \`graphite2' headers and library" >&6;}
@@ -4766,7 +4758,6 @@ $as_echo "$as_me: -> installed \`icu' headers and library" >&6;}
fi
test "x$need_harfbuzz" = xyes && {
- need_freetype2=yes
need_graphite2=yes
need_icu=yes
}
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog
index 9ec350bbb1d..0a9a7e8c1b6 100644
--- a/Build/source/libs/harfbuzz/ChangeLog
+++ b/Build/source/libs/harfbuzz/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-07 Khaled Hosny <khaledhosny@eglug.org>
+
+ * ac/withenable.ac, configure.ac: Drop FreeType2 dependancy.
+ * Makefile.am: Don't build hb-ft.cc, drop FreeType2 dependancy.
+ * include/Makefile.am: Don't install hb-ft.h.
+
2013-01-19 Peter Breitenlohner <peb@mppmu.mpg.de>
Import harfbuzz-0.9.13.
diff --git a/Build/source/libs/harfbuzz/Makefile.am b/Build/source/libs/harfbuzz/Makefile.am
index 462db90af56..734aafc4f8a 100644
--- a/Build/source/libs/harfbuzz/Makefile.am
+++ b/Build/source/libs/harfbuzz/Makefile.am
@@ -112,11 +112,6 @@ AM_CPPFLAGS += $(GRAPHITE2_INCLUDES)
libharfbuzz_dependencies += $(GRAPHITE2_DEPEND)
libharfbuzz_a_SOURCES += @HARFBUZZ_TREE@/src/hb-graphite2.cc
-## FreeType 2 library
-AM_CPPFLAGS += $(FREETYPE2_INCLUDES)
-libharfbuzz_dependencies += $(FREETYPE2_DEPEND)
-libharfbuzz_a_SOURCES += @HARFBUZZ_TREE@/src/hb-ft.cc
-
$(libharfbuzz_a_OBJECTS): config.force
config.force: $(libharfbuzz_dependencies)
@@ -129,8 +124,6 @@ DISTCLEANFILES = config.force
@ICU_RULE@
## Rebuild libgraphite2
@GRAPHITE2_RULE@
-## Rebuild libfreetype
-@FREETYPE2_RULE@
##if build
## check_PROGRAMS =
diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in
index e479216cca8..e8b925c35b7 100644
--- a/Build/source/libs/harfbuzz/Makefile.in
+++ b/Build/source/libs/harfbuzz/Makefile.in
@@ -122,8 +122,7 @@ am_libharfbuzz_a_OBJECTS = @HARFBUZZ_TREE@/src/hb-blob.$(OBJEXT) \
@HARFBUZZ_TREE@/src/hb-ot-shape-normalize.$(OBJEXT) \
@HARFBUZZ_TREE@/src/hb-ot-shape-fallback.$(OBJEXT) \
@HARFBUZZ_TREE@/src/hb-icu.$(OBJEXT) \
- @HARFBUZZ_TREE@/src/hb-graphite2.$(OBJEXT) \
- @HARFBUZZ_TREE@/src/hb-ft.$(OBJEXT)
+ @HARFBUZZ_TREE@/src/hb-graphite2.$(OBJEXT)
libharfbuzz_a_OBJECTS = $(am_libharfbuzz_a_OBJECTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -416,9 +415,8 @@ HARFBUZZ_SRC = $(HARFBUZZ_TREE)/src
SUBDIRS = . include
noinst_LIBRARIES = libharfbuzz.a
AM_CPPFLAGS = -DHB_NO_MT -I$(top_srcdir)/$(HARFBUZZ_SRC) \
- $(ICU_INCLUDES) $(GRAPHITE2_INCLUDES) $(FREETYPE2_INCLUDES)
-libharfbuzz_dependencies = $(ICU_DEPEND) $(GRAPHITE2_DEPEND) \
- $(FREETYPE2_DEPEND)
+ $(ICU_INCLUDES) $(GRAPHITE2_INCLUDES)
+libharfbuzz_dependencies = $(ICU_DEPEND) $(GRAPHITE2_DEPEND)
libharfbuzz_a_SOURCES = @HARFBUZZ_TREE@/src/hb-atomic-private.hh \
@HARFBUZZ_TREE@/src/hb-blob.cc \
@HARFBUZZ_TREE@/src/hb-buffer-private.hh \
@@ -482,8 +480,7 @@ libharfbuzz_a_SOURCES = @HARFBUZZ_TREE@/src/hb-atomic-private.hh \
@HARFBUZZ_TREE@/src/hb-ot-shape-fallback.cc \
@HARFBUZZ_TREE@/src/hb-ot-shape-private.hh \
@HARFBUZZ_TREE@/src/hb-icu.cc \
- @HARFBUZZ_TREE@/src/hb-graphite2.cc \
- @HARFBUZZ_TREE@/src/hb-ft.cc
+ @HARFBUZZ_TREE@/src/hb-graphite2.cc
DISTCLEANFILES = config.force
LDADD = libharfbuzz.a
all: config.h
@@ -632,9 +629,6 @@ clean-noinstLIBRARIES:
@HARFBUZZ_TREE@/src/hb-graphite2.$(OBJEXT): \
@HARFBUZZ_TREE@/src/$(am__dirstamp) \
@HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@HARFBUZZ_TREE@/src/hb-ft.$(OBJEXT): \
- @HARFBUZZ_TREE@/src/$(am__dirstamp) \
- @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp)
libharfbuzz.a: $(libharfbuzz_a_OBJECTS) $(libharfbuzz_a_DEPENDENCIES) $(EXTRA_libharfbuzz_a_DEPENDENCIES)
$(AM_V_at)-rm -f libharfbuzz.a
$(AM_V_AR)$(libharfbuzz_a_AR) libharfbuzz.a $(libharfbuzz_a_OBJECTS) $(libharfbuzz_a_LIBADD)
@@ -652,7 +646,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-common.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-fallback-shape.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-font.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ft.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-graphite2.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-icu.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@HARFBUZZ_TREE@/src/$(DEPDIR)/hb-ot-layout.Po@am__quote@
@@ -1150,7 +1143,6 @@ config.force: $(libharfbuzz_dependencies)
@ICU_RULE@
@GRAPHITE2_RULE@
-@FREETYPE2_RULE@
# 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.
diff --git a/Build/source/libs/harfbuzz/ac/withenable.ac b/Build/source/libs/harfbuzz/ac/withenable.ac
index a1947932332..bf93d3c177b 100644
--- a/Build/source/libs/harfbuzz/ac/withenable.ac
+++ b/Build/source/libs/harfbuzz/ac/withenable.ac
@@ -4,4 +4,4 @@ dnl Copyright (C) 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 harfbuzz
-KPSE_WITH_LIB([harfbuzz], [freetype2 graphite2 icu])
+KPSE_WITH_LIB([harfbuzz], [graphite2 icu])
diff --git a/Build/source/libs/harfbuzz/config.h.in b/Build/source/libs/harfbuzz/config.h.in
index d9f72ec0737..fe707d97c31 100644
--- a/Build/source/libs/harfbuzz/config.h.in
+++ b/Build/source/libs/harfbuzz/config.h.in
@@ -15,12 +15,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Use FreeType 2 library */
-#undef HAVE_FREETYPE
-
-/* Define to 1 if you have the `FT_Face_GetCharVariantIndex' function. */
-#undef HAVE_FT_FACE_GETCHARVARIANTINDEX
-
/* Define to 1 if you have the `getpagesize' function. */
#undef HAVE_GETPAGESIZE
diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure
index 55ba0fa7a4b..450c3bfbe33 100755
--- a/Build/source/libs/harfbuzz/configure
+++ b/Build/source/libs/harfbuzz/configure
@@ -18227,23 +18227,6 @@ fi
if test "x$enable_build" != xno || test -f config.force; then
-kpse_save_CPPFLAGS=$CPPFLAGS
-kpse_save_LIBS=$LIBS
-
-eval CPPFLAGS=\"$FREETYPE2_INCLUDES \$CPPFLAGS\"
-eval LIBS=\"$FREETYPE2_LIBS \$LIBS\"
-
-ac_fn_c_check_func "$LINENO" "FT_Face_GetCharVariantIndex" "ac_cv_func_FT_Face_GetCharVariantIndex"
-if test "x$ac_cv_func_FT_Face_GetCharVariantIndex" = xyes; then :
-
-else
- as_fn_error $? "FT_Face_GetCharVariantIndex() not found" "$LINENO" 5
-fi
-
-CPPFLAGS=$kpse_save_CPPFLAGS
-LIBS=$kpse_save_LIBS
-
-
echo timestamp >config.force
fi
@@ -18257,12 +18240,6 @@ $as_echo "#define HAVE_ICU 1" >>confdefs.h
$as_echo "#define HAVE_GRAPHITE2 1" >>confdefs.h
-
-$as_echo "#define HAVE_FREETYPE 1" >>confdefs.h
-
-
-$as_echo "#define HAVE_FT_FACE_GETCHARVARIANTINDEX 1" >>confdefs.h
-
else
$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
diff --git a/Build/source/libs/harfbuzz/configure.ac b/Build/source/libs/harfbuzz/configure.ac
index 2e8be55cd97..3a345c4df50 100644
--- a/Build/source/libs/harfbuzz/configure.ac
+++ b/Build/source/libs/harfbuzz/configure.ac
@@ -28,7 +28,6 @@ AC_PROG_LN_S
LT_INIT
-KPSE_FREETYPE2_FLAGS
KPSE_GRAPHITE2_FLAGS
KPSE_ICU_FLAGS
@@ -42,10 +41,6 @@ AM_CONDITIONAL([build], [test "x$enable_build" != xno])
if test "x$enable_build" != xno || test -f config.force; then
-KPSE_ADD_FLAGS([freetype2])
-AC_CHECK_FUNC([FT_Face_GetCharVariantIndex], , [AC_ERROR([FT_Face_GetCharVariantIndex() not found])])
-KPSE_RESTORE_FLAGS
-
echo timestamp >config.force
fi
@@ -53,9 +48,6 @@ if :; then
AC_DEFINE([HAVE_OT], 1, [Use native OpenType Layout backend])
AC_DEFINE([HAVE_ICU], 1, [Use ICU library])
AC_DEFINE([HAVE_GRAPHITE2], 1, [Use Graphite library])
- AC_DEFINE([HAVE_FREETYPE], 1, [Use FreeType 2 library])
- AC_DEFINE([HAVE_FT_FACE_GETCHARVARIANTINDEX], 1,
- [Define to 1 if you have the `FT_Face_GetCharVariantIndex' function.])
else
dnl add all these to config.h.in but do not define them in config.h
AC_DEFINE([HAVE_PTHREAD], 1, [Use POSIX threads])
diff --git a/Build/source/libs/harfbuzz/include/Makefile.am b/Build/source/libs/harfbuzz/include/Makefile.am
index a3302a23db0..82bf6e1fe8e 100644
--- a/Build/source/libs/harfbuzz/include/Makefile.am
+++ b/Build/source/libs/harfbuzz/include/Makefile.am
@@ -34,8 +34,5 @@ hdr_links += $(HARFBUZZ_SRC)/hb-icu.h
## Graphite library
hdr_links += $(HARFBUZZ_SRC)/hb-graphite2.h
-## FreeType 2 library
-hdr_links += $(HARFBUZZ_SRC)/hb-ft.h
-
include $(top_srcdir)/../am/hdr_links.am
diff --git a/Build/source/libs/harfbuzz/include/Makefile.in b/Build/source/libs/harfbuzz/include/Makefile.in
index e0f29605231..bcbf6169166 100644
--- a/Build/source/libs/harfbuzz/include/Makefile.in
+++ b/Build/source/libs/harfbuzz/include/Makefile.in
@@ -244,7 +244,7 @@ hdr_links = $(HARFBUZZ_SRC)/hb.h $(HARFBUZZ_SRC)/hb-blob.h \
$(HARFBUZZ_SRC)/hb-unicode.h $(HARFBUZZ_BLD)/hb-version.h \
$(HARFBUZZ_SRC)/hb-ot.h $(HARFBUZZ_SRC)/hb-ot-layout.h \
$(HARFBUZZ_SRC)/hb-ot-tag.h $(HARFBUZZ_SRC)/hb-icu.h \
- $(HARFBUZZ_SRC)/hb-graphite2.h $(HARFBUZZ_SRC)/hb-ft.h
+ $(HARFBUZZ_SRC)/hb-graphite2.h
all: all-am
.SUFFIXES:
diff --git a/Build/source/m4/kpse-harfbuzz-flags.m4 b/Build/source/m4/kpse-harfbuzz-flags.m4
index b51690d8ee6..b85a904b92d 100644
--- a/Build/source/m4/kpse-harfbuzz-flags.m4
+++ b/Build/source/m4/kpse-harfbuzz-flags.m4
@@ -12,8 +12,7 @@
# Set the make variables HARFBUZZ_INCLUDES and HARFBUZZ_LIBS to the CPPFLAGS and
# LIBS required for the `-lharfbuzz' library in libs/harfbuzz/ of the TL tree.
AC_DEFUN([KPSE_HARFBUZZ_FLAGS],
-[AC_REQUIRE([KPSE_FREETYPE2_FLAGS])[]dnl
-AC_REQUIRE([KPSE_GRAPHITE2_FLAGS])[]dnl
+[AC_REQUIRE([KPSE_GRAPHITE2_FLAGS])[]dnl
AC_REQUIRE([KPSE_ICU_FLAGS])[]dnl
_KPSE_LIB_FLAGS([harfbuzz], [harfbuzz], [],
[-IBLD/libs/harfbuzz/include], [BLD/libs/harfbuzz/libharfbuzz.a], [],
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index abd06990e0a..5f2792f291c 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -4757,14 +4757,6 @@ $as_echo "$as_me: Assuming installed \`harfbuzz' headers and library" >&6;}
ac_configure_args="$ac_configure_args '--with-system-harfbuzz=$with_system_harfbuzz'"
fi
if test "x$with_system_harfbuzz" = xyes; then
- if test "x$with_system_freetype2" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`freetype2' headers and library" >&5
-$as_echo "$as_me: -> installed \`freetype2' headers and library" >&6;}
- with_system_freetype2=yes
- ac_configure_args="$ac_configure_args '--with-system-freetype2'"
- elif test "x$with_system_freetype2" != xyes; then
- as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-freetype2'" "$LINENO" 5
- fi
if test "x$with_system_graphite2" = x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`graphite2' headers and library" >&5
$as_echo "$as_me: -> installed \`graphite2' headers and library" >&6;}
@@ -4784,7 +4776,6 @@ $as_echo "$as_me: -> installed \`icu' headers and library" >&6;}
fi
test "x$need_harfbuzz" = xyes && {
- need_freetype2=yes
need_graphite2=yes
need_icu=yes
}
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index d7c4de486d7..995e7a90425 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -4735,14 +4735,6 @@ $as_echo "$as_me: Assuming installed \`harfbuzz' headers and library" >&6;}
ac_configure_args="$ac_configure_args '--with-system-harfbuzz=$with_system_harfbuzz'"
fi
if test "x$with_system_harfbuzz" = xyes; then
- if test "x$with_system_freetype2" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`freetype2' headers and library" >&5
-$as_echo "$as_me: -> installed \`freetype2' headers and library" >&6;}
- with_system_freetype2=yes
- ac_configure_args="$ac_configure_args '--with-system-freetype2'"
- elif test "x$with_system_freetype2" != xyes; then
- as_fn_error $? "Sorry, \`--with-system-harfbuzz' requires \`--with-system-freetype2'" "$LINENO" 5
- fi
if test "x$with_system_graphite2" = x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`graphite2' headers and library" >&5
$as_echo "$as_me: -> installed \`graphite2' headers and library" >&6;}
@@ -4762,7 +4754,6 @@ $as_echo "$as_me: -> installed \`icu' headers and library" >&6;}
fi
test "x$need_harfbuzz" = xyes && {
- need_freetype2=yes
need_graphite2=yes
need_icu=yes
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 09:24:05 +0000