From fdb514c6ca239ef06ea04565b8ad14258ae22210 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Thu, 24 Apr 2003 05:45:59 +0000 Subject: [PATCH] * builds/unix/freetype-config.in (cflags): Emit FreeType 2's include files first. Otherwise there are conflicts with FreeType 1 installed simultaneously. --- ChangeLog | 6 ++++++ builds/unix/freetype-config.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 61de2ac25..c9143e736 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-04-24 Dieter Baron + + * builds/unix/freetype-config.in (cflags): Emit FreeType 2's include + files first. Otherwise there are conflicts with FreeType 1 + installed simultaneously. + 2003-04-23 Werner Lemberg Fixing bugs reported by Nelson Beebe. diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in index c5a3e5abc..5091723a5 100644 --- a/builds/unix/freetype-config.in +++ b/builds/unix/freetype-config.in @@ -81,7 +81,7 @@ fi if test "$echo_cflags" = "yes" ; then cflags="-I@includedir@/freetype2" if test "@includedir@" != "/usr/include" ; then - echo -I@includedir@ $cflags + echo $cflags -I@includedir@ else echo $cflags fi