[modules] Don't build any dynamic modules

8 files changed, 18 insertions, 145 deletions

diff --git a/configure.ac b/configure.ac
index 78a370bf..16b8db6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -488,43 +488,6 @@ fi
 
 all_modules="$arabic_modules,$basic_modules,$indic_modules,$thai_modules"
 
-#
-# Allow building some or all modules included
-#
-AC_MSG_CHECKING(modules to link statically)
-
-AC_ARG_WITH(included_modules,
-   AC_HELP_STRING([--with-included-modules=no/yes/MODULE1 MODULE2 ...],
-                  [build the given modules included @<:@default=yes@:>@]))
-
-included_modules=""
-case x$with_included_modules in
-	xyes|x)	included_modules=$all_modules ;;
-	xno)	included_modules="" ;;
-	*)	included_modules=$with_included_modules ;;
-esac
-AC_MSG_RESULT($included_modules)
-AM_CONDITIONAL(HAVE_INCLUDED_MODULES, test "x$included_modules" != x)
-
-#
-# Allow building only some or none of modules dynamic
-#
-AC_MSG_CHECKING(dynamic modules to build)
-
-AC_ARG_WITH(dynamic_modules,
-   AC_HELP_STRING([--with-dynamic-modules=no/yes/MODULE1 MODULE2 ...],
-                  [build the given dynamic modules @<:@default=no@:>@]))
-
-dynamic_modules=""
-case x$with_dynamic_modules in
-	xyes)	dynamic_modules=$all_modules ;;
-	xno|x)	dynamic_modules="" ;;
-	*)	dynamic_modules=$with_dynamic_modules ;;
-esac
-AC_MSG_RESULT([$dynamic_modules (those built into Pango will be excluded)])
-AM_CONDITIONAL(HAVE_DYNAMIC_MODULES, test "x$dynamic_modules" != x)
-
-
 INCLUDED_FC_MODULES=
 INCLUDED_WIN32_MODULES=
 INCLUDED_CORE_TEXT_MODULES=
@@ -536,7 +499,7 @@ AC_SUBST(INCLUDED_CORE_TEXT_MODULES)
 AC_SUBST(INCLUDED_LANG_MODULES)
 
 IFS="${IFS= 	}"; pango_save_ifs="$IFS"; IFS=", "
-for module in $included_modules; do
+for module in $all_modules; do
   dir=`echo $module | sed "s/-.*//"`
   included_path="\$(top_builddir)/modules/$dir/libpango-$module.la"
 
@@ -550,19 +513,12 @@ for module in $included_modules; do
 done
 IFS="$pango_save_ifs"
 
-AM_CONDITIONAL(INCLUDE_ARABIC_LANG,	echo $included_modules | egrep '(^|,)arabic-lang($|,)' 	> /dev/null)
-AM_CONDITIONAL(INCLUDE_BASIC_FC,	echo $included_modules | egrep '(^|,)basic-fc($|,)' 	> /dev/null)
-AM_CONDITIONAL(INCLUDE_BASIC_WIN32,	echo $included_modules | egrep '(^|,)basic-win32($|,)' 	> /dev/null)
-AM_CONDITIONAL(INCLUDE_BASIC_CORE_TEXT,	echo $included_modules | egrep '(^|,)basic-coretext($|,)'	> /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)
-
-AM_CONDITIONAL(DYNAMIC_ARABIC_LANG,	echo $dynamic_modules | egrep '(^|,)arabic-lang($|,)' 	> /dev/null)
-AM_CONDITIONAL(DYNAMIC_BASIC_FC,	echo $dynamic_modules | egrep '(^|,)basic-fc($|,)' 	> /dev/null)
-AM_CONDITIONAL(DYNAMIC_BASIC_WIN32,	echo $dynamic_modules | egrep '(^|,)basic-win32($|,)' 	> /dev/null)
-AM_CONDITIONAL(DYNAMIC_BASIC_CORE_TEXT,	echo $dynamic_modules | egrep '(^|,)basic-coretext($|,)' 	> /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)
+AM_CONDITIONAL(INCLUDE_ARABIC_LANG,	echo $all_modules | egrep '(^|,)arabic-lang($|,)' 	> /dev/null)
+AM_CONDITIONAL(INCLUDE_BASIC_FC,	echo $all_modules | egrep '(^|,)basic-fc($|,)' 	> /dev/null)
+AM_CONDITIONAL(INCLUDE_BASIC_WIN32,	echo $all_modules | egrep '(^|,)basic-win32($|,)' 	> /dev/null)
+AM_CONDITIONAL(INCLUDE_BASIC_CORE_TEXT,	echo $all_modules | egrep '(^|,)basic-coretext($|,)'	> /dev/null)
+AM_CONDITIONAL(INCLUDE_INDIC_LANG,	echo $all_modules | egrep '(^|,)indic-lang($|,)'	> /dev/null)
+AM_CONDITIONAL(INCLUDE_THAI_LANG,	echo $all_modules | egrep '(^|,)thai-lang($|,)' 	> /dev/null)
 
 #
 # We use flockfile to implement pango_getline() - should be moved to GLib
