Update Makefile to build without glib

diff --git a/src/Makefile.am b/src/Makefile.am
index 707dd4c..72439e5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,8 +13,6 @@ HBSOURCES =  \
        hb-buffer-private.h \
        hb-font.cc \
        hb-font-private.h \
-       hb-glib.h \
-       hb-glib.c \
        hb-private.h \
        hb-shape.h \
        hb-shape.c \
@@ -32,7 +30,6 @@ HBSOURCES =  \
        hb-ot-layout-private.h \
        hb-object-private.h \
        $(NULL)
-
 HBHEADERS = \
        hb.h \
        hb-blob.h \
@@ -43,6 +40,15 @@ HBHEADERS = \
        hb-ot-layout.h \
        $(NULL)
 
+if HAVE_GLIB
+HBSOURCES += \
+       hb-glib.c \
+       $(NULL)
+HBHEADERS += \
+       hb-glib.h \
+       $(NULL)
+endif
+
 libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS)
 libharfbuzz_la_CPPFLAGS = -DHAVE_GLIB $(GLIB_CFLAGS)
 libharfbuzz_la_LIBADD = $(GLIB_LIBS)

diff --git a/src/hb-glib.c b/src/hb-glib.c
index 9fb3d91..604c7dd 100644 (file)
--- a/src/hb-glib.c
+++ b/src/hb-glib.c
@@ -30,6 +30,8 @@
 
 #include "hb-unicode-private.h"
 
+#include <glib.h>
+
 static hb_codepoint_t hb_glib_get_mirroring (hb_codepoint_t unicode) { g_unichar_get_mirror_char (unicode, &unicode); return unicode; }
 static hb_category_t hb_glib_get_general_category (hb_codepoint_t unicode) { return g_unichar_type (unicode); }
 static hb_script_t hb_glib_get_script (hb_codepoint_t unicode) { return g_unichar_get_script (unicode); }