summaryrefslogtreecommitdiff
path: root/src/external
diff options
context:
space:
mode:
authorOndrej Kos <okos@redhat.com>2013-03-28 15:35:03 +0100
committerJakub Hrozek <jhrozek@redhat.com>2013-04-26 00:26:26 +0200
commit7de6e3534fd61c7619ed34a6b1afe7230b5e6504 (patch)
tree31afcffc00c08d0d3eec7d54a15e55e8d83eed01 /src/external
parent9602c7f43cae0b06c584fe64ced474ee76623d97 (diff)
downloadsssd-7de6e3534fd61c7619ed34a6b1afe7230b5e6504.tar.gz
sssd-7de6e3534fd61c7619ed34a6b1afe7230b5e6504.tar.bz2
sssd-7de6e3534fd61c7619ed34a6b1afe7230b5e6504.zip
DB: Switch to new libini_config API
https://fedorahosted.org/sssd/ticket/1786 Since we need to support the old interface as well, the configure scritp is modified and correct ini interface is chosen.
Diffstat (limited to 'src/external')
-rw-r--r--src/external/libini_config.m424
1 files changed, 17 insertions, 7 deletions
diff --git a/src/external/libini_config.m4 b/src/external/libini_config.m4
index f41f3191..93a4bd94 100644
--- a/src/external/libini_config.m4
+++ b/src/external/libini_config.m4
@@ -1,10 +1,20 @@
+PKG_CHECK_MODULES(INI_CONFIG, [
+ ini_config >= 1.0.0], [
+
+ AC_DEFINE_UNQUOTED(HAVE_LIBINI_CONFIG_V1, 1, [libini_config version greater than 1.0.0])
+ ], [
+ AC_MSG_WARN([libini_config-devel >= 1.0.0 not available, trying older version])
+ PKG_CHECK_MODULES(INI_CONFIG, [
+ ini_config >= 0.6.1], [
+
+ AC_DEFINE_UNQUOTED(HAVE_LIBINI_CONFIG_V0, 1, [libini_config version lesser than 1.0.0])
+ ], [
+ AC_MSG_ERROR([Please install libini_config-devel])
+ ]
+ )
+ ]
+)
+
AC_SUBST(INI_CONFIG_OBJ)
AC_SUBST(INI_CONFIG_CFLAGS)
AC_SUBST(INI_CONFIG_LIBS)
-
-PKG_CHECK_MODULES(INI_CONFIG,
- ini_config >= 0.6.1,
- ,
- AC_MSG_ERROR("Please install libini_config-devel")
- )
-