summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarin Adler <darin@src.gnome.org>2001-05-07 18:40:30 +0000
committerDarin Adler <darin@src.gnome.org>2001-05-07 18:40:30 +0000
commitf02b65da8ca88eedbc9996d860d3831539ecd77a (patch)
treee85b577017801075118c1fc17ebb4dee6859a741
parent327670c10128141fabbf82f08b0e1ebec51868f1 (diff)
downloadshared-mime-info-f02b65da8ca88eedbc9996d860d3831539ecd77a.tar.gz
Update freetype to work with freetype-configs that use . instead of :
as version part separator. Not sure why this is inconsistent. svn path=/trunk/; revision=1702
-rw-r--r--hack-macros/nautilus-macros.m48
1 files changed, 4 insertions, 4 deletions
diff --git a/hack-macros/nautilus-macros.m4 b/hack-macros/nautilus-macros.m4
index a7c680ac..e229ce2f 100644
--- a/hack-macros/nautilus-macros.m4
+++ b/hack-macros/nautilus-macros.m4
@@ -97,11 +97,11 @@ AC_ARG_ENABLE(freetype2test, [ --disable-freetype2test Do not try to comp
FREETYPE2_LIBS=`$FREETYPE2_CONFIG $freetype2conf_args --libs`
freetype2_major_version=`$FREETYPE2_CONFIG $freetype2_args --version | \
- sed 's/\([[0-9]]*\):\([[0-9]]*\):\([[0-9]]*\)/\1/'`
+ sed 's/\([[0-9]]*\)[[:.]]\([[0-9]]*\)[[:.]]\([[0-9]]*\)/\1/'`
freetype2_minor_version=`$FREETYPE2_CONFIG $freetype2_args --version | \
- sed 's/\([[0-9]]*\):\([[0-9]]*\):\([[0-9]]*\)/\2/'`
- freetype2_micro_version=`$FREETYPE2_CONFIG $freetype2_config_args --version | \
- sed 's/\([[0-9]]*\):\([[0-9]]*\):\([[0-9]]*\)/\3/'`
+ sed 's/\([[0-9]]*\)[[:.]]\([[0-9]]*\)[[:.]]\([[0-9]]*\)/\2/'`
+ freetype2_micro_version=`$FREETYPE2_CONFIG $freetype2_args --version | \
+ sed 's/\([[0-9]]*\)[[:.]]\([[0-9]]*\)[[:.]]\([[0-9]]*\)/\3/'`
if test "x$enable_freetype2test" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"