From 5da782e5070262f6b8494ee987cde3a8d7d51d78 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 3 Aug 2008 21:06:43 +0000 Subject: [PATCH] Don't attempt to build the MS import libraries for libpangoft2 unless 2008-08-04 Tor Lillqvist * pango/Makefile.am: Don't attempt to build the MS import libraries for libpangoft2 unless HAVE_FREETYPE. svn path=/trunk/; revision=2669 --- ChangeLog | 5 +++++ pango/Makefile.am | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c37cb3e..6c7427a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-08-04 Tor Lillqvist + + * pango/Makefile.am: Don't attempt to build the MS import + libraries for libpangoft2 unless HAVE_FREETYPE. + 2008-08-03 Tor Lillqvist * pango/pango-bidi-type.c: Include for strlen() diff --git a/pango/Makefile.am b/pango/Makefile.am index 4f405c1..fbb947b 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -376,9 +376,15 @@ uninstall-def-files: endif if MS_LIB_AVAILABLE -noinst_DATA = pango-$(PANGO_API_VERSION).lib pangoft2-$(PANGO_API_VERSION).lib pangowin32-$(PANGO_API_VERSION).lib pangocairo-$(PANGO_API_VERSION).lib +MS_LIB_FILES = pango-$(PANGO_API_VERSION).lib pangowin32-$(PANGO_API_VERSION).lib pangocairo-$(PANGO_API_VERSION).lib -install-ms-lib: pango-$(PANGO_API_VERSION).lib pangoft2-$(PANGO_API_VERSION).lib pangowin32-$(PANGO_API_VERSION).lib pangocairo-$(PANGO_API_VERSION).lib +if HAVE_FREETYPE +MS_LIB_FILES += pangoft2-$(PANGO_API_VERSION).lib +endif + +noinst_DATA = $(MS_LIB_FILES) + +install-ms-lib: $(MS_LIB_FILES) $(INSTALL) pango-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) if HAVE_FREETYPE $(INSTALL) pangoft2-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) -- 2.7.4