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 | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 |
9 files changed, 46 insertions, 9 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 fc593a59..8a29a3c4 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 fc593a59..8a29a3c4 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 fc593a59..8a29a3c4 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 fc593a59..8a29a3c4 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 2cc16693..077f7beb 100644 --- a/configure.in +++ b/configure.in @@ -202,8 +202,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 @@ -212,11 +210,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 8d10b2b4..f622570f 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 66d5d9e9..ad7b4efe 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) @@ -183,7 +182,7 @@ lib_LTLIBRARIES += libpangoft2-1.0.la endif libpangoft2_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) $(no_undefined) -libpangoft2_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FT2_MODULES) $(FONTCONFIG_LIBS) $(GLIB_LIBS) +libpangoft2_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) $(GLIB_LIBS) libpangoft2_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la $(INCLUDED_FT2_MODULES) libpangoft2_1_0_la_SOURCES = \ diff --git a/tests/Makefile.am b/tests/Makefile.am index ac4d0bb2..8c0982f5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,7 +4,6 @@ INCLUDES = \ -I$(top_srcdir) \ $(GLIB_CFLAGS) \ $(XFT_CFLAGS) \ - $(FONTCONFIG_CFLAGS) \ $(FREETYPE_CFLAGS) \ $(X_CFLAGS) \ -DG_DISABLE_DEPRECATED \ |