diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-06-06 12:42:48 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-06-06 12:42:48 +0000 |
| commit | fcb57dfcda4ab9d7640cdb5e036facc3bafb27e4 (patch) | |
| tree | 37f72bc2d961a02749b1c6da5f0df1b8806c10bf | |
| parent | 0623b011441e813c62d43e410b2419ae603e59f9 (diff) | |
| download | pango-fcb57dfcda4ab9d7640cdb5e036facc3bafb27e4.tar.gz | |
Provide : as the fourth argument whne checking for fontconfig, xft, so we
Thu Jun 6 08:42:32 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Provide : as the fourth argument
whne checking for fontconfig, xft, so we don't error out
if they aren't found. (#84333, HideToshi Tajima)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | configure.in | 4 |
7 files changed, 38 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Thu Jun 6 08:42:32 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Provide : as the fourth argument + whne checking for fontconfig, xft, so we don't error out + if they aren't found. (#84333, HideToshi Tajima) + Tue Jun 4 11:52:10 2002 Owen Taylor <otaylor@redhat.com> * pangoxft.pc.in (Cflags): Fix to have @XFT_CFLAGS@ diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 35639efb..cc9e6bff 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Thu Jun 6 08:42:32 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Provide : as the fourth argument + whne checking for fontconfig, xft, so we don't error out + if they aren't found. (#84333, HideToshi Tajima) + Tue Jun 4 11:52:10 2002 Owen Taylor <otaylor@redhat.com> * pangoxft.pc.in (Cflags): Fix to have @XFT_CFLAGS@ diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 35639efb..cc9e6bff 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,9 @@ +Thu Jun 6 08:42:32 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Provide : as the fourth argument + whne checking for fontconfig, xft, so we don't error out + if they aren't found. (#84333, HideToshi Tajima) + Tue Jun 4 11:52:10 2002 Owen Taylor <otaylor@redhat.com> * pangoxft.pc.in (Cflags): Fix to have @XFT_CFLAGS@ diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 35639efb..cc9e6bff 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Thu Jun 6 08:42:32 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Provide : as the fourth argument + whne checking for fontconfig, xft, so we don't error out + if they aren't found. (#84333, HideToshi Tajima) + Tue Jun 4 11:52:10 2002 Owen Taylor <otaylor@redhat.com> * pangoxft.pc.in (Cflags): Fix to have @XFT_CFLAGS@ diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 35639efb..cc9e6bff 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Thu Jun 6 08:42:32 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Provide : as the fourth argument + whne checking for fontconfig, xft, so we don't error out + if they aren't found. (#84333, HideToshi Tajima) + Tue Jun 4 11:52:10 2002 Owen Taylor <otaylor@redhat.com> * pangoxft.pc.in (Cflags): Fix to have @XFT_CFLAGS@ diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 35639efb..cc9e6bff 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Thu Jun 6 08:42:32 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Provide : as the fourth argument + whne checking for fontconfig, xft, so we don't error out + if they aren't found. (#84333, HideToshi Tajima) + Tue Jun 4 11:52:10 2002 Owen Taylor <otaylor@redhat.com> * pangoxft.pc.in (Cflags): Fix to have @XFT_CFLAGS@ diff --git a/configure.in b/configure.in index 10ce63fe..40eb3970 100644 --- a/configure.in +++ b/configure.in @@ -197,7 +197,7 @@ LIBS=$pango_save_libs # have_fontconfig=false -PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 1.0.1, have_fontconfig=true) +PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 1.0.1, have_fontconfig=true, :) AC_SUBST(FONTCONFIG_LIBS) AC_SUBST(FONTCONFIG_CFLAGS) @@ -208,7 +208,7 @@ AM_CONDITIONAL(HAVE_FONTCONFIG, $have_fontconfig) # have_xft=false -PKG_CHECK_MODULES(XFT, xft >= 2.0.0, have_xft=true) +PKG_CHECK_MODULES(XFT, xft >= 2.0.0, have_xft=true, :) AC_SUBST(XFT_LIBS) AC_SUBST(XFT_CFLAGS) |