[cairo-commit] cairo ChangeLog, 1.909, 1.910 configure.in, 1.129, 1.130

[Owen Taylor]

Committed by: otaylor

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv20061

Modified Files:
	ChangeLog configure.in 
Log Message:
2005-08-18  Owen Taylor  <otaylor at redhat.com>

        Reviewed by: krh

        * configure.in: Fix tests to just disable FreeType if a too-old FreeType
        is found, rather than erroring out. (#2298)


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.909
retrieving revision 1.910
diff -u -d -r1.909 -r1.910
--- ChangeLog	19 Aug 2005 00:19:54 -0000	1.909
+++ ChangeLog	19 Aug 2005 00:22:23 -0000	1.910
@@ -1,5 +1,12 @@
 2005-08-18  Owen Taylor  <otaylor at redhat.com>
 
+	Reviewed by: krh
+
+	* configure.in: Fix tests to just disable FreeType if a too-old FreeType
+	is found, rather than erroring out. (#2298)
+
+2005-08-18  Owen Taylor  <otaylor at redhat.com>
+
 	* src/cairo-xlib-surface.c (_cairo_xlib_surface_show_glyphs): Fix offset
 	passed in for source patterns. (#2333, Tim Rowley)
 

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- configure.in	18 Aug 2005 15:28:08 -0000	1.129
+++ configure.in	19 Aug 2005 00:22:23 -0000	1.130
@@ -295,27 +295,33 @@
       AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
     fi
     if test "$FREETYPE_CONFIG" = "no" ; then
-      AC_MSG_ERROR(No freetype-config script found in path or FREETYPE_CONFIG)
-    fi
-  
-    AC_MSG_CHECKING(freetype2 libtool version)
+      AC_MSG_WARN([No freetype-config script found in path or FREETYPE_CONFIG])
+      use_freetype=no
+    else
+      AC_MSG_CHECKING(freetype2 libtool version)
   
-    FREETYPE_VERSION=`$FREETYPE_CONFIG --version`
+      FREETYPE_VERSION=`$FREETYPE_CONFIG --version`
   
-    VERSION_DEC=`echo $FREETYPE_VERSION | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
-    MIN_VERSION_DEC=`echo $FREETYPE_MIN_VERSION | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
-    if test $VERSION_DEC -lt $MIN_VERSION_DEC; then
-      AC_MSG_ERROR($FREETYPE_VERSION - version $FREETYPE_MIN_VERSION from release $FREETYPE_MIN_RELEASE required)
+      VERSION_DEC=`echo $FREETYPE_VERSION | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
+      MIN_VERSION_DEC=`echo $FREETYPE_MIN_VERSION | awk -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
+      if test $VERSION_DEC -lt $MIN_VERSION_DEC; then
+        AC_MSG_RESULT($FREETYPE_VERSION - Too old)
+        AC_MSG_WARN([$FREETYPE_VERSION - version $FREETYPE_MIN_VERSION from release $FREETYPE_MIN_RELEASE required])
+        use_freetype=no
+      else
+        AC_MSG_RESULT($FREETYPE_VERSION - OK)
+	
+	FREETYPE_CONFIG_CFLAGS=`$FREETYPE_CONFIG --cflags`
+	FREETYPE_CONFIG_LIBS=`$FREETYPE_CONFIG --libs`  
+	FREETYPE_CFLAGS=$FREETYPE_CONFIG_CFLAGS
+	FREETYPE_LIBS=$FREETYPE_CONFIG_LIBS
+	FREETYPE_REQUIRES=fontconfig
+      fi
     fi
-    AC_MSG_RESULT($FREETYPE_VERSION - OK)
-
-    FREETYPE_CONFIG_CFLAGS=`$FREETYPE_CONFIG --cflags`
-    FREETYPE_CONFIG_LIBS=`$FREETYPE_CONFIG --libs`  
-    FREETYPE_CFLAGS=$FREETYPE_CONFIG_CFLAGS
-    FREETYPE_LIBS=$FREETYPE_CONFIG_LIBS
-    FREETYPE_REQUIRES=fontconfig
   fi
+fi
 
+if test "x$use_freetype" = "xyes"; then
   AC_SUBST(FREETYPE_CFLAGS)
   AC_SUBST(FREETYPE_LIBS)
   AC_SUBST(FREETYPE_CONFIG_CFLAGS)