@@ -631,19 +587,15 @@ dnl ********************************************************
 # that something like pango-basic-fc.la is a valid libtool archive
 #
 LIBRARY_LIBTOOL_OPTIONS="-version-info $VERSION_INFO"
-MODULE_LIBTOOL_OPTIONS="-export-dynamic -avoid-version"
 if test "$pango_platform_win32" = yes; then
     # We currently use .def files on Windows
     LIBRARY_LIBTOOL_OPTIONS="$LIBRARY_LIBTOOL_OPTIONS -no-undefined"
-    MODULE_LIBTOOL_OPTIONS="$MODULE_LIBTOOL_OPTIONS -no-undefined"
 else
     # libtool option to control which symbols are exported
     # right now, symbols starting with '_' are not exported
     LIBRARY_LIBTOOL_OPTIONS="$LIBRARY_LIBTOOL_OPTIONS "'-export-symbols-regex "^pango_.*"'
-    MODULE_LIBTOOL_OPTIONS="$MODULE_LIBTOOL_OPTIONS "'-export-symbols-regex "^script_engine_.*"'
 fi
 AC_SUBST(LIBRARY_LIBTOOL_OPTIONS)
-AC_SUBST(MODULE_LIBTOOL_OPTIONS)
 
 dnl
 dnl Check for -Bsymbolic-functions linker flag used to avoid
@@ -747,7 +699,7 @@ cat > pango/module-defs.h <<EOTEXT
 EOTEXT
 
 IFS="${IFS= 	}"; pango_save_ifs="$IFS"; IFS=","
