And cleanup how we list our version dependencies, required and optional
[libsecret])
dnl ****************************************************************************
[libsecret])
dnl ****************************************************************************
+dnl Dependency versions
+
+# Required
+
+GLIB_REQ=2.38.0
+GLIB_MIN=GLIB_VERSION_2_38
+GLIB_MAX=GLIB_VERSION_2_38
+
+INTLTOOL_REQ=0.35.0
+
+# Optional
+
+VALA_WANT=0.17.2.12
+
+GCRYPT_WANT=1.2.2
+
+GTKDOC_WANT=1.9
+
+GIR_WANT=1.29
+
+dnl ****************************************************************************
dnl Library package and libtool versioning
dnl
dnl Updating the libtool versions, follow these instructions sequentially:
dnl Library package and libtool versioning
dnl
dnl Updating the libtool versions, follow these instructions sequentially:
AC_PROG_LN_S
AC_PROG_MAKE_SET
AM_PROG_LIBTOOL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AM_PROG_LIBTOOL
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL($INTLTOOL_REQ)
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
GETTEXT_PACKAGE=libsecret
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
GETTEXT_PACKAGE=libsecret
# GLib
PKG_CHECK_MODULES(GLIB,
# GLib
PKG_CHECK_MODULES(GLIB,
- glib-2.0 >= 2.32.0
- gio-2.0 >= 2.32.0
+ glib-2.0 >= $GLIB_REQ
+ gio-2.0
-LIBS="$LIBS $GLIB_LIBS"
-CFLAGS="$CFLAGS $GLIB_CFLAGS"
+LIBS="$LIBS $GLIB_LIBS -DGLIB_VERSION_MIN_REQUIRED=$GLIB_MIN"
+CFLAGS="$CFLAGS $GLIB_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=$GLIB_MAX"
+GTK_DOC_CHECK($GTKDOC_WANT)
-GOBJECT_INTROSPECTION_CHECK([1.29])
+GOBJECT_INTROSPECTION_CHECK($GIR_WANT)
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
# --------------------------------------------------------------------
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
# --------------------------------------------------------------------
# --------------------------------------------------------------------
# Vala
# --------------------------------------------------------------------
# Vala
-VALA_REQUIRED=0.17.2.12
-
-VAPIGEN_CHECK($VALA_REQUIRED)
+VAPIGEN_CHECK($VALA_WANT)
if test "$enable_vala" != "no"; then
AC_PATH_PROG([VALAC], [valac], [])
if test "$enable_vala" != "no"; then
AC_PATH_PROG([VALAC], [valac], [])
# --------------------------------------------------------------------
# libgcrypt
# --------------------------------------------------------------------
# libgcrypt
GCRYPT_LIBVER=1
AC_ARG_ENABLE(gcrypt,
GCRYPT_LIBVER=1
AC_ARG_ENABLE(gcrypt,
have_gcrypt="no"
m4_ifdef([AM_PATH_LIBGCRYPT],
have_gcrypt="no"
m4_ifdef([AM_PATH_LIBGCRYPT],
- [AM_PATH_LIBGCRYPT($GCRYPT_LIBVER:$GCRYPT_VERSION, have_gcrypt=yes)])
+ [AM_PATH_LIBGCRYPT($GCRYPT_LIBVER:$GCRYPT_WANT, have_gcrypt=yes)])
if test $have_gcrypt != "yes"; then
AC_MSG_ERROR([[
if test $have_gcrypt != "yes"; then
AC_MSG_ERROR([[
fi
AC_DEFINE(WITH_GCRYPT, 1, [Build with libgcypt and transport encryption])
fi
AC_DEFINE(WITH_GCRYPT, 1, [Build with libgcypt and transport encryption])
- AC_DEFINE_UNQUOTED(LIBGCRYPT_VERSION, "$GCRYPT_VERSION",
+ AC_DEFINE_UNQUOTED(LIBGCRYPT_VERSION, "$GCRYPT_WANT",
[Version of GCRYPT we expect])
AC_SUBST([LIBGCRYPT_CFLAGS])
AC_SUBST([LIBGCRYPT_LIBS])
[Version of GCRYPT we expect])
AC_SUBST([LIBGCRYPT_CFLAGS])
AC_SUBST([LIBGCRYPT_LIBS])
- gcrypt_status=$GCRYPT_VERSION
enable_gcrypt="yes"
else
gcrypt_status="no"
enable_gcrypt="yes"
else
gcrypt_status="no"