diff options
| author | jacob berkman <jacob@ximian.com> | 2002-07-16 18:53:12 +0000 |
|---|---|---|
| committer | Jacob Berkman <jberkman@src.gnome.org> | 2002-07-16 18:53:12 +0000 |
| commit | 8abb501f10b82287550f71912ae7a58fffb3decd (patch) | |
| tree | 70f3ce004188c8cf48ef5449403ada5e5ce0c007 | |
| parent | eda1823df7f6c2d117964ab7ab2dcea7e99c3144 (diff) | |
| download | pango-8abb501f10b82287550f71912ae7a58fffb3decd.tar.gz | |
use $X_CFLAGS when looking for Xft headers (#88363)
2002-07-16 jacob berkman <jacob@ximian.com>
* configure.in: use $X_CFLAGS when looking for Xft headers
(#88363)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
| -rw-r--r-- | configure.in | 2 |
7 files changed, 31 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2002-07-16 jacob berkman <jacob@ximian.com> + + * configure.in: use $X_CFLAGS when looking for Xft headers + (#88363) + Mon Jul 15 14:59:22 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2.c (pango_ft2_get_per_char) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 8e612039..687c05ac 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2002-07-16 jacob berkman <jacob@ximian.com> + + * configure.in: use $X_CFLAGS when looking for Xft headers + (#88363) + Mon Jul 15 14:59:22 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2.c (pango_ft2_get_per_char) diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 8e612039..687c05ac 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,8 @@ +2002-07-16 jacob berkman <jacob@ximian.com> + + * configure.in: use $X_CFLAGS when looking for Xft headers + (#88363) + Mon Jul 15 14:59:22 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2.c (pango_ft2_get_per_char) diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 8e612039..687c05ac 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +2002-07-16 jacob berkman <jacob@ximian.com> + + * configure.in: use $X_CFLAGS when looking for Xft headers + (#88363) + Mon Jul 15 14:59:22 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2.c (pango_ft2_get_per_char) diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 8e612039..687c05ac 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +2002-07-16 jacob berkman <jacob@ximian.com> + + * configure.in: use $X_CFLAGS when looking for Xft headers + (#88363) + Mon Jul 15 14:59:22 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2.c (pango_ft2_get_per_char) diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 8e612039..687c05ac 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +2002-07-16 jacob berkman <jacob@ximian.com> + + * configure.in: use $X_CFLAGS when looking for Xft headers + (#88363) + Mon Jul 15 14:59:22 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2.c (pango_ft2_get_per_char) diff --git a/configure.in b/configure.in index 6c8f5b10..abb5a991 100644 --- a/configure.in +++ b/configure.in @@ -203,7 +203,7 @@ XFT_CFLAGS="" if test $have_x = true ; then if test $have_freetype = true ; then pango_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" + CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS $X_CFLAGS" AC_CHECK_LIB(Xrender, XRenderFindFormat, [AC_CHECK_LIB(Xft, XftFontOpen, |