[pango/harfbuzz-ng-external] [HB] Remove Indic module

[Behdad Esfahbod <behdad src gnome org>]

commit 656d473b52e3edea621c0681d2ba14363f257e84
Author: Behdad Esfahbod <behdad behdad org>
Date:   Thu Aug 16 20:42:44 2012 -0400

    [HB] Remove Indic module

 configure.in                          |   12 +-
 modules/indic/Makefile.am             |   26 --
 modules/indic/indic-fc.c              |  348 ----------------------
 modules/indic/indic-ot-class-tables.c |  524 ---------------------------------
 modules/indic/indic-ot.c              |  521 --------------------------------
 modules/indic/indic-ot.h              |  238 ---------------
 modules/indic/mprefixups.c            |  116 --------
 modules/indic/mprefixups.h            |   51 ----
 8 files changed, 3 insertions(+), 1833 deletions(-)
---
diff --git a/configure.in b/configure.in
index 38e3774..5aa923b 100644
--- a/configure.in
+++ b/configure.in
@@ -498,9 +498,8 @@ fi
 #
 # Checks for LibThai
 #
-have_libthai=false
 LIBTHAI_REQUIRED_VERSION=0.1.9
-PKG_CHECK_MODULES(LIBTHAI, libthai >= $LIBTHAI_REQUIRED_VERSION, have_libthai=true, AC_MSG_RESULT([no]))
+PKG_CHECK_MODULES(LIBTHAI, libthai >= $LIBTHAI_REQUIRED_VERSION, have_libthai=true, have_libthai=false)
 
 #
 # Checks for GObject Introspection
@@ -513,7 +512,7 @@ GOBJECT_INTROSPECTION_CHECK([0.9.5])
 #
 arabic_modules="arabic-lang"
 basic_modules="basic-fc,basic-win32,basic-x,basic-atsui,basic-coretext"
-indic_modules="indic-fc,indic-lang"
+indic_modules="indic-lang"
 thai_modules=""
 
 if $have_libthai ; then
@@ -575,10 +574,7 @@ AC_SUBST(INCLUDED_LANG_MODULES)
 
 IFS="${IFS= 	}"; pango_save_ifs="$IFS"; IFS=", "
 for module in $included_modules; do
-  case $indic_modules in
-    *$module*)	dir=indic ;;
-    *)		dir=`echo $module | sed "s/-.*//"` ;;
-  esac
+  dir=`echo $module | sed "s/-.*//"`
   included_path="\$(top_builddir)/modules/$dir/libpango-$module.la"
 
   case $module in
@@ -599,7 +595,6 @@ AM_CONDITIONAL(INCLUDE_BASIC_WIN32,	echo $included_modules | egrep '(^|,)basic-w
 AM_CONDITIONAL(INCLUDE_BASIC_X,		echo $included_modules | egrep '(^|,)basic-x($|,)' 	> /dev/null)
 AM_CONDITIONAL(INCLUDE_BASIC_ATSUI,	echo $included_modules | egrep '(^|,)basic-atsui($|,)' 	> /dev/null)
 AM_CONDITIONAL(INCLUDE_BASIC_CORE_TEXT,	echo $included_modules | egrep '(^|,)basic-coretext($|,)'	> /dev/null)
-AM_CONDITIONAL(INCLUDE_INDIC_FC,	echo $included_modules | egrep '(^|,)indic-fc($|,)' 	> /dev/null)
 AM_CONDITIONAL(INCLUDE_INDIC_LANG,	echo $included_modules | egrep '(^|,)indic-lang($|,)'	> /dev/null)
 AM_CONDITIONAL(INCLUDE_THAI_LANG,	echo $included_modules | egrep '(^|,)thai-lang($|,)' 	> /dev/null)
 
@@ -609,7 +604,6 @@ AM_CONDITIONAL(DYNAMIC_BASIC_WIN32,	echo $dynamic_modules | egrep '(^|,)basic-wi
 AM_CONDITIONAL(DYNAMIC_BASIC_X,		echo $dynamic_modules | egrep '(^|,)basic-x($|,)' 	> /dev/null)
 AM_CONDITIONAL(DYNAMIC_BASIC_ATSUI,	echo $dynamic_modules | egrep '(^|,)basic-atsui($|,)' 	> /dev/null)
 AM_CONDITIONAL(DYNAMIC_BASIC_CORE_TEXT,	echo $dynamic_modules | egrep '(^|,)basic-coretext($|,)' 	> /dev/null)
-AM_CONDITIONAL(DYNAMIC_INDIC_FC,	echo $dynamic_modules | egrep '(^|,)indic-fc($|,)' 	> /dev/null)
 AM_CONDITIONAL(DYNAMIC_INDIC_LANG,	echo $dynamic_modules | egrep '(^|,)indic-lang($|,)'	> /dev/null)
 AM_CONDITIONAL(DYNAMIC_THAI_LANG,	echo $dynamic_modules | egrep '(^|,)thai-lang($|,)' 	> /dev/null)
 
diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index eb08cfa..599a2eb 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -1,31 +1,5 @@
 include $(top_srcdir)/modules/Module.mk
 
-if HAVE_FREETYPE
-INCLUDES += $(FREETYPE_CFLAGS)
-if INCLUDE_INDIC_FC
-noinst_LTLIBRARIES += libpango-indic-fc.la
-else
-if DYNAMIC_INDIC_FC
-module_LTLIBRARIES += pango-indic-fc.la
-endif
-endif
-endif
-
-fc_sources =		 	\
-	indic-fc.c		\
-	indic-ot-class-tables.c	\
-	indic-ot.c		\
-	indic-ot.h		\
-	mprefixups.c		\
-	mprefixups.h
-
-pango_indic_fc_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
-pango_indic_fc_la_LIBADD = $(pangoft2libs)
-pango_indic_fc_la_SOURCES = $(fc_sources)
-libpango_indic_fc_la_SOURCES = $(fc_sources)
-libpango_indic_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_indic_fc
-
-
 if INCLUDE_INDIC_LANG
 noinst_LTLIBRARIES += libpango-indic-lang.la
 else