-for module in $included_modules; do
+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);
@@ -760,7 +712,7 @@ done
 
 IFS="$pango_save_ifs"
 ],[
-included_modules=$included_modules
+all_modules=$all_modules
 ])
 
 AC_CONFIG_COMMANDS([pango/module-defs-fc.c],
@@ -775,7 +727,7 @@ PangoIncludedModule _pango_included_fc_modules@<:@@:>@ = {
 EOTEXT
 
 IFS="${IFS= 	}"; pango_save_ifs="$IFS"; IFS=","
-for module in $included_modules; do
+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
@@ -804,7 +756,7 @@ PangoIncludedModule _pango_included_win32_modules@<:@@:>@ = {
 EOTEXT
 
 IFS="${IFS= 	}"; pango_save_ifs="$IFS"; IFS=","
-for module in $included_modules; do
+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
@@ -833,7 +785,7 @@ PangoIncludedModule _pango_included_core_text_modules@<:@@:>@ = {
 EOTEXT
 
 IFS="${IFS= 	}"; pango_save_ifs="$IFS"; IFS=","
-for module in $included_modules; do
+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
@@ -862,7 +814,7 @@ PangoIncludedModule _pango_included_lang_modules@<:@@:>@ = {
 EOTEXT
 
 IFS="${IFS= 	}"; pango_save_ifs="$IFS"; IFS=","
-for module in $included_modules; do
+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
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 73b42f4d..5aa4136a 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -61,11 +61,6 @@ included-modules:
 		( cd $$d && $(MAKE) $(AM_MAKEFLAGS) included-modules ) ; \
         done
 
-dynamic-modules:
-	@for d in $(SUBDIRS) ; do \
-		( cd $$d && $(MAKE) $(AM_MAKEFLAGS) dynamic-modules ) ; \
-        done
-
-.PHONY: included-modules dynamic-modules
+.PHONY: included-modules
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/Module.mk b/modules/Module.mk
index aa504700..8c0397c2 100644
--- a/modules/Module.mk
+++ b/modules/Module.mk
@@ -1,21 +1,3 @@
-pangolibs =								\
-	$(GLIB_LIBS)							\
-	$(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la
-pangoxlibs =								\
-	$(pangolibs)							\
-	$(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la		\
-	$(X_LIBS)
-pangoft2libs =								\
-	$(pangolibs)							\
-	$(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la	\
-	$(FREETYPE_LIBS)
-pangowin32libs =							\
-	$(pangolibs)							\
-	$(top_builddir)/pango/libpangowin32-$(PANGO_API_VERSION).la
-pangoatsuilibs =							\
-	$(pangolibs)							\
-	$(top_builddir)/pango/libpangocairo-$(PANGO_API_VERSION).la
-
 INCLUDES = 				\
 	-DG_LOG_DOMAIN=\"Pango\"	\
 	-DPANGO_ENABLE_ENGINE		\
@@ -24,12 +6,9 @@ INCLUDES = 				\
 	-I$(top_srcdir)/pango		\
 	$(GLIB_CFLAGS)
 
-moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
-module_LTLIBRARIES =
 noinst_LTLIBRARIES =
 
 
 included-modules: $(noinst_LTLIBRARIES)
-dynamic-modules: $(module_LTLIBRARIES)
 
-.PHONY: included-modules dynamic-modules
+.PHONY: included-modules
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index 2a20532b..b43bb367 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -3,19 +3,9 @@ include $(top_srcdir)/modules/Module.mk
 
 if INCLUDE_ARABIC_LANG
 noinst_LTLIBRARIES += libpango-arabic-lang.la
-else
-if DYNAMIC_ARABIC_LANG
-module_LTLIBRARIES += pango-arabic-lang.la
 endif
-endif
-
-lang_sources = \
-	arabic-lang.c
 
-pango_arabic_lang_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
-pango_arabic_lang_la_LIBADD = $(pangolibs)
-pango_arabic_lang_la_SOURCES = $(lang_sources)
-libpango_arabic_lang_la_SOURCES = $(lang_sources)
+libpango_arabic_lang_la_SOURCES = arabic-lang.c
 libpango_arabic_lang_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_arabic_lang
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index 9726870b..b66ae771 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -4,16 +4,9 @@ if HAVE_FREETYPE
 INCLUDES += $(FREETYPE_CFLAGS) $(HARFBUZZ_CFLAGS)
 if INCLUDE_BASIC_FC
 noinst_LTLIBRARIES += libpango-basic-fc.la
-else
-if DYNAMIC_BASIC_FC
-module_LTLIBRARIES += pango-basic-fc.la
-endif
 endif
 endif
 
-pango_basic_fc_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
-pango_basic_fc_la_LIBADD = $(pangoft2libs) $(HARFBUZZ_LIBS)
-pango_basic_fc_la_SOURCES = basic-fc.c
 libpango_basic_fc_la_SOURCES = basic-fc.c
 libpango_basic_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_fc
 
@@ -21,17 +14,10 @@ libpango_basic_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_fc
 if HAVE_WIN32
 if INCLUDE_BASIC_WIN32
 noinst_LTLIBRARIES += libpango-basic-win32.la
-else
-if DYNAMIC_BASIC_WIN32
-module_LTLIBRARIES += pango-basic-win32.la
-endif
 endif
 endif
 
-pango_basic_win32_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
-pango_basic_win32_la_LIBADD = $(pangowin32libs) -lgdi32 -lusp10
 libpango_basic_win32_la_LIBADD = -lgdi32 -lusp10
-pango_basic_win32_la_SOURCES = basic-win32.c
 libpango_basic_win32_la_SOURCES = basic-win32.c
 libpango_basic_win32_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_win32
 
@@ -39,16 +25,9 @@ if HAVE_CORE_TEXT
 INCLUDES += $(CAIRO_CFLAGS)
 if INCLUDE_BASIC_CORE_TEXT
 noinst_LTLIBRARIES += libpango-basic-coretext.la
-else
-if DYNAMIC_BASIC_CORE_TEXT
-module_LTLIBRARIES += pango-basic-coretext.la
-endif
 endif
 endif
 
-pango_basic_coretext_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS) -framework Carbon
-pango_basic_coretext_la_LIBADD = $(pangocoretextlibs)
-pango_basic_coretext_la_SOURCES = basic-coretext.c
 libpango_basic_coretext_la_SOURCES = basic-coretext.c
 libpango_basic_coretext_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_coretext
 
diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index 599a2eb5..f6f40484 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -2,19 +2,9 @@ include $(top_srcdir)/modules/Module.mk
 
 if INCLUDE_INDIC_LANG
 noinst_LTLIBRARIES += libpango-indic-lang.la
-else
-if DYNAMIC_INDIC_LANG
-module_LTLIBRARIES += pango-indic-lang.la
 endif
-endif
-
-lang_sources =		\
-	indic-lang.c
 
-pango_indic_lang_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
-pango_indic_lang_la_LIBADD = $(pangolibs)
-pango_indic_lang_la_SOURCES = $(lang_sources)
-libpango_indic_lang_la_SOURCES = $(lang_sources)
+libpango_indic_lang_la_SOURCES = indic-lang.c
 libpango_indic_lang_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_indic_lang
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am
index ba9fa842..79ba7213 100644
--- a/modules/thai/Makefile.am
+++ b/modules/thai/Makefile.am
@@ -2,19 +2,9 @@ include $(top_srcdir)/modules/Module.mk
 
 if INCLUDE_THAI_LANG
 noinst_LTLIBRARIES += libpango-thai-lang.la
-else
-if DYNAMIC_THAI_LANG
-module_LTLIBRARIES += pango-thai-lang.la
 endif
-endif
-
-lang_sources = \
-	thai-lang.c
 
-pango_thai_lang_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
-pango_thai_lang_la_LIBADD = $(pangolibs) $(LIBTHAI_LIBS)
-pango_thai_lang_la_SOURCES = $(lang_sources)
-libpango_thai_lang_la_SOURCES = $(lang_sources)
+libpango_thai_lang_la_SOURCES = thai-lang.c
 libpango_thai_lang_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_thai_lang $(LIBTHAI_CFLAGS)
 libpango_thai_lang_la_LIBADD = $(LIBTHAI_LIBS)
 
diff --git a/pango/Makefile.am b/pango/Makefile.am
index da086ed9..378500ff 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -470,7 +470,6 @@ EXTRA_DIST =					\
 	check.defs
 
 
-if HAVE_INCLUDED_MODULES
 included-modules:
 	$(AM_V_GEN) cd $(top_builddir)/modules && $(MAKE) $(AM_MAKEFLAGS) included-modules
 
@@ -478,7 +477,6 @@ $(INCLUDED_LANG_MODULES) $(INCLUDED_FC_MODULES) $(INCLUDED_WIN32_MODULES) $(INCL
 	$(AM_V_GEN) true
 
 .PHONY: included-modules
-endif
 
 MODULE_DEF_FILES = \
 	module-defs.h \