Up the FreeType version requirement to 2.0.9. (2.2.1 had a compilation

Wed Feb 12 16:59:23 2003  Owen Taylor  <otaylor@redhat.com>

        * configure.in pango/opentype/fterrcompat.h README:
        Up the FreeType version requirement to 2.0.9.
        (2.2.1 had a compilation failure with older versions,
        this catches it more cleanly, and removes some unneeded
        checks. #105302, problem reported by Will Partain.)

7 files changed, 41 insertions, 36 deletions

diff --git a/ChangeLog b/ChangeLog
index df5e866d..0e11244e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Feb 12 16:59:23 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in pango/opentype/fterrcompat.h README: 
+	Up the FreeType version requirement to 2.0.9.
+	(2.2.1 had a compilation failure with older versions,
+	this catches it more cleanly, and removes some unneeded
+	checks. #105302, problem reported by Will Partain.)
+
 Wed Feb 12 16:48:46 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_set_text):
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index df5e866d..0e11244e 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,11 @@
+Wed Feb 12 16:59:23 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in pango/opentype/fterrcompat.h README: 
+	Up the FreeType version requirement to 2.0.9.
+	(2.2.1 had a compilation failure with older versions,
+	this catches it more cleanly, and removes some unneeded
+	checks. #105302, problem reported by Will Partain.)
+
 Wed Feb 12 16:48:46 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_set_text):
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index df5e866d..0e11244e 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,11 @@
+Wed Feb 12 16:59:23 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in pango/opentype/fterrcompat.h README: 
+	Up the FreeType version requirement to 2.0.9.
+	(2.2.1 had a compilation failure with older versions,
+	this catches it more cleanly, and removes some unneeded
+	checks. #105302, problem reported by Will Partain.)
+
 Wed Feb 12 16:48:46 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_set_text):
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index df5e866d..0e11244e 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,11 @@
+Wed Feb 12 16:59:23 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in pango/opentype/fterrcompat.h README: 
+	Up the FreeType version requirement to 2.0.9.
+	(2.2.1 had a compilation failure with older versions,
+	this catches it more cleanly, and removes some unneeded
+	checks. #105302, problem reported by Will Partain.)
+
 Wed Feb 12 16:48:46 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_set_text):
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index df5e866d..0e11244e 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,11 @@
+Wed Feb 12 16:59:23 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in pango/opentype/fterrcompat.h README: 
+	Up the FreeType version requirement to 2.0.9.
+	(2.2.1 had a compilation failure with older versions,
+	this catches it more cleanly, and removes some unneeded
+	checks. #105302, problem reported by Will Partain.)
+
 Wed Feb 12 16:48:46 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-layout.c (pango_layout_set_text):
diff --git a/configure.in b/configure.in
index 9d18a90e..cda482d6 100644
--- a/configure.in
+++ b/configure.in
@@ -157,43 +157,12 @@ if test "x$FREETYPE_CONFIG" != "xno" ; then
 
   pango_save_ldflags=$LDFLAGS
   LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
-  AC_CHECK_LIB(freetype, FT_New_Face, have_freetype=true, :)
+  AC_CHECK_LIB(freetype, FT_Get_Next_Char, have_freetype=true, :)
   LDFLAGS=$pango_save_ldflags
-
-  if $have_freetype ; then
-    pango_save_cppflags="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
-
-    AC_MSG_CHECKING([For sufficiently new FreeType (at least 2.0.1)])
-    AC_TRY_COMPILE([
-#include <freetype/freetype.h>
-#include FT_ERRORS_H
-]
-                ,[(void)1;],:,have_freetype=false)
-    if $have_freetype ; then
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-    fi
-
-    CPPFLAGS="$pango_save_cppflags"
-  fi
 fi
 AC_SUBST(FREETYPE_LIBS)
 AC_SUBST(FREETYPE_CFLAGS)
 
-## see which freetype we have, 2.0.3 vs. 2.0.4
-pango_save_cppflags="$CPPFLAGS"  
-CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
-AC_CHECK_HEADER(freetype/internal/tterrors.h, AC_DEFINE(HAVE_FREETYPE_2_0_3))
-CPPFLAGS="$pango_save_cppflags"
-
-## Check to see whether we have FT_Get_First_Char(), new in 2.0.9
-pango_save_libs=$LIBS
-LIBS="$LIBS $FREETYPE_LIBS"
-AC_CHECK_FUNCS(FT_Get_First_Char)
-LIBS=$pango_save_libs
-
 #
 # Check for fontconfig
 #
diff --git a/pango/opentype/fterrcompat.h b/pango/opentype/fterrcompat.h
index 200cf642..223a993d 100644
--- a/pango/opentype/fterrcompat.h
+++ b/pango/opentype/fterrcompat.h
@@ -4,14 +4,10 @@
 
 #include <config.h>
 
-#ifdef HAVE_FREETYPE_2_0_3
-#include <freetype/internal/tterrors.h>
-#else
 #define TT_Err_Ok FT_Err_Ok
 #define TT_Err_Invalid_Argument FT_Err_Invalid_Argument
 #define TT_Err_Invalid_Face_Handle FT_Err_Invalid_Face_Handle
 #define TT_Err_Table_Missing FT_Err_Table_Missing
-#endif /* HAVE_FREETYPE_2_0_3 */
 
 /* Compat macros for name changes in FreeType 2.1.0
  */