diff options
author | John Harper <jsh@eazel.com> | 2001-03-22 22:28:47 +0000 |
---|---|---|
committer | John Harper <jsh@src.gnome.org> | 2001-03-22 22:28:47 +0000 |
commit | 1d4f575b0477db34cb207734cc1244ecf745f040 (patch) | |
tree | 4a9a81e922ff108767f7e1b082b1d91b5431066b | |
parent | 2ad460e37904ec963e7fde3070020a81ad117402 (diff) | |
download | nautilus-1d4f575b0477db34cb207734cc1244ecf745f040.tar.gz |
reviewed by: Robin * Slomkowski <rslomkow@eazel.com>
2001-03-22 John Harper <jsh@eazel.com>
reviewed by: Robin * Slomkowski <rslomkow@eazel.com>
* configure.in: require freetype version 2.0.1, library version
6.1.0
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | configure.in | 12 |
2 files changed, 18 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2001-03-22 John Harper <jsh@eazel.com> + + reviewed by: Robin * Slomkowski <rslomkow@eazel.com> + + * configure.in: require freetype version 2.0.1, library version + 6.1.0 + 2001-03-22 John Sullivan <sullivan@eazel.com> reviewed by: Darin Adler <darin@eazel.com> diff --git a/configure.in b/configure.in index f51d35b36..8a4aa196d 100644 --- a/configure.in +++ b/configure.in @@ -21,7 +21,8 @@ LIBXML_REQUIRED=1.8.10 ORBIT_REQUIRED=0.5.6 GNOME_VFS_REQUIRED=1.0 POPT_REQUIRED=1.5 -FREETYPE_REQUIRED=2.0 +FREETYPE_REQUIRED=2.0.1 +FREETYPE_LIBRARY_REQUIRED=6.1.0 MEDUSA_REQUIRED=0.2.2 ESOUND_REQUIRED=0.2 LIBGHTTP_REQUIRED=1.0.9 @@ -272,6 +273,15 @@ AC_MSG_ERROR([ *** source versions are available from ftp://ftp.freetype.org]) fi +if test -n "$freetype2_prefix"; then + FREETYPE_CONFIG="$freetype2_prefix/bin/freetype-config" +else + FREETYPE_CONFIG="freetype-config" +fi + +dnl check for the necessary library version +EAZEL_VERSION_INSIST(freetype library, $FREETYPE_CONFIG --version | tr : ., >=, FREETYPE_LIBRARY_REQUIRED) + FREETYPE2_CFLAGS="-I$freetype2_include_prefix" FREETYPE2_LIBS="-L$freetype2_lib_prefix -lfreetype" |