diff options
| author | Keith Packard <keithp@keithp.com> | 2011-04-22 10:48:37 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-04-22 10:48:37 -0700 |
| commit | 302bdc3c9678c028bed71dbe9c5ba04997626b6b (patch) | |
| tree | c2b96c186a2e98f1b0bc71a97b4a43b04ba0afc0 /configure.ac | |
| parent | 001b6b8b70734db1fa2f68e45c1db8337ba9f662 (diff) | |
| parent | 6f97fe5df16f947e52875187ff4f9e25fab33ad7 (diff) | |
Merge remote-tracking branch 'whot/for-keith'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index eeaa29b02..339fdfc2e 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,7 @@ AM_MAINTAINER_MODE # Require xorg-macros minimum of 1.13 for XORG_ENABLE_UNIT_TESTS m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.13 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.10) +XORG_MACROS_VERSION(1.13) XORG_DEFAULT_OPTIONS XORG_WITH_DOXYGEN(1.6.1) XORG_CHECK_SGML_DOCTOOLS(1.5) @@ -44,7 +44,6 @@ XORG_ENABLE_DEVEL_DOCS XORG_WITH_XMLTO(0.0.20) XORG_WITH_FOP XORG_ENABLE_UNIT_TESTS -XORG_WITH_GLIB XORG_LD_WRAP m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install fontutil 1.1 or later before running autoconf/autogen])]) @@ -791,7 +790,6 @@ LIBXFONT="xfont >= 1.4.2" LIBXI="xi >= 1.2.99.1" LIBXTST="xtst >= 1.0.99.2" LIBPCIACCESS="pciaccess >= 0.8.0" -LIBGLIB="glib-2.0 >= 2.16" LIBUDEV="libudev >= 143" LIBSELINUX="libselinux >= 2.0.86" LIBDBUS="dbus-1 >= 1.0" |