Attachment 2921 Details for Bug 2298 – Proposed patch

[patch] Proposed patch

cairo-freetype-configure.patch (text/plain), 2.46 KB, created by Owen Taylor on 2005-08-18 16:30:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Taylor

Created: 2005-08-18 16:30:05 UTC

Size: 2.46 KB

patch

obsolete

>Index: configure.in
>===================================================================
>RCS file: /cvs/cairo/cairo/configure.in,v
>retrieving revision 1.129
>diff -u -p -r1.129 configure.in
>--- configure.in	18 Aug 2005 15:28:08 -0000	1.129
>+++ configure.in	18 Aug 2005 23:29:08 -0000
>@@ -295,27 +295,37 @@ if test "x$use_freetype" = "xyes"; then
>       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)
>+      AC_MSG_WARN([No freetype-config script found in path or FREETYPE_CONFIG])
>+      use_freetype=no
>     fi
>+
>+    if test "x$use_freetype" = "xyes"; then
>+      AC_MSG_CHECKING(freetype2 libtool version)
>   
>-    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)
>+      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
>+    if test "x$use_freetype" = "xyes"; then
>+      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
>+fi
> 
>+if test "x$use_freetype" = "xyes"; then
>   AC_SUBST(FREETYPE_CFLAGS)
>   AC_SUBST(FREETYPE_LIBS)
>   AC_SUBST(FREETYPE_CONFIG_CFLAGS)

Actions: View | Splinter Review

Attachments on bug 2298: 2921

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.