diff options
| author | Sven Neumann <sven@gimp.org> | 2003-01-20 22:21:56 +0000 |
|---|---|---|
| committer | Sven Neumann <neo@src.gnome.org> | 2003-01-20 22:21:56 +0000 |
| commit | c0521949bc917c4432815c3dcd42228c3ca63440 (patch) | |
| tree | 061db150e6c25cac24e09978c13159ddff42ead7 | |
| parent | 09fcd2717629354eebb5e79c75901ae58d52b21d (diff) | |
| download | pango-c0521949bc917c4432815c3dcd42228c3ca63440.tar.gz | |
merged fix for bug #103917 from HEAD branch.
2003-01-20 Sven Neumann <sven@gimp.org>
* configure.in: merged fix for bug #103917 from HEAD branch.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 4 | ||||
| -rw-r--r-- | configure.in | 3 |
6 files changed, 21 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2003-01-20 Sven Neumann <sven@gimp.org> + + * configure.in: merged fix for bug #103917 from HEAD branch. + 2003-01-20 Padraig O'Briain <padraig.obriain@sun.com> * pango/fonts.c (pango_font_description_from_string): Avoid crash diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 0d94bc3e..18d06983 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,7 @@ +2003-01-20 Sven Neumann <sven@gimp.org> + + * configure.in: merged fix for bug #103917 from HEAD branch. + 2003-01-20 Padraig O'Briain <padraig.obriain@sun.com> * pango/fonts.c (pango_font_description_from_string): Avoid crash diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 0d94bc3e..18d06983 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,7 @@ +2003-01-20 Sven Neumann <sven@gimp.org> + + * configure.in: merged fix for bug #103917 from HEAD branch. + 2003-01-20 Padraig O'Briain <padraig.obriain@sun.com> * pango/fonts.c (pango_font_description_from_string): Avoid crash diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 0d94bc3e..18d06983 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,7 @@ +2003-01-20 Sven Neumann <sven@gimp.org> + + * configure.in: merged fix for bug #103917 from HEAD branch. + 2003-01-20 Padraig O'Briain <padraig.obriain@sun.com> * pango/fonts.c (pango_font_description_from_string): Avoid crash diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 0d94bc3e..18d06983 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,7 @@ +2003-01-20 Sven Neumann <sven@gimp.org> + + * configure.in: merged fix for bug #103917 from HEAD branch. + 2003-01-20 Padraig O'Briain <padraig.obriain@sun.com> * pango/fonts.c (pango_font_description_from_string): Avoid crash diff --git a/configure.in b/configure.in index 63074f1e..73a01004 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,4 @@ dnl Process this file with autoconf to create configure. - AC_PREREQ(2.53) AC_INIT(ChangeLog) @@ -815,7 +814,7 @@ pango-zip.sh *pango-config*)chmod +x pango-config;; esac]) echo "configuration: - backends: `if $have_freetype ; then echo " FreeType"; fi \ + backends: `if $have_freetype && $have_fontconfig; then echo " FreeType"; fi \ ``if $have_x ; then echo " X"; fi \ ``if $have_xft ; then echo " Xft"; fi \ ``if $have_win32 ; then echo " Win32"; fi`" |