From fc53f0f2985eb4968873c962a2316c06c27bddea Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Wed, 18 Jan 2012 00:03:16 +0200 Subject: [PATCH] build: depend on xproto explicitly Currently it's required by xkbcommon. However, we will need it for other backends as well, even with xkbcommon support disabled. xproto consisted only of static header files. We use the XK_ keysym definitions. It is therefore only required during compilation and we shouldn't needlessly duplicate it ourselves. Signed-off-by: Ran Benita --- Makefile.am | 2 ++ README | 1 + configure.ac | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/Makefile.am b/Makefile.am index 74654be..fa4be3a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,6 +56,7 @@ libkmscon_core_la_CPPFLAGS = \ $(PANGO_CFLAGS) \ $(UDEV_CFLAGS) \ $(FREETYPE2_CFLAGS) \ + $(XPROTO_CFLAGS) \ $(XKBCOMMON_CFLAGS) \ $(GLIB_CFLAGS) libkmscon_core_la_LIBADD = \ @@ -66,6 +67,7 @@ libkmscon_core_la_LIBADD = \ $(PANGO_LIBS) \ $(UDEV_LIBS) \ $(FREETYPE2_LIBS) \ + $(XPROTO_LIBS) \ $(XKBCOMMON_LIBS) \ $(GLIB_LIBS) diff --git a/README b/README index 375888f..a6e3919 100644 --- a/README +++ b/README @@ -9,6 +9,7 @@ console. - mesa: providing an OpenGL implementation (must be compiled with EGL, gbm and GL libraries) - udev: providing input device hotplug + - xproto (build time dependency): definition of key symbols - libxkbcommon: keyboard handling - glib: only for Unicode handling - One of: diff --git a/configure.ac b/configure.ac index f9e6e07..3d14c33 100644 --- a/configure.ac +++ b/configure.ac @@ -41,6 +41,10 @@ PKG_CHECK_MODULES([UDEV], [libudev]) AC_SUBST(UDEV_CFLAGS) AC_SUBST(UDEV_LIBS) +PKG_CHECK_MODULES([XPROTO], [xproto]) +AC_SUBST(XPROTO_CFLAGS) +AC_SUBST(XPROTO_LIBS) + PKG_CHECK_MODULES([XKBCOMMON], [xkbcommon], [have_xkbcommon=yes], [have_xkbcommon=no]) AC_SUBST(XKBCOMMON_CFLAGS)