Check for freetype headers the way freetype wants us to.

2003-11-17  Noah Levitt  <nlevitt@columbia.edu>

	* configure.in: Check for freetype headers the way freetype
	wants us to.

diff --git a/ChangeLog b/ChangeLog
index 7fbf5fa7c877ad903185b3474f2aede0e32b76e2..da18bc60afe21606642cfd2d3567309366bafccc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-17  Noah Levitt  <nlevitt@columbia.edu>
+
+       * configure.in: Check for freetype headers the way freetype
+       wants us to.
+
 2003-11-17  Mark McLoughlin  <mark@skynet.ie>
 
        Patch from Jaiserca <jaiserca@inf.upv.es> to add a

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7fbf5fa7c877ad903185b3474f2aede0e32b76e2..da18bc60afe21606642cfd2d3567309366bafccc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-11-17  Noah Levitt  <nlevitt@columbia.edu>
+
+       * configure.in: Check for freetype headers the way freetype
+       wants us to.
+
 2003-11-17  Mark McLoughlin  <mark@skynet.ie>
 
        Patch from Jaiserca <jaiserca@inf.upv.es> to add a

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7fbf5fa7c877ad903185b3474f2aede0e32b76e2..da18bc60afe21606642cfd2d3567309366bafccc 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-11-17  Noah Levitt  <nlevitt@columbia.edu>
+
+       * configure.in: Check for freetype headers the way freetype
+       wants us to.
+
 2003-11-17  Mark McLoughlin  <mark@skynet.ie>
 
        Patch from Jaiserca <jaiserca@inf.upv.es> to add a

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7fbf5fa7c877ad903185b3474f2aede0e32b76e2..da18bc60afe21606642cfd2d3567309366bafccc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-11-17  Noah Levitt  <nlevitt@columbia.edu>
+
+       * configure.in: Check for freetype headers the way freetype
+       wants us to.
+
 2003-11-17  Mark McLoughlin  <mark@skynet.ie>
 
        Patch from Jaiserca <jaiserca@inf.upv.es> to add a

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7fbf5fa7c877ad903185b3474f2aede0e32b76e2..da18bc60afe21606642cfd2d3567309366bafccc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-11-17  Noah Levitt  <nlevitt@columbia.edu>
+
+       * configure.in: Check for freetype headers the way freetype
+       wants us to.
+
 2003-11-17  Mark McLoughlin  <mark@skynet.ie>
 
        Patch from Jaiserca <jaiserca@inf.upv.es> to add a

diff --git a/configure.in b/configure.in
index 67aadaeb874012cb179ca61642ad6cb954415815..da44bef2314a382a846905c14b6bf49f617281d3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -984,7 +984,8 @@ if test "x$gdktarget" = "xlinux-fb" || test "x$gdktarget" = "xx11" ; then
 
       AC_MSG_CHECKING([For sufficiently new FreeType (at least 2.0.1)])
       AC_TRY_COMPILE([
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 #include FT_ERRORS_H
     ],
                     [(void)1;],:,have_freetype=false)