diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-07-18 08:24:50 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-07-18 08:24:50 +0000 |
| commit | bcc095561f040a8a0cd19ed94bc800d128e9c0b1 (patch) | |
| tree | f1bd95746c8c4be7e30a0722e1da4dbd4cbb4af8 | |
| parent | 3b4cbb4fe34ff4de91ba6524d7750a2b55f5d67a (diff) | |
| download | xdpyinfo-bcc095561f040a8a0cd19ed94bc800d128e9c0b1.tar.gz xdpyinfo-bcc095561f040a8a0cd19ed94bc800d128e9c0b1.tar.bz2 xdpyinfo-bcc095561f040a8a0cd19ed94bc800d128e9c0b1.zip | |
Fail gracefully when extensions not present.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 20 |
2 files changed, 15 insertions, 10 deletions
@@ -1,3 +1,8 @@ +2005-07-18 Daniel Stone <daniel@freedesktop.org> + + * configure.ac: + Actually make extensions optional. + 2005-07-09 Keith Packard <keithp@keithp.com> * .cvsignore: diff --git a/configure.ac b/configure.ac index d379c8f..9409a9c 100644 --- a/configure.ac +++ b/configure.ac @@ -40,19 +40,19 @@ PKG_CHECK_MODULES(XEXT, xextproto xext, [SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XEXTPROTO_CFLAGS" AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include <X11/Xlib.h>]) - CPPFLAGS="$SAVE_CPPFLAGS"]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) PKG_CHECK_MODULES(XKB, kbproto x11, [SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XKB_CFLAGS" AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include <X11/Xlib.h>]) - CPPFLAGS="$SAVE_CPPFLAGS"]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) PKG_CHECK_MODULES(XF86VIDMODE, xf86vidmodeproto xxf86vm, [SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XF86VIDMODE_CFLAGS" AC_CHECK_HEADERS([X11/extensions/xf86vmode.h X11/extensions/xf86vmstr.h],,,[#include <X11/Xlib.h>]) - CPPFLAGS="$SAVE_CPPFLAGS"]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) PKG_CHECK_MODULES(XF86DGA, xf86dgaproto xxf86dga, [SAVE_CPPFLAGS="$CPPFLAGS" @@ -60,7 +60,7 @@ PKG_CHECK_MODULES(XF86DGA, xf86dgaproto xxf86dga, AC_CHECK_HEADERS([X11/extensions/xf86dga.h X11/extensions/xf86dgastr.h],,, [#include <X11/Xlib.h> #include <X11/Xproto.h>]) - CPPFLAGS="$SAVE_CPPFLAGS"]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) PKG_CHECK_MODULES(XF86MISC, xf86miscproto xxf86misc, [SAVE_CPPFLAGS="$CPPFLAGS" @@ -68,36 +68,36 @@ PKG_CHECK_MODULES(XF86MISC, xf86miscproto xxf86misc, AC_CHECK_HEADERS([X11/extensions/xf86misc.h X11/extensions/xf86mscstr.h],,, [#include <X11/Xlib.h> #include <X11/Xproto.h>]) - CPPFLAGS="$SAVE_CPPFLAGS"]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) PKG_CHECK_MODULES(XINPUT, inputproto xi, [SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XINPUT_CFLAGS" AC_CHECK_HEADERS([X11/extensions/XInput.h],,,[#include <X11/Xlib.h>]) - CPPFLAGS="$SAVE_CPPFLAGS"]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) PKG_CHECK_MODULES(XRENDER, renderproto xrender, [SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS" AC_CHECK_HEADERS([X11/extensions/Xrender.h],,,[#include <X11/Xlib.h>]) - CPPFLAGS="$SAVE_CPPFLAGS"]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) PKG_CHECK_MODULES(XINERAMA, panoramixproto xinerama, [SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XINERAMA_CFLAGS" AC_CHECK_HEADERS([X11/extensions/Xinerama.h],,,[#include <X11/Xlib.h>]) - CPPFLAGS="$SAVE_CPPFLAGS"]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) PKG_CHECK_MODULES(DMX, dmxproto dmx, [SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $DMX_CFLAGS" AC_CHECK_HEADERS([X11/extensions/dmxext.h],,,[#include <X11/Xlib.h>]) - CPPFLAGS="$SAVE_CPPFLAGS"]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) PKG_CHECK_MODULES(XPRINT, printproto xp, [SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XPRINT_CFLAGS" AC_CHECK_HEADERS([X11/extensions/Print.h],,,[#include <X11/Xlib.h>]) - CPPFLAGS="$SAVE_CPPFLAGS"]) + CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) AC_OUTPUT([Makefile]) |