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.

8 files changed, 75 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index e0e00976..4267bc44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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.
+
 Thu Aug  8 19:14:09 2002  Owen Taylor  <otaylor@redhat.com>
 
         * pango/pangoxft-font.c (load_fallback_font): Fix
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index e0e00976..4267bc44 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,14 @@
+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.
+
 Thu Aug  8 19:14:09 2002  Owen Taylor  <otaylor@redhat.com>
 
         * pango/pangoxft-font.c (load_fallback_font): Fix
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index e0e00976..4267bc44 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,14 @@
+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.
+
 Thu Aug  8 19:14:09 2002  Owen Taylor  <otaylor@redhat.com>
 
         * pango/pangoxft-font.c (load_fallback_font): Fix
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index e0e00976..4267bc44 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,14 @@
+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.
+
 Thu Aug  8 19:14:09 2002  Owen Taylor  <otaylor@redhat.com>
 
         * pango/pangoxft-font.c (load_fallback_font): Fix
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index e0e00976..4267bc44 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,14 @@
+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.
+
 Thu Aug  8 19:14:09 2002  Owen Taylor  <otaylor@redhat.com>
 
         * pango/pangoxft-font.c (load_fallback_font): Fix
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index e0e00976..4267bc44 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,14 @@
+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.
+
 Thu Aug  8 19:14:09 2002  Owen Taylor  <otaylor@redhat.com>
 
         * pango/pangoxft-font.c (load_fallback_font): Fix
diff --git a/configure.in b/configure.in
index f759910e..a98d3ddd 100644
--- a/configure.in
+++ b/configure.in
@@ -156,8 +156,10 @@ if test "x$FREETYPE_CONFIG" != "xno" ; then
   FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
   FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
 
-  AC_CHECK_LIB(freetype, FT_New_Face, have_freetype=true
-	       ,:,$FREETYPE_LIBS)
+  pango_save_ldflags=$LDFLAGS
+  LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
+  AC_CHECK_LIB(freetype, FT_New_Face, have_freetype=true, :)
+  LDFLAGS=$pango_save_ldflags
 
   if $have_freetype ; then
     pango_save_cppflags="$CPPFLAGS"
@@ -446,7 +448,7 @@ if test "$CXX" != "" ; then
 	 QTDIR=
        fi
      else
-       dirs=`cd /usr/lib && ls -d -r qt*`
+       dirs=`cd /usr/lib && ls -d -r qt* 2>/dev/null`
        for dir in $dirs ; do
           case $dir in
             qt2*|qt-2*|qt3*|qt-3*)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index e3737ecf..a934ad7c 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) $(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