summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Reimann <oss@arcor.de>2010-07-13 19:59:23 +0200
committerChristoph Reimann <oss@arcor.de>2010-07-13 19:59:23 +0200
commit80322d11636dd638902660d80481080d2fad40fe (patch)
tree46aafeabf720a8309eed1a66a6702d69fd4a950c
parent8c2707773b3621fb8bbda9021d23944f5be34aab (diff)
xkb: updated configure.ac/Makefile.am
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile.am8
3 files changed, 13 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index ff9dea1..1f88b72 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,6 +58,9 @@ endif
if BUILD_XINPUT
pkgconfig_DATA += xcb-xinput.pc
endif
+if BUILD_XKB
+pkgconfig_DATA += xcb-xkb.pc
+endif
if BUILD_XPRINT
pkgconfig_DATA += xcb-xprint.pc
endif
diff --git a/configure.ac b/configure.ac
index c5f454b..67295f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,6 +146,7 @@ XCB_EXTENSION(XFixes, "yes")
XCB_EXTENSION(XFree86-DRI, "yes")
XCB_EXTENSION(Xinerama, "yes")
XCB_EXTENSION(XInput, "no")
+XCB_EXTENSION(XKB, "no")
XCB_EXTENSION(Xprint, "yes")
XCB_EXTENSION(SELinux, "no")
XCB_EXTENSION(XTest, "yes")
@@ -189,6 +190,7 @@ xcb-xf86dri.pc
xcb-xfixes.pc
xcb-xinerama.pc
xcb-xinput.pc
+xcb-xkb.pc
xcb-xprint.pc
xcb-xselinux.pc
xcb-xtest.pc
diff --git a/src/Makefile.am b/src/Makefile.am
index f0bdeaa..9b90914 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -168,6 +168,14 @@ libxcb_xinput_la_LIBADD = $(XCB_LIBS)
nodist_libxcb_xinput_la_SOURCES = xinput.c xinput.h
endif
+EXTSOURCES += xkb.c
+if BUILD_XKB
+lib_LTLIBRARIES += libxcb-xkb.la
+libxcb_xkb_la_LDFLAGS = -version-info 0:0:0 -no-undefined
+libxcb_xkb_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_xkb_la_SOURCES = xkb.c xkb.h
+endif
+
EXTSOURCES += xprint.c
if BUILD_XPRINT
lib_LTLIBRARIES += libxcb-xprint.la