aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/fonts.src/font-util/fontutil.m4
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-10-12 19:43:36 +0000
committermarha <marha@users.sourceforge.net>2009-10-12 19:43:36 +0000
commit821ad28aad2f8c3cf4bbef9c8ac053943603cc67 (patch)
tree741a72dab536c86c7c3d815d93574d1404b42a51 /xorg-server/fonts.src/font-util/fontutil.m4
parentf18b881b547c558dca584d68d45ace998fa49d18 (diff)
parent0c5e1ab504b4e8c56974a234bd440e9fa2f1f941 (diff)
downloadvcxsrv-821ad28aad2f8c3cf4bbef9c8ac053943603cc67.tar.gz
vcxsrv-821ad28aad2f8c3cf4bbef9c8ac053943603cc67.tar.bz2
vcxsrv-821ad28aad2f8c3cf4bbef9c8ac053943603cc67.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/fonts.src/font-util/fontutil.m4')
-rw-r--r--xorg-server/fonts.src/font-util/fontutil.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/fonts.src/font-util/fontutil.m4 b/xorg-server/fonts.src/font-util/fontutil.m4
index 2487e2654..64bccc374 100644
--- a/xorg-server/fonts.src/font-util/fontutil.m4
+++ b/xorg-server/fonts.src/font-util/fontutil.m4
@@ -1,6 +1,6 @@
dnl fontutil.m4. Generated from fontutil.m4.in by configure.
dnl
-dnl This file comes from X.Org's font-util 1.1.0
+dnl This file comes from X.Org's font-util 1.1.1
dnl
dnl Copyright 2005 Red Hat, Inc
dnl
@@ -71,7 +71,7 @@ dnl of the copyright holder.
# See the "minimum version" comment for each macro you use to see what
# version you require.
m4_defun([XORG_FONT_MACROS_VERSION],[
-m4_define([vers_have], [1.1.0])
+m4_define([vers_have], [1.1.1])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,