diff options
| -rw-r--r-- | Makefile.am | 40 | ||||
| -rw-r--r-- | configure.ac | 40 |
2 files changed, 40 insertions, 40 deletions
diff --git a/Makefile.am b/Makefile.am index aad80af..933d223 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,29 +23,29 @@ bin_PROGRAMS = xdpyinfo AM_CFLAGS = \ $(XDPYINFO_CFLAGS) \ - $(XEXT_CFLAGS) \ - $(XKB_CFLAGS) \ - $(XF86VIDMODE_CFLAGS) \ - $(XF86DGA_CFLAGS) \ - $(XF86MISC_CFLAGS) \ - $(XINPUT_CFLAGS) \ - $(XRENDER_CFLAGS) \ - $(XINERAMA_CFLAGS) \ - $(DMX_CFLAGS) \ - $(XPRINT_CFLAGS) + $(DPY_XEXT_CFLAGS) \ + $(DPY_XKB_CFLAGS) \ + $(DPY_XF86VIDMODE_CFLAGS) \ + $(DPY_XF86DGA_CFLAGS) \ + $(DPY_XF86MISC_CFLAGS) \ + $(DPY_XINPUT_CFLAGS) \ + $(DPY_XRENDER_CFLAGS) \ + $(DPY_XINERAMA_CFLAGS) \ + $(DPY_DMX_CFLAGS) \ + $(DPY_XPRINT_CFLAGS) xdpyinfo_LDADD = \ $(XDPYINFO_LIBS) \ - $(XEXT_LIBS) \ - $(XKB_LIBS) \ - $(XF86VIDMODE_LIBS) \ - $(XF86DGA_LIBS) \ - $(XF86MISC_LIBS) \ - $(XINPUT_LIBS) \ - $(XRENDER_LIBS) \ - $(XINERAMA_LIBS) \ - $(DMX_LIBS) \ - $(XPRINT_LIBS) + $(DPY_XEXT_LIBS) \ + $(DPY_XKB_LIBS) \ + $(DPY_XF86VIDMODE_LIBS) \ + $(DPY_XF86DGA_LIBS) \ + $(DPY_XF86MISC_LIBS) \ + $(DPY_XINPUT_LIBS) \ + $(DPY_XRENDER_LIBS) \ + $(DPY_XINERAMA_LIBS) \ + $(DPY_DMX_LIBS) \ + $(DPY_XPRINT_LIBS) xdpyinfo_SOURCES = \ xdpyinfo.c diff --git a/configure.ac b/configure.ac index 4fb7b16..2eadb64 100644 --- a/configure.ac +++ b/configure.ac @@ -36,67 +36,67 @@ PKG_CHECK_MODULES(XDPYINFO, xext x11 xtst) AC_SUBST(XDPYINFO_CFLAGS) AC_SUBST(XDPYINFO_LIBS) -PKG_CHECK_MODULES(XEXT, xextproto xext, +PKG_CHECK_MODULES(DPY_XEXT, xextproto xext, [SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $XEXTPROTO_CFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_XEXTPROTO_CFLAGS" AC_CHECK_HEADERS([X11/extensions/multibuf.h X11/extensions/XShm.h],,,[#include <X11/Xlib.h>]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -PKG_CHECK_MODULES(XKB, kbproto x11, +PKG_CHECK_MODULES(DPY_XKB, kbproto x11, [SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $XKB_CFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_XKB_CFLAGS" AC_CHECK_HEADERS([X11/extensions/XKB.h X11/XKBlib.h],,,[#include <X11/Xlib.h>]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -PKG_CHECK_MODULES(XF86VIDMODE, xf86vidmodeproto xxf86vm, +PKG_CHECK_MODULES(DPY_XF86VIDMODE, xf86vidmodeproto xxf86vm, [SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $XF86VIDMODE_CFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_XF86VIDMODE_CFLAGS" AC_CHECK_HEADERS([X11/extensions/xf86vmode.h X11/extensions/xf86vmstr.h],,,[#include <X11/Xlib.h>]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -PKG_CHECK_MODULES(XF86DGA, xf86dgaproto xxf86dga, +PKG_CHECK_MODULES(DPY_XF86DGA, xf86dgaproto xxf86dga, [SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $XF86DGA_CFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_XF86DGA_CFLAGS" AC_CHECK_HEADERS([X11/extensions/xf86dga.h X11/extensions/xf86dgastr.h],,, [#include <X11/Xlib.h> #include <X11/Xproto.h>]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -PKG_CHECK_MODULES(XF86MISC, xf86miscproto xxf86misc, +PKG_CHECK_MODULES(DPY_XF86MISC, xf86miscproto xxf86misc, [SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $XF86MISC_CFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_XF86MISC_CFLAGS" AC_CHECK_HEADERS([X11/extensions/xf86misc.h X11/extensions/xf86mscstr.h],,, [#include <X11/Xlib.h> #include <X11/Xproto.h>]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -PKG_CHECK_MODULES(XINPUT, inputproto xi, +PKG_CHECK_MODULES(DPY_XINPUT, inputproto xi, [SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $XINPUT_CFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_XINPUT_CFLAGS" AC_CHECK_HEADERS([X11/extensions/XInput.h],,,[#include <X11/Xlib.h>]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -PKG_CHECK_MODULES(XRENDER, renderproto xrender, +PKG_CHECK_MODULES(DPY_XRENDER, renderproto xrender, [SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_XRENDER_CFLAGS" AC_CHECK_HEADERS([X11/extensions/Xrender.h],,,[#include <X11/Xlib.h>]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -PKG_CHECK_MODULES(XINERAMA, panoramixproto xinerama, +PKG_CHECK_MODULES(DPY_XINERAMA, panoramixproto xinerama, [SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $XINERAMA_CFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_XINERAMA_CFLAGS" AC_CHECK_HEADERS([X11/extensions/Xinerama.h],,,[#include <X11/Xlib.h>]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -PKG_CHECK_MODULES(DMX, dmxproto dmx, +PKG_CHECK_MODULES(DPY_DMX, dmxproto dmx, [SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $DMX_CFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_DMX_CFLAGS" AC_CHECK_HEADERS([X11/extensions/dmxext.h],,,[#include <X11/Xlib.h>]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -PKG_CHECK_MODULES(XPRINT, printproto xp, +PKG_CHECK_MODULES(DPY_XPRINT, printproto xp, [SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $XPRINT_CFLAGS" + CPPFLAGS="$CPPFLAGS $DPY_XPRINT_CFLAGS" AC_CHECK_HEADERS([X11/extensions/Print.h],,,[#include <X11/Xlib.h>]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) |