--- configure.ac 2005-12-21 03:29:49.000000000 +0100 +++ xdpyinfo-configure.ac 2006-05-24 18:58:03.646296000 +0200 @@ -57,13 +57,20 @@ AC_CHECK_HEADERS([X11/extensions/xf86vmode.h X11/extensions/xf86vmstr.h],,,[#include ]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -PKG_CHECK_MODULES(DPY_XF86DGA, xxf86dga, - [SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $DPY_XF86DGA_CFLAGS $DPY_X11_CFLAGS" - AC_CHECK_HEADERS([X11/extensions/xf86dga.h X11/extensions/xf86dgastr.h],,, - [#include +AC_ARG_WITH(dga, AC_HELP_STRING([--without-dga],[Disable dga support.]), + [USE_DGA="$withval"], [USE_DGA="yes"]) +if test "x$USE_DGA" != "xno" ; then + PKG_CHECK_MODULES(DPY_XF86DGA, xxf86dga, + [SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_XF86DGA_CFLAGS $DPY_X11_CFLAGS" + AC_CHECK_HEADERS([X11/extensions/xf86dga.h X11/extensions/xf86dgastr.h],,, + [#include #include ]) - CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) +else + echo "without dga" +fi + PKG_CHECK_MODULES(DPY_XF86MISC, xxf86misc, [SAVE_CPPFLAGS="$CPPFLAGS" @@ -85,17 +92,29 @@ AC_CHECK_HEADERS([X11/extensions/Xrender.h],,,[#include ]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -PKG_CHECK_MODULES(DPY_XINERAMA, xinerama, - [SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $DPY_XINERAMA_CFLAGS $DPY_X11_CFLAGS" - AC_CHECK_HEADERS([X11/extensions/Xinerama.h],,,[#include ]) - CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) - -PKG_CHECK_MODULES(DPY_DMX, dmx, - [SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $DPY_DMX_CFLAGS $DPY_X11_CFLAGS" - AC_CHECK_HEADERS([X11/extensions/dmxext.h],,,[#include ]) - CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) +AC_ARG_WITH(xinerama, AC_HELP_STRING([--without-xinerama],[Disable xinerama support.]), + [USE_XINERAMA="$withval"], [USE_XINERAMA="yes"]) +if test "x$USE_XINERAMA" != "xno" ; then + PKG_CHECK_MODULES(DPY_XINERAMA, xinerama, + [SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_XINERAMA_CFLAGS $DPY_X11_CFLAGS" + AC_CHECK_HEADERS([X11/extensions/Xinerama.h],,,[#include ]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) +else + echo "without xinerama" +fi + +AC_ARG_WITH(dmx, AC_HELP_STRING([--without-dmx],[Disable dmx support.]), + [USE_DMX="$withval"], [USE_DMX="yes"]) +if test "x$USE_DMX" != "xno" ; then + PKG_CHECK_MODULES(DPY_DMX, dmx, + [SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_DMX_CFLAGS $DPY_X11_CFLAGS" + AC_CHECK_HEADERS([X11/extensions/dmxext.h],,,[#include ]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) +else + echo "without dmx" +fi PKG_CHECK_MODULES(DPY_XPRINT, xp, [SAVE_CPPFLAGS="$CPPFLAGS"