Fix problem where == was used instead if =. (#73694, Martin Gansser)

Wed Mar  6 11:43:46 2002  Owen Taylor  <otaylor@redhat.com>

	* 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.

8 files changed, 10 insertions, 22 deletions

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