From 21e3135bf7cd6038894c31a42d217504aab9a192 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 6 Mar 2002 17:05:17 +0000 Subject: Fix problem where == was used instead if =. (#73694, Martin Gansser) Wed Mar 6 11:43:46 2002 Owen Taylor * configure.in: Fix problem where == was used instead if =. (#73694, Martin Gansser) * modules/Makefile.am (install-data-local): Simplify the rule to create the pango.modules file to avoid problems with differing shared library suffixes. pango-querymodules run without any arguments does the right thing by default. (#73694, Martin Gansser) * configure.in: Add a PANGO_MODULE_VERSION variable defining the subdir in which modules are installed. * pango/querymodules.c pango/modules.c modules/*/*.am: Install modules in lib/pango/MODULE_VERSION/modules * pango.pc.in (pango_module_version): Export pango_module_version variable so that 3rd parties can determine where to install libraries. --- ChangeLog | 23 ++++++++++++++++++++++- ChangeLog.pre-1-0 | 23 ++++++++++++++++++++++- ChangeLog.pre-1-10 | 23 ++++++++++++++++++++++- ChangeLog.pre-1-2 | 23 ++++++++++++++++++++++- ChangeLog.pre-1-4 | 23 ++++++++++++++++++++++- ChangeLog.pre-1-6 | 23 ++++++++++++++++++++++- ChangeLog.pre-1-8 | 23 ++++++++++++++++++++++- configure.in | 9 ++++++++- modules/Makefile.am | 18 +++--------------- modules/arabic/Makefile.am | 2 +- modules/basic/Makefile.am | 2 +- modules/hangul/Makefile.am | 2 +- modules/hebrew/Makefile.am | 2 +- modules/indic/Makefile.am | 2 +- modules/tamil/Makefile.am | 2 +- modules/thai/Makefile.am | 2 +- pango.pc.in | 2 ++ pango/Makefile.am | 17 +++++++++-------- pango/modules.c | 8 ++++---- pango/querymodules.c | 1 + 20 files changed, 188 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index e638f2b7..4dfcacd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,25 @@ -Tue Mar 5 21:39:37 2002 Owen Taylor +Wed Mar 6 11:43:46 2002 Owen Taylor + + * configure.in: Fix problem where == was used instead if =. + (#73694, Martin Gansser) + + * modules/Makefile.am (install-data-local): Simplify + the rule to create the pango.modules file to avoid + problems with differing shared library suffixes. + pango-querymodules run without any arguments does the + right thing by default. (#73694, Martin Gansser) + + * configure.in: Add a PANGO_MODULE_VERSION variable + defining the subdir in which modules are installed. + + * pango/querymodules.c pango/modules.c modules/*/*.am: + Install modules in lib/pango/MODULE_VERSION/modules + + * pango.pc.in (pango_module_version): Export pango_module_version + variable so that 3rd parties can determine where to install + libraries. + +Wed Mar 6 11:40:45 2002 Owen Taylor * Pango 1.0.0 rc1. diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index e638f2b7..4dfcacd8 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,4 +1,25 @@ -Tue Mar 5 21:39:37 2002 Owen Taylor +Wed Mar 6 11:43:46 2002 Owen Taylor + + * configure.in: Fix problem where == was used instead if =. + (#73694, Martin Gansser) + + * modules/Makefile.am (install-data-local): Simplify + the rule to create the pango.modules file to avoid + problems with differing shared library suffixes. + pango-querymodules run without any arguments does the + right thing by default. (#73694, Martin Gansser) + + * configure.in: Add a PANGO_MODULE_VERSION variable + defining the subdir in which modules are installed. + + * pango/querymodules.c pango/modules.c modules/*/*.am: + Install modules in lib/pango/MODULE_VERSION/modules + + * pango.pc.in (pango_module_version): Export pango_module_version + variable so that 3rd parties can determine where to install + libraries. + +Wed Mar 6 11:40:45 2002 Owen Taylor * Pango 1.0.0 rc1. diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index e638f2b7..4dfcacd8 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,4 +1,25 @@ -Tue Mar 5 21:39:37 2002 Owen Taylor +Wed Mar 6 11:43:46 2002 Owen Taylor + + * configure.in: Fix problem where == was used instead if =. + (#73694, Martin Gansser) + + * modules/Makefile.am (install-data-local): Simplify + the rule to create the pango.modules file to avoid + problems with differing shared library suffixes. + pango-querymodules run without any arguments does the + right thing by default. (#73694, Martin Gansser) + + * configure.in: Add a PANGO_MODULE_VERSION variable + defining the subdir in which modules are installed. + + * pango/querymodules.c pango/modules.c modules/*/*.am: + Install modules in lib/pango/MODULE_VERSION/modules + + * pango.pc.in (pango_module_version): Export pango_module_version + variable so that 3rd parties can determine where to install + libraries. + +Wed Mar 6 11:40:45 2002 Owen Taylor * Pango 1.0.0 rc1. diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index e638f2b7..4dfcacd8 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,4 +1,25 @@ -Tue Mar 5 21:39:37 2002 Owen Taylor +Wed Mar 6 11:43:46 2002 Owen Taylor + + * configure.in: Fix problem where == was used instead if =. + (#73694, Martin Gansser) + + * modules/Makefile.am (install-data-local): Simplify + the rule to create the pango.modules file to avoid + problems with differing shared library suffixes. + pango-querymodules run without any arguments does the + right thing by default. (#73694, Martin Gansser) + + * configure.in: Add a PANGO_MODULE_VERSION variable + defining the subdir in which modules are installed. + + * pango/querymodules.c pango/modules.c modules/*/*.am: + Install modules in lib/pango/MODULE_VERSION/modules + + * pango.pc.in (pango_module_version): Export pango_module_version + variable so that 3rd parties can determine where to install + libraries. + +Wed Mar 6 11:40:45 2002 Owen Taylor * Pango 1.0.0 rc1. diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index e638f2b7..4dfcacd8 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,4 +1,25 @@ -Tue Mar 5 21:39:37 2002 Owen Taylor +Wed Mar 6 11:43:46 2002 Owen Taylor + + * configure.in: Fix problem where == was used instead if =. + (#73694, Martin Gansser) + + * modules/Makefile.am (install-data-local): Simplify + the rule to create the pango.modules file to avoid + problems with differing shared library suffixes. + pango-querymodules run without any arguments does the + right thing by default. (#73694, Martin Gansser) + + * configure.in: Add a PANGO_MODULE_VERSION variable + defining the subdir in which modules are installed. + + * pango/querymodules.c pango/modules.c modules/*/*.am: + Install modules in lib/pango/MODULE_VERSION/modules + + * pango.pc.in (pango_module_version): Export pango_module_version + variable so that 3rd parties can determine where to install + libraries. + +Wed Mar 6 11:40:45 2002 Owen Taylor * Pango 1.0.0 rc1. diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index e638f2b7..4dfcacd8 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,4 +1,25 @@ -Tue Mar 5 21:39:37 2002 Owen Taylor +Wed Mar 6 11:43:46 2002 Owen Taylor + + * configure.in: Fix problem where == was used instead if =. + (#73694, Martin Gansser) + + * modules/Makefile.am (install-data-local): Simplify + the rule to create the pango.modules file to avoid + problems with differing shared library suffixes. + pango-querymodules run without any arguments does the + right thing by default. (#73694, Martin Gansser) + + * configure.in: Add a PANGO_MODULE_VERSION variable + defining the subdir in which modules are installed. + + * pango/querymodules.c pango/modules.c modules/*/*.am: + Install modules in lib/pango/MODULE_VERSION/modules + + * pango.pc.in (pango_module_version): Export pango_module_version + variable so that 3rd parties can determine where to install + libraries. + +Wed Mar 6 11:40:45 2002 Owen Taylor * Pango 1.0.0 rc1. diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index e638f2b7..4dfcacd8 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,4 +1,25 @@ -Tue Mar 5 21:39:37 2002 Owen Taylor +Wed Mar 6 11:43:46 2002 Owen Taylor + + * configure.in: Fix problem where == was used instead if =. + (#73694, Martin Gansser) + + * modules/Makefile.am (install-data-local): Simplify + the rule to create the pango.modules file to avoid + problems with differing shared library suffixes. + pango-querymodules run without any arguments does the + right thing by default. (#73694, Martin Gansser) + + * configure.in: Add a PANGO_MODULE_VERSION variable + defining the subdir in which modules are installed. + + * pango/querymodules.c pango/modules.c modules/*/*.am: + Install modules in lib/pango/MODULE_VERSION/modules + + * pango.pc.in (pango_module_version): Export pango_module_version + variable so that 3rd parties can determine where to install + libraries. + +Wed Mar 6 11:40:45 2002 Owen Taylor * Pango 1.0.0 rc1. diff --git a/configure.in b/configure.in index 35a83396..affa05a9 100644 --- a/configure.in +++ b/configure.in @@ -31,6 +31,12 @@ dnl PANGO_MICRO_VERSION for a stable release # PANGO_BINARY_AGE=0 PANGO_BINARY_AGE=$PANGO_MICRO_VERSION +dnl This is the last version with which we have compatibility with +dnl with the modules for; it isn't the same as +dnl PANGO_API_VERSION.'PANGO_MICRO_VERSION - PANGO_BINARY_AGE' since we have +dnl engine only API +PANGO_MODULE_VERSION=1.0.0 + AC_SUBST(PANGO_MAJOR_VERSION) AC_SUBST(PANGO_MINOR_VERSION) AC_SUBST(PANGO_VERSION) @@ -38,6 +44,7 @@ AC_SUBST(PANGO_API_VERSION) AC_SUBST(PANGO_MICRO_VERSION) AC_SUBST(PANGO_INTERFACE_AGE) AC_SUBST(PANGO_BINARY_AGE) +AC_SUBST(PANGO_MODULE_VERSION) dnl libtool versioning lt_current=`expr $PANGO_MICRO_VERSION - $PANGO_INTERFACE_AGE` @@ -549,7 +556,7 @@ AC_MSG_CHECKING([Whether to write dependencies into .pc files]) case $enable_explicit_deps in auto) deplib_check_method=`(./libtool --config; echo eval echo \\$deplib_check_method) | sh` - if test "X$deplib_check_method" == Xnone || test "x$enable_static" = xyes ; then + if test "X$deplib_check_method" = Xnone || test "x$enable_static" = xyes ; then enable_explicit_deps=yes else enable_explicit_deps=no diff --git a/modules/Makefile.am b/modules/Makefile.am index 6bd8f4e9..ea29cb97 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -1,11 +1,5 @@ ## Process this file with automake to create Makefile.in. -if PLATFORM_WIN32 -SOSUFFIX=dll -else -SOSUFFIX=so -endif - SUBDIRS = \ arabic \ basic \ @@ -19,15 +13,9 @@ EXTRA_DIST = \ module.def install-data-local: - ($(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango; \ - if ls $(DESTDIR)$(libdir)/pango/modules/*.$(SOSUFFIX) | grep '$(SOSUFFIX)' > /dev/null ; then \ - echo "Wrote $(DESTDIR)$(sysconfdir)/pango/pango.modules."; \ - $(top_builddir)/pango/pango-querymodules $(DESTDIR)$(libdir)/pango/modules/*.$(SOSUFFIX) \ - > $(DESTDIR)$(sysconfdir)/pango/pango.modules; \ - else \ - echo "No dynamic modules were installed; all modules were linked statically."; \ - echo "# This is an empty file, because Pango was installed with no dynamic modules" > $(DESTDIR)$(sysconfdir)/pango/pango.modules; \ - fi) + $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \ + $(top_builddir)/pango/pango-querymodules \ + > $(DESTDIR)$(sysconfdir)/pango/pango.modules included-modules: @for d in $(SUBDIRS) ; do \ diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am index 55f12299..18b99f6c 100644 --- a/modules/arabic/Makefile.am +++ b/modules/arabic/Makefile.am @@ -84,7 +84,7 @@ endif noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) $(FT2_INCLUDED) module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) $(FT2_MODULES) moddefine = $(X_PREFIX) $(XFT_PREFIX) $(FT2_PREFIX) -moduledir = $(libdir)/pango/modules +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS) diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am index 62aefcda..c6ca85de 100644 --- a/modules/basic/Makefile.am +++ b/modules/basic/Makefile.am @@ -83,7 +83,7 @@ endif noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) $(FT2_INCLUDED) $(WIN32_INCLUDED) module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) $(FT2_MODULES) $(WIN32_MODULES) moddefine = $(X_PREFIX) $(XFT_PREFIX) $(FT2_PREFIX) $(WIN32_PREFIX) -moduledir = $(libdir)/pango/modules +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules INCLUDES = \ -DPANGO_ENABLE_ENGINE \ diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am index 6823859a..dd1490a0 100644 --- a/modules/hangul/Makefile.am +++ b/modules/hangul/Makefile.am @@ -12,7 +12,7 @@ if INCLUDE_HANGUL_X noinst_LTLIBRARIES = libpango-hangul-x.la moddefine = -DX_MODULE_PREFIX else -moduledir = $(libdir)/pango/modules +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules module_LTLIBRARIES = pango-hangul-x.la hangul_x_libadd = $(pangoxlibs) endif diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am index e217e349..bf780770 100644 --- a/modules/hebrew/Makefile.am +++ b/modules/hebrew/Makefile.am @@ -68,7 +68,7 @@ endif noinst_LTLIBRARIES = $(X_INCLUDED) $(FT2_INCLUDED) $(XFT_INCLUDED) module_LTLIBRARIES = $(X_MODULES) $(FT2_MODULES) $(XFT_MODULES) moddefine = $(X_PREFIX) $(FT2_PREFIX) $(XFT_PREFIX) -moduledir = $(libdir)/pango/modules +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules INCLUDES = \ -DPANGO_ENABLE_ENGINE \ diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am index 0afe6ba9..3fd999bb 100644 --- a/modules/indic/Makefile.am +++ b/modules/indic/Makefile.am @@ -57,7 +57,7 @@ endif noinst_LTLIBRARIES = $(myanmar_x_noinst) $(gurmukhi_x_noinst) $(bengali_x_noinst) $(devanagari_x_noinst) $(gujarati_x_noinst) -moduledir = $(libdir)/pango/modules +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules module_LTLIBRARIES = $(myanmar_x_inst) $(gurmukhi_x_inst) $(bengali_x_inst) $(devanagari_x_inst) $(gujarati_x_inst) endif diff --git a/modules/tamil/Makefile.am b/modules/tamil/Makefile.am index dc34ae2e..495794d7 100644 --- a/modules/tamil/Makefile.am +++ b/modules/tamil/Makefile.am @@ -50,7 +50,7 @@ endif noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) moddefine = $(X_PREFIX) $(XFT_PREFIX) -moduledir = $(libdir)/pango/modules +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS) diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am index 9ed6457a..261789ce 100644 --- a/modules/thai/Makefile.am +++ b/modules/thai/Makefile.am @@ -12,7 +12,7 @@ if INCLUDE_THAI_X noinst_LTLIBRARIES = libpango-thai-x.la moddefine = -DX_MODULE_PREFIX else -moduledir = $(libdir)/pango/modules +moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules module_LTLIBRARIES = pango-thai-x.la thai_x_libadd=$(pangoxlibs) endif diff --git a/pango.pc.in b/pango.pc.in index 00b14a11..5efe68a7 100644 --- a/pango.pc.in +++ b/pango.pc.in @@ -3,6 +3,8 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +pango_module_version=@PANGO_MODULE_VERSION@ + Name: Pango Description: Internationalized text handling Version: @VERSION@ diff --git a/pango/Makefile.am b/pango/Makefile.am index 276a407a..11e82be6 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -20,14 +20,15 @@ SUBDIRS = $(OPENTYPE_SUBDIR) $(FRIBIDI_SUBDIR) $(XFT_SUBDIR) DIST_SUBDIRS = mini-fribidi mini-xft opentype -INCLUDES = \ - -DPANGO_ENABLE_BACKEND \ - -DPANGO_ENABLE_ENGINE \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DLIBDIR=\"$(libdir)\" \ - -DG_DISABLE_DEPRECATED \ - $(X_CFLAGS) \ - $(FREETYPE_CFLAGS) \ +INCLUDES = \ + -DPANGO_ENABLE_BACKEND \ + -DPANGO_ENABLE_ENGINE \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DLIBDIR=\"$(libdir)\" \ + -DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \ + -DG_DISABLE_DEPRECATED \ + $(X_CFLAGS) \ + $(FREETYPE_CFLAGS) \ -I$(top_srcdir) if HAVE_X diff --git a/pango/modules.c b/pango/modules.c index b4346f4c..9153341b 100644 --- a/pango/modules.c +++ b/pango/modules.c @@ -245,8 +245,8 @@ process_module_file (FILE *module_file) pair->load_info = g_strdup (tmp_buf->str); #if defined(G_OS_WIN32) && defined(LIBDIR) if (strncmp (pair->load_info, - LIBDIR "/pango/modules/", - strlen (LIBDIR "/pango/modules/")) == 0) + LIBDIR "/pango/" MODULE_VERSION "/modules/", + strlen (LIBDIR "/pango/" MODULE_VERSION "/modules/")) == 0) { /* This is an entry put there by make install on the * packager's system. On Windows a prebuilt Pango @@ -258,8 +258,8 @@ process_module_file (FILE *module_file) gchar *tem = pair->load_info; pair->load_info = g_strconcat (pango_get_lib_subdirectory (), - "\\modules\\", - tem + strlen (LIBDIR "/pango/modules/"), + "\\" MODULE_VERSION "\\modules\\", + tem + strlen (LIBDIR "/pango/" MODULE_VERSION "/modules/"), NULL); g_free (tem); } diff --git a/pango/querymodules.c b/pango/querymodules.c index bcc02ad3..4ffd383e 100644 --- a/pango/querymodules.c +++ b/pango/querymodules.c @@ -133,6 +133,7 @@ int main (int argc, char **argv) path = pango_config_key_get ("Pango/ModulesPath"); if (!path) path = g_build_filename (pango_get_lib_subdirectory (), + MODULE_VERSION, "modules", NULL); -- cgit v1.2.1