Commit 60f52ce6d65113ac94456ba90508c3d2b0e86af6

Werner Lemberg 2003-04-24T05:45:59

* builds/unix/freetype-config.in (cflags): Emit FreeType 2's include files first. Otherwise there are conflicts with FreeType 1 installed simultaneously.

diff --git a/ChangeLog b/ChangeLog
index 61de2ac..c9143e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-24  Dieter Baron  <dillo@netbsd.org>
+
+	* 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  <wl@gnu.org>
 
 	Fixing bugs reported by Nelson Beebe.
diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
index c5a3e5a..5091723 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