diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2015-04-04 18:46:20 -0700 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2015-04-04 18:48:43 -0700 |
commit | 137832fa931e875b900dedd1c8909b46d1f7e8ad (patch) | |
tree | a9086e8e1f7707a4cc92369491c28d392f827018 /configure.ac | |
parent | ef69cbb18b00d7e454cf881a8f58bdabad04ecef (diff) | |
download | pango-137832fa931e875b900dedd1c8909b46d1f7e8ad.tar.gz |
[modules] Move language modules in source tree and remove modules/
This should complete the kill-modules effort. What is left is leftover
removal and unbreaking stuff.
Bug 733882 - Kill Pango modules, engines, and config files
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 200 |
1 files changed, 3 insertions, 197 deletions
diff --git a/configure.ac b/configure.ac index 235d0085..117edb4c 100644 --- a/configure.ac +++ b/configure.ac @@ -455,7 +455,9 @@ AC_SUBST(GLIB_MKENUMS) # LIBTHAI_REQUIRED_VERSION=0.1.9 PKG_CHECK_MODULES(LIBTHAI, libthai >= $LIBTHAI_REQUIRED_VERSION, have_libthai=true, have_libthai=false) -AM_CONDITIONAL(HAVE_LIBTHAI, $have_libthai) +if $have_libthai; then + AC_DEFINE(HAVE_LIBTHAI, 1, [Whether libthai is available]) +fi # # Checks for GObject Introspection @@ -463,43 +465,6 @@ AM_CONDITIONAL(HAVE_LIBTHAI, $have_libthai) GOBJECT_INTROSPECTION_CHECK([0.9.5]) -# -# Modules to build -# -arabic_modules="arabic-lang" -indic_modules="indic-lang" -thai_modules="" - -if $have_libthai ; then - thai_modules="thai-lang" -fi - -all_modules="$arabic_modules,$indic_modules,$thai_modules" - -INCLUDED_FC_MODULES= -INCLUDED_WIN32_MODULES= -INCLUDED_CORE_TEXT_MODULES= -INCLUDED_LANG_MODULES= - -AC_SUBST(INCLUDED_FC_MODULES) -AC_SUBST(INCLUDED_WIN32_MODULES) -AC_SUBST(INCLUDED_CORE_TEXT_MODULES) -AC_SUBST(INCLUDED_LANG_MODULES) - -IFS="${IFS= }"; pango_save_ifs="$IFS"; IFS=", " -for module in $all_modules; do - dir=`echo $module | sed "s/-.*//"` - included_path="\$(top_builddir)/modules/$dir/libpango-$module.la" - - case $module in - *-fc) INCLUDED_FC_MODULES="$INCLUDED_FC_MODULES $included_path" ;; - *-win32) INCLUDED_WIN32_MODULES="$INCLUDED_WIN32_MODULES $included_path" ;; - *-coretext) INCLUDED_CORE_TEXT_MODULES="$INCLUDED_CORE_TEXT_MODULES $included_path" ;; - *-lang) INCLUDED_LANG_MODULES="$INCLUDED_LANG_MODULES $included_path" ;; - *) IFS="$pango_save_ifs"; AC_MSG_ERROR([specified module $module not recognized]) ;; - esac -done -IFS="$pango_save_ifs" # # We use flockfile to implement pango_getline() - should be moved to GLib @@ -584,18 +549,6 @@ AC_ARG_ENABLE(installed_tests, AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes) -dnl ******************************************************** -dnl * See whether we need to load our modules as .la files * -dnl ******************************************************** - -use_la_modules=false - -# is there any platform that we have to use .la files? - -if $use_la_modules ; then - AC_DEFINE(USE_LA_MODULES, 1, [Whether to load modules via .la files rather than directly]) -fi - dnl ****************************************************** dnl * See whether to include shared library dependencies * dnl ****************************************************** @@ -644,149 +597,6 @@ AC_SUBST(PKGCONFIG_MATH_LIBS) AC_SUBST(PKGCONFIG_CAIRO_REQUIRES) AM_CONDITIONAL(DISABLE_EXPLICIT_DEPS, test $enable_explicit_deps = no) -AC_CONFIG_COMMANDS([pango/module-defs.h], -[ -cat > pango/module-defs.h <<EOTEXT -/* Autogenerated by configure. Do not edit */ - -#include "modules.h" - -EOTEXT - -IFS="${IFS= }"; pango_save_ifs="$IFS"; IFS="," -for module in $all_modules; do - module_c=`echo $module | sed s/-/_/` - cat >> pango/module-defs.h <<EOTEXT -extern void _pango_${module_c}_script_engine_list (PangoEngineInfo **engines, int *n_engines); -extern void _pango_${module_c}_script_engine_init (GTypeModule *module); -extern void _pango_${module_c}_script_engine_exit (void); -extern PangoEngine *_pango_${module_c}_script_engine_create (const char *id); - -EOTEXT -done - -IFS="$pango_save_ifs" -],[ -all_modules=$all_modules -]) - -AC_CONFIG_COMMANDS([pango/module-defs-fc.c], -[ -### FC modules -cat > pango/module-defs-fc.c <<EOTEXT -/* Autogenerated by configure. Do not edit */ - -#include "module-defs.h" - -PangoIncludedModule _pango_included_fc_modules@<:@@:>@ = { -EOTEXT - -IFS="${IFS= }"; pango_save_ifs="$IFS"; IFS="," -for module in $all_modules; do - if echo $module | egrep -- "-fc($|,)" > /dev/null; then - module_c=`echo $module | sed s/-/_/` - cat >> pango/module-defs-fc.c <<EOTEXT - { _pango_${module_c}_script_engine_list, _pango_${module_c}_script_engine_init, _pango_${module_c}_script_engine_exit, _pango_${module_c}_script_engine_create }, -EOTEXT - fi -done - -IFS="$pango_save_ifs" - -cat >> pango/module-defs-fc.c <<EOTEXT - { NULL, NULL, NULL, NULL }, -}; -EOTEXT -]) - -AC_CONFIG_COMMANDS([pango/module-defs-win32.c], -[ -### Win32 modules -cat > pango/module-defs-win32.c <<EOTEXT -/* Autogenerated by configure. Do not edit */ - -#include "module-defs.h" - -PangoIncludedModule _pango_included_win32_modules@<:@@:>@ = { -EOTEXT - -IFS="${IFS= }"; pango_save_ifs="$IFS"; IFS="," -for module in $all_modules; do - if echo $module | egrep -- "-win32($|,)" > /dev/null; then - module_c=`echo $module | sed s/-/_/` - cat >> pango/module-defs-win32.c <<EOTEXT - { _pango_${module_c}_script_engine_list, _pango_${module_c}_script_engine_init, _pango_${module_c}_script_engine_exit, _pango_${module_c}_script_engine_create }, -EOTEXT - fi -done - -IFS="$pango_save_ifs" - -cat >> pango/module-defs-win32.c <<EOTEXT - { NULL, NULL, NULL, NULL }, -}; -EOTEXT -]) - -AC_CONFIG_COMMANDS([pango/module-defs-coretext.c], -[ -### CoreText modules -cat > pango/module-defs-coretext.c <<EOTEXT -/* Autogenerated by configure. Do not edit */ - -#include "module-defs.h" - -PangoIncludedModule _pango_included_core_text_modules@<:@@:>@ = { -EOTEXT - -IFS="${IFS= }"; pango_save_ifs="$IFS"; IFS="," -for module in $all_modules; do - if echo $module | egrep -- "-coretext($|,)" > /dev/null; then - module_c=`echo $module | sed s/-/_/` - cat >> pango/module-defs-coretext.c <<EOTEXT - { _pango_${module_c}_script_engine_list, _pango_${module_c}_script_engine_init, _pango_${module_c}_script_engine_exit, _pango_${module_c}_script_engine_create }, -EOTEXT - fi -done - -IFS="$pango_save_ifs" - -cat >> pango/module-defs-coretext.c <<EOTEXT - { NULL, NULL, NULL, NULL }, -}; -EOTEXT -]) - -AC_CONFIG_COMMANDS([pango/module-defs-lang.c], -[ -### lang modules -cat > pango/module-defs-lang.c <<EOTEXT -/* Autogenerated by configure. Do not edit */ - -#include "module-defs.h" - -PangoIncludedModule _pango_included_lang_modules@<:@@:>@ = { -EOTEXT - -IFS="${IFS= }"; pango_save_ifs="$IFS"; IFS="," -for module in $all_modules; do - if echo $module | egrep -- "-lang($|,)" > /dev/null; then - module_c=`echo $module | sed s/-/_/` - cat >> pango/module-defs-lang.c <<EOTEXT - { _pango_${module_c}_script_engine_list, _pango_${module_c}_script_engine_init, _pango_${module_c}_script_engine_exit, _pango_${module_c}_script_engine_create }, -EOTEXT - fi -done - -IFS="$pango_save_ifs" - -cat >> pango/module-defs-lang.c <<EOTEXT - { NULL, NULL, NULL, NULL }, -}; -EOTEXT -]) - - AC_HEADER_DIRENT AC_CHECK_HEADERS(unistd.h) @@ -836,10 +646,6 @@ pango/pangowin32.rc pango/pangocairo.rc pango/pangoxft.rc pango-view/Makefile -modules/Makefile -modules/arabic/Makefile -modules/indic/Makefile -modules/thai/Makefile examples/Makefile docs/Makefile docs/version.xml |