diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 8 | ||||
-rw-r--r-- | ChangeLog.pre-1-4 | 8 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 8 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 8 | ||||
-rw-r--r-- | configure.in | 10 | ||||
-rw-r--r-- | examples/Makefile.am | 1 | ||||
-rw-r--r-- | pango/Makefile.am | 7 | ||||
-rw-r--r-- | tests/Makefile.am | 1 |
9 files changed, 48 insertions, 11 deletions
@@ -1,3 +1,11 @@ +Tue Apr 29 18:02:31 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in: Add the fonconfig cflags/libs to + FREETYPE_CFLAGS/LIBS. (#111326, Noah Levitt) + + * {pango,tests,examples}/Makefile.am: Remove now + unnecessary references to FONTCONFIG_CFLAGS/LIBS. + Thu Apr 24 19:12:05 2003 Owen Taylor <otaylor@redhat.com> * autogen.sh (have_libtool): Accept libtool-1.5. (#111482) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index dab0490d..ea07134d 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,11 @@ +Tue Apr 29 18:02:31 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in: Add the fonconfig cflags/libs to + FREETYPE_CFLAGS/LIBS. (#111326, Noah Levitt) + + * {pango,tests,examples}/Makefile.am: Remove now + unnecessary references to FONTCONFIG_CFLAGS/LIBS. + Thu Apr 24 19:12:05 2003 Owen Taylor <otaylor@redhat.com> * autogen.sh (have_libtool): Accept libtool-1.5. (#111482) diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index dab0490d..ea07134d 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,11 @@ +Tue Apr 29 18:02:31 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in: Add the fonconfig cflags/libs to + FREETYPE_CFLAGS/LIBS. (#111326, Noah Levitt) + + * {pango,tests,examples}/Makefile.am: Remove now + unnecessary references to FONTCONFIG_CFLAGS/LIBS. + Thu Apr 24 19:12:05 2003 Owen Taylor <otaylor@redhat.com> * autogen.sh (have_libtool): Accept libtool-1.5. (#111482) diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index dab0490d..ea07134d 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,11 @@ +Tue Apr 29 18:02:31 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in: Add the fonconfig cflags/libs to + FREETYPE_CFLAGS/LIBS. (#111326, Noah Levitt) + + * {pango,tests,examples}/Makefile.am: Remove now + unnecessary references to FONTCONFIG_CFLAGS/LIBS. + Thu Apr 24 19:12:05 2003 Owen Taylor <otaylor@redhat.com> * autogen.sh (have_libtool): Accept libtool-1.5. (#111482) diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index dab0490d..ea07134d 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,11 @@ +Tue Apr 29 18:02:31 2003 Owen Taylor <otaylor@redhat.com> + + * configure.in: Add the fonconfig cflags/libs to + FREETYPE_CFLAGS/LIBS. (#111326, Noah Levitt) + + * {pango,tests,examples}/Makefile.am: Remove now + unnecessary references to FONTCONFIG_CFLAGS/LIBS. + Thu Apr 24 19:12:05 2003 Owen Taylor <otaylor@redhat.com> * autogen.sh (have_libtool): Accept libtool-1.5. (#111482) diff --git a/configure.in b/configure.in index fd19ae3f..f3ad5b94 100644 --- a/configure.in +++ b/configure.in @@ -189,8 +189,6 @@ if test "x$FREETYPE_CONFIG" != "xno" ; then AC_CHECK_LIB(freetype, FT_Get_Next_Char, have_freetype=true, :) LDFLAGS=$pango_save_ldflags fi -AC_SUBST(FREETYPE_LIBS) -AC_SUBST(FREETYPE_CFLAGS) # # Check for fontconfig @@ -199,11 +197,13 @@ have_fontconfig=false PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 1.0.1, have_fontconfig=true, :) -AC_SUBST(FONTCONFIG_LIBS) -AC_SUBST(FONTCONFIG_CFLAGS) +FREETYPE_LIBS="$FONTCONFIG_LIBS $FREETYPE_LIBS" +FREETYPE_CFLAGS="$FONTCONFIG_CFLAGS $FREETYPE_CFLAGS" +AC_SUBST(FREETYPE_LIBS) +AC_SUBST(FREETYPE_CFLAGS) + AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype && $have_fontconfig) - # # Checks for Xft/XRender # diff --git a/examples/Makefile.am b/examples/Makefile.am index f83e320c..3dc00654 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -8,7 +8,6 @@ INCLUDES = \ -I$(top_srcdir) \ $(QT_INCLUDES) \ $(GLIB_CFLAGS) \ - $(FONTCONFIG_CFLAGS) \ $(FREETYPE_CFLAGS) ################################################### diff --git a/pango/Makefile.am b/pango/Makefile.am index 6a4ca6a2..a03a7669 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -27,7 +27,6 @@ INCLUDES = \ $(PANGO_DEBUG_FLAGS) \ $(GLIB_CFLAGS) \ $(XFT_CFLAGS) \ - $(FONTCONFIG_CFLAGS) \ $(FREETYPE_CFLAGS) \ $(X_CFLAGS) \ -I$(top_srcdir) @@ -210,7 +209,7 @@ libpangoft2_1_0_la_SOURCES = \ libpangoft2_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \ $(GLIB_LIBS) \ $(no_undefined) $(pangoft2_export_symbols) -libpangoft2_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FT2_MODULES) $(FONTCONFIG_LIBS) $(pangoft2_win32res) +libpangoft2_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) $(pangoft2_win32res) libpangoft2_1_0_la_DEPENDENCIES = $(INCLUDED_FT2_MODULES) libpango-$(PANGO_API_VERSION).la pangoft2-win32res.lo : pangoft2.rc @@ -282,10 +281,10 @@ pango_querymodules_SOURCES = \ querymodules.c if HAVE_XFT -pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft-$(PANGO_API_VERSION).la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS) +pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft-$(PANGO_API_VERSION).la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FREETYPE_LIBS) pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la else -pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FONTCONFIG_LIBS) $(X_EXTRA_LIBS) +pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FREETYPE_LIBS) $(X_EXTRA_LIBS) pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) libpango-$(PANGO_API_VERSION).la endif diff --git a/tests/Makefile.am b/tests/Makefile.am index 513e46b0..17b314e8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -28,7 +28,6 @@ INCLUDES = \ -I$(top_srcdir) \ $(GLIB_CFLAGS) \ $(XFT_CFLAGS) \ - $(FONTCONFIG_CFLAGS) \ $(FREETYPE_CFLAGS) \ $(X_CFLAGS) \ $(X_DEFINES) \ |