diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 38e3774c..5aa923b1 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) |