mirrors/freetype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Savannah bug #25480.

Browse Source 
* builds/unix/freetype-config.in: For --ftversion, don't use $prefix
but $includedir.
This commit is contained in:
Werner Lemberg 2009-02-04 07:59:16 +00:00
parent 763ae208e5
commit 67bbcbd72d
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2009-02-04 Werner Lemberg <wl@gnu.org>
Fix Savannah bug #25480.
* builds/unix/freetype-config.in: For --ftversion, don't use $prefix
but $includedir.
2009-01-31 Werner Lemberg <wl@gnu.org>
Minor docmaker improvements.

27
builds/unix/freetype-config.in
View File

@ -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