Bump requirements, add dependency for gdk-x11-2.0

3 files changed, 12 insertions, 6 deletions

diff --git a/autogen.sh b/autogen.sh
index ec417db..70ae25d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=.
 
 PKG_NAME="python-xklavier"
 REQUIRED_AUTOCONF_VERSION=2.59
-REQUIRED_AUTOMAKE_VERSION=1.9.2
+REQUIRED_AUTOMAKE_VERSION=1.7
 
 ACLOCAL_FLAGS="-I `pwd`/m4 $ACLOCAL_FLAGS"
 REQUIRED_MACROS="python.m4"
diff --git a/configure.ac b/configure.ac
index 857ea78..eaef9d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,12 @@
 dnl ******************
 dnl * Versions
 dnl ******************
-m4_define(xklavier_major_version, 3)
-m4_define(xklavier_minor_version, 9)
+m4_define(xklavier_major_version, 4)
+m4_define(xklavier_minor_version, 0)
 m4_define(xklavier_version, xklavier_major_version.xklavier_minor_version)
 
 m4_define(pygobject_required_version, 2.6.2)
-
+m4 define(gdk_x11_required_version, 2.2.0)
 dnl ******************
 dnl * Init Stuff
 dnl ******************
@@ -52,6 +52,12 @@ PKG_CHECK_MODULES(LIBXKLAVIER, libxklavier >= xklavier_version)
 AC_SUBST(LIBXKLAVIER_CFLAGS)
 AC_SUBST(LIBXKLAVIER_LIBS)
 
+dnl ******************
+dnl * Check for gdk-x11-2.0
+dnl ******************
+PKG_CHECK_MODULES(GDK_X11, gdk-x11-2.0 >= gdk_x11_required_version)
+AC_SUBST(GDK_X11_CFLAGS)
+AC_SUBST(GDK_X11_LIBS)
 
 dnl ******************
 dnl * Init Stuff
diff --git a/xklavier/Makefile.am b/xklavier/Makefile.am
index b261f30..52365d9 100644
--- a/xklavier/Makefile.am
+++ b/xklavier/Makefile.am
@@ -4,9 +4,9 @@ pkgpythondir = $(pyexecdir)
 pkgpyexecdir = $(pyexecdir)
 
 pkgpyexec_LTLIBRARIES = xklavier.la
-xklavier_la_CFLAGS = $(LIBXKLAVIER_CFLAGS)
+xklavier_la_CFLAGS = $(LIBXKLAVIER_CFLAGS) $(GDK_X11_CFLAGS)
 xklavier_la_LDFLAGS = -module -avoid-version -export-symbols-regex initxklavier
-xklavier_la_LIBADD = $(LIBXKLAVIER_LIBS)
+xklavier_la_LIBADD = $(LIBXKLAVIER_LIBS) $(GDK_X11_LIBS)
 xklavier_la_SOURCES = xklaviermodule.c 
 
 nodist_xklavier_la_SOURCES = xklavier.c