Remove HAVE_OT
We never tested compiling without it. Just kill it. We always build
our own shaper.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83ebed7..760883f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,7 +97,6 @@
${PROJECT_BINARY_DIR}/src
)
-add_definitions(-DHAVE_OT)
add_definitions(-DHAVE_FALLBACK)
# We need PYTHON_EXECUTABLE to be set for running the tests...
diff --git a/configure.ac b/configure.ac
index 3aa41ff..1b9ddfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,12 +148,6 @@
dnl ==========================================================================
-have_ot=true
-if $have_ot; then
- AC_DEFINE(HAVE_OT, 1, [Have native OpenType Layout backend])
-fi
-AM_CONDITIONAL(HAVE_OT, $have_ot)
-
have_fallback=true
if $have_fallback; then
AC_DEFINE(HAVE_FALLBACK, 1, [Have simple TrueType Layout backend])
diff --git a/src/Makefile.am b/src/Makefile.am
index 2eca356..c4ae2bc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,11 +29,9 @@
HBSOURCES += $(HB_BASE_RAGEL_GENERATED_sources)
HBHEADERS = $(HB_BASE_headers)
-if HAVE_OT
HBSOURCES += $(HB_OT_sources)
HBSOURCES += $(HB_OT_RAGEL_GENERATED_sources)
HBHEADERS += $(HB_OT_headers)
-endif
if HAVE_FALLBACK
HBSOURCES += $(HB_FALLBACK_sources)
diff --git a/src/hb-shaper-list.hh b/src/hb-shaper-list.hh
index b0835d3..1fdb648 100644
--- a/src/hb-shaper-list.hh
+++ b/src/hb-shaper-list.hh
@@ -39,9 +39,7 @@
HB_SHAPER_IMPLEMENT (coretext_aat)
#endif
-#ifdef HAVE_OT
HB_SHAPER_IMPLEMENT (ot) /* <--- This is our main OpenType shaper. */
-#endif
#ifdef HAVE_UNISCRIBE
HB_SHAPER_IMPLEMENT (uniscribe)
diff --git a/src/hb.hh b/src/hb.hh
index 1522852..f37be7a 100644
--- a/src/hb.hh
+++ b/src/hb.hh
@@ -45,10 +45,8 @@
#include "hb.h"
#define HB_H_IN
-#ifdef HAVE_OT
#include "hb-ot.h"
#define HB_OT_H_IN
-#endif
#include <math.h>
#include <stdlib.h>
diff --git a/test/api/Makefile.am b/test/api/Makefile.am
index 02e8780..3ff7f5a 100644
--- a/test/api/Makefile.am
+++ b/test/api/Makefile.am
@@ -69,13 +69,12 @@
endif
-if HAVE_OT
-
TEST_PROGS += \
test-ot-color \
test-ot-tag \
$(NULL)
+
if HAVE_PTHREAD
if HAVE_FREETYPE
TEST_PROGS += test-multithread
@@ -95,7 +94,6 @@
test_ot_math_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
endif # HAVE_FREETYPE
-endif # HAVE_OT
# Tests for header compilation
TEST_PROGS += \
diff --git a/test/api/test-c.c b/test/api/test-c.c
index 78d6e97..061f35c 100644
--- a/test/api/test-c.c
+++ b/test/api/test-c.c
@@ -32,6 +32,7 @@
#endif
#include <hb.h>
+#include <hb-ot.h>
#ifdef HAVE_GLIB
#include <hb-glib.h>
@@ -45,10 +46,6 @@
#include <hb-ft.h>
#endif
-#ifdef HAVE_OT
-#include <hb-ot.h>
-#endif
-
#ifdef HAVE_UNISCRIBE
#include <hb-uniscribe.h>
#endif
diff --git a/util/Makefile.am b/util/Makefile.am
index b8bf884..85f9eda 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -52,14 +52,11 @@
$(top_builddir)/src/libharfbuzz-subset.la
bin_PROGRAMS += hb-subset
-if HAVE_OT
hb_ot_shape_closure_SOURCES = $(HB_OT_SHAPE_CLOSURE_sources)
bin_PROGRAMS += hb-ot-shape-closure
-endif # HAVE_OT
endif # HAVE_GLIB
-#if HAVE_OT
#if HAVE_FONTCONFIG
#hb_fc_list_SOURCES = \
# hb-fc.cc \
@@ -72,6 +69,5 @@
# $(NULL)
#bin_PROGRAMS += hb-fc-list
#endif # HAVE_FONTCONFIG
-#endif # HAVE_OT
-include $(top_srcdir)/git.mk
diff --git a/util/options.cc b/util/options.cc
index 090a9c2..26b0bd0 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -29,9 +29,7 @@
#ifdef HAVE_FREETYPE
#include <hb-ft.h>
#endif
-#ifdef HAVE_OT
#include <hb-ot.h>
-#endif
static struct supported_font_funcs_t {
char name[4];
@@ -41,9 +39,7 @@
#ifdef HAVE_FREETYPE
{"ft", hb_ft_font_set_funcs},
#endif
-#ifdef HAVE_OT
{"ot", hb_ot_font_set_funcs},
-#endif
};
diff --git a/util/options.hh b/util/options.hh
index 5088ada..3749b99 100644
--- a/util/options.hh
+++ b/util/options.hh
@@ -46,9 +46,7 @@
#endif
#include <hb.h>
-#ifdef HAVE_OT
#include <hb-ot.h>
-#endif
#include <glib.h>
#include <glib/gprintf.h>
