From dd5d00201572cc6e957d523dc535ccab95d74dbd Mon Sep 17 00:00:00 2001
From: Sylvain BERTRAND <sylvain.bertrand@gmail.com>
Date: Wed, 26 Oct 2016 10:31:54 +0000
Subject: [PATCH] option for glib code

---
 hb-glib.c |  2 ++
 hb-glib.h |  2 ++
 make      | 21 +++++++++++++++++----
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/hb-glib.c b/hb-glib.c
index 96582d1..1468f24 100644
--- a/hb-glib.c
+++ b/hb-glib.c
@@ -1,3 +1,4 @@
+#ifdef HAVE_GLIB
 /*
 Port from c++ is protected by a GNU Lesser GPLv3
 Copyright © 2013 Sylvain BERTRAND <sylvain.bertrand@gmail.com>
@@ -130,3 +131,4 @@ hb_unicode_funcs_t *hb_glib_get_unicode_funcs(void)
 {
 	return &hb_glib_unicode_funcs;
 }
+#endif
diff --git a/hb-glib.h b/hb-glib.h
index 12c3e3b..a6b6ff8 100644
--- a/hb-glib.h
+++ b/hb-glib.h
@@ -1,3 +1,4 @@
+#ifdef HAVE_GLIB
 /*
  * Copyright © 2009  Red Hat, Inc.
  * Copyright © 2011  Google, Inc.
@@ -53,3 +54,4 @@ hb_glib_blob_create (GBytes *gbytes);
 HB_END_DECLS
 
 #endif /* HB_GLIB_H */
+#endif /* HAVE_GLIB */
diff --git a/make b/make
index 93ec1ea..462c241 100755
--- a/make
+++ b/make
@@ -127,6 +127,7 @@ CMDLINE_SET="
     $PATHS_LIST
     slib_cc
     slib_ccld
+    disable-glib
 "
 
 #path defaults
@@ -140,9 +141,10 @@ pkg_config_sysroot=''
 slib_cc_default='gcc -Wall -Wextra -Wno-missing-field-initializers -c -fpic -O0 -std=c90'
 slib_ccld_default="gcc -shared -Wl,-soname=$slib_soname"
 ln_s_default='ln -sf'
+disable_glib_default=no
 
 set_default $PATHS_LIST
-set_default slib_cc slib_ccld
+set_default slib_cc slib_ccld disable_glib
 
 show_help(){
     cat <<EOF
@@ -157,6 +159,8 @@ Options: [defaults in brackets after descriptions]
 Help options:
   --help                   print this message
 
+Features:
+  --disable-glib           disable glib support [glib support is enabled]
 
 Path options for pkg-config file:
   --prefix=PREFIX          install in PREFIX [$prefix_default]
@@ -178,6 +182,8 @@ for opt do
         ;;
         --help|-h) show_help
         ;;
+        --disable-glib) disable_glib=yes
+        ;;
         *)
             optname="${opt%%=*}"
             optname="${optname#--}"
@@ -198,11 +204,18 @@ if test -n "$pkg_config_sysroot"; then
     export PKG_CONFIG_SYSROOT_DIR=$pkg_config_sysroot
 fi
 
-CPPFLAGS="-I./ -I$src_path -DHAVE_GLIB \
-$(pkg-config --cflags freetype2) \
-$(pkg-config --cflags glib-2.0)
+#-------------------------------------------------------------------------------
+CPPFLAGS="-I./ -I$src_path		\
+$(pkg-config --cflags freetype2)	\
 "
 
+if test x$disable_glib = xno; then
+	CPPFLAGS="$CPPFLAGS -DHAVE_GLIB	\
+	$(pkg-config --cflags glib-2.0)	\
+	"
+fi
+#-------------------------------------------------------------------------------
+
 #generate the version header file
 sed -e "
 s/@HB_VERSION_MAJOR@/$major/
-- 
2.11.4.GIT