Update demos to find DPMS, RENDER, and RANDR using pkg-config.

diff --git a/Makefile.am b/Makefile.am
index 321124b..67b6a44 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,21 +11,23 @@ LDADD = $(XCB_LIBS)
 bin_PROGRAMS = hypnomoire xdpyinfo xcb-test dpms rendertest xcbrandr
 
 hypnomoire_CFLAGS = $(XCBAUX_CFLAGS)
 bin_PROGRAMS = hypnomoire xdpyinfo xcb-test dpms rendertest xcbrandr
 
 hypnomoire_CFLAGS = $(XCBAUX_CFLAGS)

-hypnomoire_LDADD = $(LDADD) $(XCBAUX_LIBS) -lm -lpthread
+hypnomoire_LDADD = $(XCBAUX_LIBS) -lm -lpthread

 hypnomoire_SOURCES = hypnomoire.c reply_formats.c
 
 xdpyinfo_SOURCES = xdpyinfo.c
 
 xcb_test_CFLAGS = $(XCBAUX_CFLAGS)
 hypnomoire_SOURCES = hypnomoire.c reply_formats.c
 
 xdpyinfo_SOURCES = xdpyinfo.c
 
 xcb_test_CFLAGS = $(XCBAUX_CFLAGS)

-xcb_test_LDADD = $(LDADD) $(XCBAUX_LIBS) -lpthread
+xcb_test_LDADD = $(XCBAUX_LIBS) -lpthread

 xcb_test_SOURCES = main.c reply_formats.c
 
 xcb_test_SOURCES = main.c reply_formats.c
 

+dpms_CFLAGS = $(XCBDPMS_CFLAGS)
+dpms_LDADD = $(XCBDPMS_LIBS)

 dpms_SOURCES = dpms.c
 
 dpms_SOURCES = dpms.c
 

-rendertest_CFLAGS = $(XCBAUX_CFLAGS)
-rendertest_LDADD = $(XCBAUX_LIBS)
+rendertest_CFLAGS = $(XCBAUX_CFLAGS) $(XCBRENDER_CFLAGS)
+rendertest_LDADD = $(XCBAUX_LIBS) $(XCBRENDER_LIBS)

 rendertest_SOURCES = rendertest.c
 
 rendertest_SOURCES = rendertest.c
 

-xcbrandr_CFLAGS = $(XCBAUX_CFLAGS)
-xcbrandr_LDADD = $(XCBAUX_LIBS)
+xcbrandr_CFLAGS = $(XCBAUX_CFLAGS) $(XCBRANDR_CFLAGS)
+xcbrandr_LDADD = $(XCBAUX_LIBS) $(XCBRANDR_LIBS)

 xcbrandr_SOURCES = xcbrandr.c
 xcbrandr_SOURCES = xcbrandr.c

diff --git a/configure.ac b/configure.ac
index 8b512ea..69fbe55 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,5 +14,8 @@ PKG_CHECK_MODULES(XCB, xcb)
 PKG_CHECK_MODULES(XCBAUX, xcb-aux)
 PKG_CHECK_MODULES(XCBIMAGE, xcb-image)
 PKG_CHECK_MODULES(XCBICCCM, xcb-icccm)
 PKG_CHECK_MODULES(XCBAUX, xcb-aux)
 PKG_CHECK_MODULES(XCBIMAGE, xcb-image)
 PKG_CHECK_MODULES(XCBICCCM, xcb-icccm)

+PKG_CHECK_MODULES(XCBDPMS, xcb-dpms)
+PKG_CHECK_MODULES(XCBRENDER, xcb-render)
+PKG_CHECK_MODULES(XCBRANDR, xcb-randr)

 
 AC_OUTPUT([Makefile tests/Makefile])
 
 AC_OUTPUT([Makefile tests/Makefile])