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.
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
parent: 38070eff87be3dd0c592ba53b11a10618b092250 (diff)
download: pango-ceb74567faa000289bae9f4110ae7752d762f597.tar.gz
9 files changed, 140 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index f1736e33..ca653461 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+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:34:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove the HAVE_FONTCONFIG conditional;
+	instead make the HAVE_FREETYPE conditional
+	be $have_freetype && $have_fontconfig.
+
+	* pango/Makefile.am: Use the HAVE_FREETYPE conditional
+	for checking whether we are building the FT2 backend,
+	as we do everywhere else.
+
 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 f1736e33..ca653461 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,24 @@
+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:34:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove the HAVE_FONTCONFIG conditional;
+	instead make the HAVE_FREETYPE conditional
+	be $have_freetype && $have_fontconfig.
+
+	* pango/Makefile.am: Use the HAVE_FREETYPE conditional
+	for checking whether we are building the FT2 backend,
+	as we do everywhere else.
+
 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 f1736e33..ca653461 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,24 @@
+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:34:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove the HAVE_FONTCONFIG conditional;
+	instead make the HAVE_FREETYPE conditional
+	be $have_freetype && $have_fontconfig.
+
+	* pango/Makefile.am: Use the HAVE_FREETYPE conditional
+	for checking whether we are building the FT2 backend,
+	as we do everywhere else.
+
 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 f1736e33..ca653461 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,24 @@
+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:34:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove the HAVE_FONTCONFIG conditional;
+	instead make the HAVE_FREETYPE conditional
+	be $have_freetype && $have_fontconfig.
+
+	* pango/Makefile.am: Use the HAVE_FREETYPE conditional
+	for checking whether we are building the FT2 backend,
+	as we do everywhere else.
+
 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 f1736e33..ca653461 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,24 @@
+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:34:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove the HAVE_FONTCONFIG conditional;
+	instead make the HAVE_FREETYPE conditional
+	be $have_freetype && $have_fontconfig.
+
+	* pango/Makefile.am: Use the HAVE_FREETYPE conditional
+	for checking whether we are building the FT2 backend,
+	as we do everywhere else.
+
 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 f1736e33..ca653461 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,24 @@
+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:34:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Remove the HAVE_FONTCONFIG conditional;
+	instead make the HAVE_FREETYPE conditional
+	be $have_freetype && $have_fontconfig.
+
+	* pango/Makefile.am: Use the HAVE_FREETYPE conditional
+	for checking whether we are building the FT2 backend,
+	as we do everywhere else.
+
 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 9261cf3e..c7c19ca9 100644
--- a/configure.in
+++ b/configure.in
@@ -153,8 +153,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"
@@ -177,7 +179,6 @@ if test "x$FREETYPE_CONFIG" != "xno" ; then
 fi
 AC_SUBST(FREETYPE_LIBS)
 AC_SUBST(FREETYPE_CFLAGS)
-AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype) 
 
 ## see which freetype we have, 2.0.3 vs. 2.0.4
 pango_save_cppflags="$CPPFLAGS"  
@@ -200,7 +201,8 @@ PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 1.0.1, have_fontconfig=true, :)
 
 AC_SUBST(FONTCONFIG_LIBS)
 AC_SUBST(FONTCONFIG_CFLAGS)
-AM_CONDITIONAL(HAVE_FONTCONFIG, $have_fontconfig)
+
+AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype && $have_fontconfig)
 
 #
 # Checks for Xft/XRender
@@ -437,7 +439,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 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
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)
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
parent	38070eff87be3dd0c592ba53b11a10618b092250 (diff)
download	pango-ceb74567faa000289bae9f4110ae7752d762f597.tar.gz