diff options
| author | Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> | 2014-07-28 15:11:20 +0300 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-07-29 16:48:30 +0200 |
| commit | a81e80c817808f4bb41d5219b04dbf73c943821e (patch) | |
| tree | 63dcb7c9d90f291e0fbe953110bb2301d42c45fb /src/external | |
| parent | d9424a4d40f5f77e70c77d39f33ffed87370c21b (diff) | |
| download | sssd-a81e80c817808f4bb41d5219b04dbf73c943821e.tar.gz sssd-a81e80c817808f4bb41d5219b04dbf73c943821e.tar.xz sssd-a81e80c817808f4bb41d5219b04dbf73c943821e.zip | |
build: Reverse order of libini_config checks
Check for lowest versions of libini_config first, instead of the highest ones
in libini_config.m4. Define HAVE_LIBINI_CONFIG_V* for lower versions when
higher versions are present. Simplify preprocessor branching in sss_ini.c
accordingly.
This prepares libini_config.m4 for addition of a check for one more version of
libini_config.
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Diffstat (limited to 'src/external')
| -rw-r--r-- | src/external/libini_config.m4 | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/external/libini_config.m4 b/src/external/libini_config.m4 index 13be9c2f4..f8c422f38 100644 --- a/src/external/libini_config.m4 +++ b/src/external/libini_config.m4 @@ -1,21 +1,21 @@ -PKG_CHECK_MODULES(INI_CONFIG_V1, [ - ini_config >= 1.0.0], [ +PKG_CHECK_MODULES(INI_CONFIG_V0, [ + ini_config >= 0.6.1], [ - INI_CONFIG_CFLAGS="$INI_CONFIG_V1_CFLAGS" - INI_CONFIG_LIBS="$INI_CONFIG_V1_LIBS" - 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_V0, [ - ini_config >= 0.6.1], [ + INI_CONFIG_CFLAGS="$INI_CONFIG_V0_CFLAGS" + INI_CONFIG_LIBS="$INI_CONFIG_V0_LIBS" + AC_DEFINE_UNQUOTED(HAVE_LIBINI_CONFIG_V0, 1, [libini_config version 0.6.1 or greater]) + PKG_CHECK_MODULES(INI_CONFIG_V1, [ + ini_config >= 1.0.0], [ - INI_CONFIG_CFLAGS="$INI_CONFIG_V0_CFLAGS" - INI_CONFIG_LIBS="$INI_CONFIG_V0_LIBS" - AC_DEFINE_UNQUOTED(HAVE_LIBINI_CONFIG_V0, 1, [libini_config version lesser than 1.0.0]) + INI_CONFIG_CFLAGS="$INI_CONFIG_V1_CFLAGS" + INI_CONFIG_LIBS="$INI_CONFIG_V1_LIBS" + AC_DEFINE_UNQUOTED(HAVE_LIBINI_CONFIG_V1, 1, [libini_config version 1.0.0 or greater]) ], [ - AC_MSG_ERROR([Please install libini_config-devel]) + AC_MSG_WARN([libini_config-devel >= 1.0.0 not available, using older version]) ] ) + ], [ + AC_MSG_ERROR([Please install libini_config-devel]) ] ) |