diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-08-09 01:40:46 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-08-09 01:40:46 +0000 |
| commit | ceb74567faa000289bae9f4110ae7752d762f597 (patch) | |
| tree | a72eb55482a54ffd947b145608e1fbffd5033ff8 /pango | |
| parent | 38070eff87be3dd0c592ba53b11a10618b092250 (diff) | |
| download | pango-ceb74567faa000289bae9f4110ae7752d762f597.tar.gz | |
Some fixes from #90267
Thu Aug 8 21:37:48 2002 Owen Taylor <otaylor@redhat.com>
Some fixes from #90267
* configure.in: Fix case where freetype2 is not in
default include path. Quiet some warnings if
/usr/lib/qt* doesn't exist.
* examples/Makefile.am: Fix problem where if no
Qt was found, -I /include was in the CFLAGS.
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index a42ccbc4..16bd611b 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -54,7 +54,7 @@ XFT_HFILES= XFT_BUILD_LIBS= endif -if HAVE_FONTCONFIG +if HAVE_FREETYPE FT2_HFILES=pangoft2.h pango-ot.h FT2_BUILD_LIBS=libpangoft2-1.0.la else @@ -77,7 +77,7 @@ pangoft2_win32res = pangoft2-win32res.lo install-libtool-import-lib: $(INSTALL) .libs/libpango-$(PANGO_API_VERSION).dll.a $(DESTDIR)$(libdir) -if HAVE_FONTCONFIG +if HAVE_FREETYPE $(INSTALL) .libs/libpangoft2-$(PANGO_API_VERSION).dll.a $(DESTDIR)$(libdir) endif $(INSTALL) .libs/libpangowin32-$(PANGO_API_VERSION).dll.a $(DESTDIR)$(libdir) @@ -98,7 +98,7 @@ noinst_DATA = pango-$(PANGO_API_VERSION).lib pangoft2-$(PANGO_API_VERSION).lib p install-ms-lib: $(INSTALL) pango-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) -if HAVE_FONTCONFIG +if HAVE_FREETYPE $(INSTALL) pangoft2-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) endif $(INSTALL) pangowin32-$(PANGO_API_VERSION).lib $(DESTDIR)$(libdir) |