From 67bbcbd72d025513091026a07125a82ff59b09d4 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Wed, 4 Feb 2009 07:59:16 +0000 Subject: [PATCH] Fix Savannah bug #25480. * builds/unix/freetype-config.in: For --ftversion, don't use $prefix but $includedir. --- ChangeLog | 7 +++++++ builds/unix/freetype-config.in | 27 +++++++++++++++------------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a9dbb4e2..dc5e3085c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-02-04 Werner Lemberg + + Fix Savannah bug #25480. + + * builds/unix/freetype-config.in: For --ftversion, don't use $prefix + but $includedir. + 2009-01-31 Werner Lemberg Minor docmaker improvements. diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in index a3435222a..9606d318b 100644 --- a/builds/unix/freetype-config.in +++ b/builds/unix/freetype-config.in @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2008 by +# Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -76,17 +76,7 @@ while test $# -gt 0 ; do exit 0 ;; --ftversion) - major=`grep define @prefix@/include/freetype2/freetype/freetype.h \ - | grep FREETYPE_MAJOR \ - | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` - minor=`grep define @prefix@/include/freetype2/freetype/freetype.h \ - | grep FREETYPE_MINOR \ - | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` - patch=`grep define @prefix@/include/freetype2/freetype/freetype.h \ - | grep FREETYPE_PATCH \ - | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` - echo $major.$minor.$patch - exit 0 + echo_ft_version=yes ;; --cflags) echo_cflags=yes @@ -127,6 +117,19 @@ else fi fi +if test "$echo_ft_version" = "yes" ; then + major=`grep define $includedir/freetype2/freetype/freetype.h \ + | grep FREETYPE_MAJOR \ + | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` + minor=`grep define $includedir/freetype2/freetype/freetype.h \ + | grep FREETYPE_MINOR \ + | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` + patch=`grep define $includedir/freetype2/freetype/freetype.h \ + | grep FREETYPE_PATCH \ + | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` + echo $major.$minor.$patch +fi + if test "$echo_cflags" = "yes" ; then cflags="-I$includedir/freetype2" if test "$includedir" != "/usr/include" ; then