From 7de6e3534fd61c7619ed34a6b1afe7230b5e6504 Mon Sep 17 00:00:00 2001 From: Ondrej Kos Date: Thu, 28 Mar 2013 15:35:03 +0100 Subject: 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. --- src/external/libini_config.m4 | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'src/external/libini_config.m4') diff --git a/src/external/libini_config.m4 b/src/external/libini_config.m4 index f41f31917..93a4bd94a 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") - ) - -- cgit