diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2008-11-16 23:57:45 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2008-11-16 23:57:45 +0000 |
| commit | 2c4baea56ff5ba98b195f91b8729a5f33bdfd342 (patch) | |
| tree | ff4bf94f194a2ad7d4cf09710abd2fd0307920c2 | |
| parent | 87f44642772d8827386b60e9fa8ea89c049ecb3a (diff) | |
| download | libxklavier-2c4baea56ff5ba98b195f91b8729a5f33bdfd342.tar.gz | |
updating build process, adding XInput dep
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 29 | ||||
| -rw-r--r-- | libxklavier/Makefile.am | 7 |
3 files changed, 25 insertions, 16 deletions
@@ -1,3 +1,8 @@ +2008-11-16 svu + + * configure.in, libxklavier/Makefile.am: updating the build process, + adding XInput dependency + 2008-09-28 svu * libxklavier/xklavier_config_xkb.c, diff --git a/configure.in b/configure.in index a0f4372..1f4e612 100644 --- a/configure.in +++ b/configure.in @@ -1,27 +1,25 @@ -AC_INIT(libxklavier/xklavier.c) +AC_PREREQ(2.59) + +AC_INIT([libxklavier], [3.7]) +AC_CONFIG_SRCDIR([libxklavier/xklavier.c]) +AM_INIT_AUTOMAKE([1.10 dist-bzip2]) + +AM_CONFIG_HEADER(config.h) +AC_CONFIG_MACRO_DIR(m4) -PACKAGE=libxklavier MAJOR_VERSION=3 MINOR_VERSION=7 -VERSION=$MAJOR_VERSION.$MINOR_VERSION VERSION_INFO=13:0:1 AC_SUBST(MAJOR_VERSION) AC_SUBST(MINOR_VERSION) -AC_SUBST(PACKAGE) -AC_SUBST(VERSION) AC_SUBST(VERSION_INFO) -AM_CONFIG_HEADER(config.h) - -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) - AM_MAINTAINER_MODE AC_PROG_CC AC_ISC_POSIX AC_HEADER_STDC -dnl AC_ARG_PROGRAM AM_PROG_LIBTOOL AM_ICONV @@ -32,9 +30,6 @@ AM_CONDITIONAL(ENABLE_GTK_DOC, false) AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, false) ]) -dnl From Bruno Haible. -dnl From gnoome-vfs - AC_DEFUN([jm_LANGINFO_CODESET], [ AC_CHECK_HEADERS(langinfo.h) @@ -155,6 +150,13 @@ PKG_CHECK_MODULES(GLIB, \ AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_CFLAGS) +PKG_CHECK_MODULES(XINPUT, xi >= 1.1.3, + [AC_DEFINE(HAVE_XINPUT, 1, [Define if xinput dev lib is available]) + have_xinput=yes], [have_xinput=no]) + +AC_SUBST(XINPUT_LIBS) +AC_SUBST(XINPUT_CFLAGS) + AC_SUBST(CFLAGS) AC_SUBST(LDFLAGS) @@ -192,6 +194,7 @@ if test "$enable_xkb_support" == "yes" ; then echo " default ruleset: $xkb_default_ruleset" echo " base: $xkb_base" echo " xkbcomp is used from: $xkb_bin_base" + echo " xinput available: $have_xinput" else echo " XKB, libxkbfile is NOT present" fi diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am index f0a7b39..696f37d 100644 --- a/libxklavier/Makefile.am +++ b/libxklavier/Makefile.am @@ -17,7 +17,8 @@ endif EXTRA_DIST=marshal.list -GLIB_GENMARSHAL = $(shell pkg-config --variable=glib_genmarshal glib-2.0) +# GLIB_GENMARSHAL = $(shell $PKG_CONFIG --variable=glib_genmarshal glib-2.0) +GLIB_GENMARSHAL = `$PKG_CONFIG --variable=glib_genmarshal glib-2.0` xkl_engine_marshal.h: marshal.list $(GLIB_GENMARSHAL) --prefix=xkl_engine marshal.list --header > xkl_engine_marshal.h @@ -27,7 +28,7 @@ xkl_engine_marshal.c: xkl_engine_marshal.h AM_CFLAGS=-Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -I. -I$(includedir) $(X_CFLAGS) -I$(top_srcdir) \ - $(XML_CFLAGS) $(GLIB_CFLAGS) \ + $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) \ $(LIBXKBFILE_PRESENT_CFLAG) \ $(ENABLE_XKB_SUPPORT_CFLAG) \ $(ENABLE_XMODMAP_SUPPORT_CFLAG) @@ -45,7 +46,7 @@ libxklavier_la_SOURCES = xklavier.c xklavier_evt.c xklavier_config.c xklavier_co xklavier_util.c xklavier_props.c xklavier_dump.c xkl_engine_marshal.c \ $(noinst_HEADERS) $(xklavierinc_HEADERS) libxklavier_la_LDFLAGS = -version-info @VERSION_INFO@ \ - $(XML_LIBS) $(GLIB_LIBS) \ + $(XML_LIBS) $(GLIB_LIBS) $(XINPUT_LIBS) \ $(LIBXKBFILE_PRESENT_LDFLAGS) \ $(X_LIBS) $(LIBICONV) |