diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 29 | ||||
| -rw-r--r-- | configure.ac | 64 |
3 files changed, 98 insertions, 3 deletions
@@ -0,0 +1,8 @@ +2005-07-07 Keith Packard <keithp@keithp.com> + + * Makefile.am: + * configure.ac: + Autodetect extension support. Install manual as xdpyinfo.1 + Note that autodetection requires changes to xdpyinfo.c as well, + which currently lives in the monolithic tree. These changes + don't have any effect on monolithic builds. diff --git a/Makefile.am b/Makefile.am index 1ce83ce..cc6b534 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,12 +21,35 @@ bin_PROGRAMS = xdpyinfo -xdpyinfo_CFLAGS = $(DEP_CFLAGS) -xdpyinfo_LDADD = $(DEP_LIBS) +AM_CFLAGS = \ + $(DEP_CFLAGS) \ + $(XEXT_CFLAGS) \ + $(XKB_CFLAGS) \ + $(XF86VIDMODE_CFLAGS) \ + $(XF86DGA_CFLAGS) \ + $(XF86MISC_CFLAGS) \ + $(XINPUT_CFLAGS) \ + $(XRENDER_CFLAGS) \ + $(XINERAMA_CFLAGS) \ + $(DMX_CFLAGS) \ + $(XPRINT_CFLAGS) + +xdpyinfo_LDADD = \ + $(DEP_LIBS) \ + $(XEXT_LIBS) \ + $(XKB_LIBS) \ + $(XF86VIDMODE_LIBS) \ + $(XF86DGA_LIBS) \ + $(XF86MISC_LIBS) \ + $(XINPUT_LIBS) \ + $(XRENDER_LIBS) \ + $(XINERAMA_LIBS) \ + $(DMX_LIBS) \ + $(XPRINT_LIBS) xdpyinfo_SOURCES = \ xdpyinfo.c -dist_man_MANS = \ +dist_man1_MANS = \ xdpyinfo.man diff --git a/configure.ac b/configure.ac index fbeae38..d379c8f 100644 --- a/configure.ac +++ b/configure.ac @@ -36,4 +36,68 @@ PKG_CHECK_MODULES(DEP, xext x11 xtst) AC_SUBST(DEP_CFLAGS) AC_SUBST(DEP_LIBS) +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"]) + +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"]) + +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"]) + +PKG_CHECK_MODULES(XF86DGA, xf86dgaproto xxf86dga, + [SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $XF86DGA_CFLAGS" + AC_CHECK_HEADERS([X11/extensions/xf86dga.h X11/extensions/xf86dgastr.h],,, + [#include <X11/Xlib.h> +#include <X11/Xproto.h>]) + CPPFLAGS="$SAVE_CPPFLAGS"]) + +PKG_CHECK_MODULES(XF86MISC, xf86miscproto xxf86misc, + [SAVE_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $XF86MISC_CFLAGS" + AC_CHECK_HEADERS([X11/extensions/xf86misc.h X11/extensions/xf86mscstr.h],,, + [#include <X11/Xlib.h> +#include <X11/Xproto.h>]) + CPPFLAGS="$SAVE_CPPFLAGS"]) + +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"]) + +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"]) + +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"]) + +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"]) + +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"]) + AC_OUTPUT([Makefile]) |