From ceb74567faa000289bae9f4110ae7752d762f597 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 9 Aug 2002 01:40:46 +0000 Subject: Some fixes from #90267 Thu Aug 8 21:37:48 2002 Owen Taylor 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. --- examples/Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/Makefile.am b/examples/Makefile.am index bcbb7d23..73b34e90 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -5,12 +5,13 @@ aliasdir = $(sysconfdir)/pango INCLUDES = -DG_DISABLE_DEPRECATED -I$(top_srcdir) $(QT_INCLUDES) $(GLIB_CFLAGS) $(FONTCONFIG_CFLAGS) $(FREETYPE_CFLAGS) ################################################### -QT_INCLUDES=-I $(QTDIR)/include -QT_LIBS=-L$(QTDIR)/lib -lqt -MOC=$(QTDIR)/bin/moc if BUILD_QT_TEST +QT_INCLUDES=-I$(QTDIR)/include +QT_LIBS=-L$(QTDIR)/lib -lqt +MOC=$(QTDIR)/bin/moc + viewer_programs = pango-viewer BUILT_SOURCES=moc_viewer-qt.cc -- cgit v1.2.1