configure: Be more explicit about gnome-keyring dependencies

1 files changed, 28 insertions, 20 deletions

diff --git a/configure.ac b/configure.ac
index e4c51e5a..307be08c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,20 @@
 AC_INIT(daemon/gkd-main.c)
-
 AM_INIT_AUTOMAKE(gnome-keyring, 3.10.1)
 
-AC_CONFIG_HEADERS(config.h)
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+dnl ****************************************************************************
+dnl Dependency versions
+
+GLIB_REQ=2.32.0
+GLIB_MIN=GLIB_VERSION_2_32
+GLIB_MAX=GLIB_VERSION_2_38
+
+GCK_REQ=3.3.4
+GCR_REQ=3.5.3
+
+DBUS_REQ=1.1.1
+
+GCRYPT_REQ=1.2.2
+GCRYPT_LIBVER=1
 
 dnl ****************************************************************************
 
@@ -13,6 +24,9 @@ version_bits=`echo $VERSION | tr '.' ' '`
 full_version=`printf %03d%03d%03d $version_bits`
 AC_DEFINE_UNQUOTED(GKR_VERSION, $full_version, [The gnome-keyring version as a number])
 
+AC_CONFIG_HEADERS(config.h)
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
 AM_SANITY_CHECK
 AM_MAINTAINER_MODE([enable])
 
@@ -37,7 +51,9 @@ AC_TYPE_UID_T
 DISTCHECK_CONFIGURE_FLAGS="--enable-doc"
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32.0)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQ)
+GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB_MIN"
+GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=$GLIB_MAX"
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
@@ -45,15 +61,11 @@ PKG_CHECK_MODULES(GMODULE, gmodule-no-export-2.0)
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
-PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.8.0)
-AC_SUBST(GTHREAD_CFLAGS)
-AC_SUBST(GTHREAD_LIBS)
-
-PKG_CHECK_MODULES(GOBJECT, glib-2.0 >= 2.16.0 gobject-2.0 >= 2.8.0)
+PKG_CHECK_MODULES(GOBJECT, glib-2.0 gobject-2.0)
 AC_SUBST(GOBJECT_CFLAGS)
 AC_SUBST(GOBJECT_LIBS)
 
-PKG_CHECK_MODULES(GIO, glib-2.0 >= 2.25.0 gio-2.0)
+PKG_CHECK_MODULES(GIO, glib-2.0 gio-2.0)
 AC_SUBST(GIO_CFLAGS)
 AC_SUBST(GIO_LIBS)
 
@@ -191,9 +203,9 @@ fi
 # --------------------------------------------------------------------
 # GCR and GCK libraries
 
-PKG_CHECK_MODULES(GCK, gck-1 >= 3.3.4)
-PKG_CHECK_MODULES(GCR, gcr-3 >= 3.3.3)
-PKG_CHECK_MODULES(GCR_BASE, gcr-base-3 >= 3.5.3)
+PKG_CHECK_MODULES(GCK, gck-1 >= $GCK_REQ)
+PKG_CHECK_MODULES(GCR, gcr-3 >= $GCR_REQ)
+PKG_CHECK_MODULES(GCR_BASE, gcr-base-3 >= $GCR_REQ)
 
 DAEMON_CFLAGS="$DAEMON_CFLAGS $GCK_CFLAGS $GCR_BASE_CFLAGS"
 DAEMON_LIBS="$DAEMON_LIBS $GCK_LIBS $GCR_BASE_LIBS"
@@ -209,8 +221,7 @@ AC_SUBST(GCR_BASE_LIBS)
 # DBus Checks
 #
 
-DBUS_REQUIRED=1.0
-PKG_CHECK_MODULES([DBUS], dbus-1 >= 1.1.1)
+PKG_CHECK_MODULES([DBUS], dbus-1 >= $DBUS_REQ)
 
 DAEMON_CFLAGS="$DAEMON_CFLAGS $DBUS_CFLAGS"
 DAEMON_LIBS="$DAEMON_LIBS $DBUS_LIBS"
@@ -351,10 +362,7 @@ AM_CONDITIONAL(WITH_GPG, test "$enable_gpg_agent" != "no")
 # libgcrypt
 #
 
-GCRYPT_VERSION=1.2.2
-GCRYPT_LIBVER=1
-
-AM_PATH_LIBGCRYPT($GCRYPT_LIBVER:$GCRYPT_VERSION,,
+AM_PATH_LIBGCRYPT($GCRYPT_LIBVER:$GCRYPT_REQ,,
 	AC_MSG_ERROR([[
 ***
 *** libgcrypt was not found. You may want to get it from
@@ -362,7 +370,7 @@ AM_PATH_LIBGCRYPT($GCRYPT_LIBVER:$GCRYPT_VERSION,,
 ***
 ]]))
 libgcrypt=yes
-AC_DEFINE_UNQUOTED(LIBGCRYPT_VERSION, "$GCRYPT_VERSION", [Version of GCRYPT we expect])
+AC_DEFINE_UNQUOTED(LIBGCRYPT_VERSION, "$GCRYPT_REQ", [Version of GCRYPT we expect])
 
 DAEMON_CFLAGS="$DAEMON_CFLAGS $LIBGCRYPT_CFLAGS"
 DAEMON_LIBS="$DAEMON_LIBS $LIBGCRYPT_LIBS"