diff options
author | marha <marha@users.sourceforge.net> | 2013-09-06 13:39:40 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-09-06 13:39:40 +0200 |
commit | d53900c52abc2402f978b72278712e4bcdbde9f2 (patch) | |
tree | 689cedc44df148a96d68ef460cff6b1756f096b6 /xorg-server/configure.ac | |
parent | 36eb733ed5aaaeaefc49c8894bf213d16b58d242 (diff) | |
parent | 2414a1de3cc17f438219f8f2a58b530d33e99a5e (diff) | |
download | vcxsrv-d53900c52abc2402f978b72278712e4bcdbde9f2.tar.gz vcxsrv-d53900c52abc2402f978b72278712e4bcdbde9f2.tar.bz2 vcxsrv-d53900c52abc2402f978b72278712e4bcdbde9f2.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman xserver xkeyboard-config
Conflicts:
xorg-server/dix/dispatch.c
Diffstat (limited to 'xorg-server/configure.ac')
-rw-r--r-- | xorg-server/configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index d27ca2392..515942063 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -47,7 +47,7 @@ XORG_WITH_XSLTPROC XORG_ENABLE_UNIT_TESTS XORG_LD_WRAP([optional]) -m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install fontutil 1.1 or later before running autoconf/autogen])]) +m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install font-util 1.1 or later before running autoconf/autogen])]) XORG_FONT_MACROS_VERSION(1.1) dnl this gets generated by autoheader, and thus contains all the defines. we |