diff options
| author | Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> | 2014-07-28 15:21:21 +0300 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-07-29 16:48:32 +0200 |
| commit | 7a719ffa79161694a354c8d18a28d33377d87db8 (patch) | |
| tree | bc223b2aa66c8bd621524767cb1c272408a57a1c | |
| parent | a81e80c817808f4bb41d5219b04dbf73c943821e (diff) | |
| download | sssd-7a719ffa79161694a354c8d18a28d33377d87db8.tar.gz sssd-7a719ffa79161694a354c8d18a28d33377d87db8.tar.xz sssd-7a719ffa79161694a354c8d18a28d33377d87db8.zip | |
build: Move libini_config 1.1.0 check to libini_config.m4
Move the check for libini_config >= 1.1.0 from samba.m4 to
libini_config.m4 to have them all in one place, simplifying maintenance.
Set boolean variables for every detected version and use one of them in
samba.m4 instead.
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
| -rw-r--r-- | src/external/libini_config.m4 | 13 | ||||
| -rw-r--r-- | src/external/samba.m4 | 5 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/external/libini_config.m4 b/src/external/libini_config.m4 index f8c422f38..9e5c69fbd 100644 --- a/src/external/libini_config.m4 +++ b/src/external/libini_config.m4 @@ -3,13 +3,26 @@ PKG_CHECK_MODULES(INI_CONFIG_V0, [ INI_CONFIG_CFLAGS="$INI_CONFIG_V0_CFLAGS" INI_CONFIG_LIBS="$INI_CONFIG_V0_LIBS" + HAVE_LIBINI_CONFIG_V0=1 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_V1_CFLAGS" INI_CONFIG_LIBS="$INI_CONFIG_V1_LIBS" + HAVE_LIBINI_CONFIG_V1=1 AC_DEFINE_UNQUOTED(HAVE_LIBINI_CONFIG_V1, 1, [libini_config version 1.0.0 or greater]) + PKG_CHECK_MODULES(INI_CONFIG_V1_1, [ + ini_config >= 1.1.0], [ + + INI_CONFIG_CFLAGS="$INI_CONFIG_V1_1_CFLAGS" + INI_CONFIG_LIBS="$INI_CONFIG_V1_1_LIBS" + HAVE_LIBINI_CONFIG_V1_1=1 + AC_DEFINE_UNQUOTED(HAVE_LIBINI_CONFIG_V1_1, 1, [libini_config version 1.1.0 or greater]) + ], [ + AC_MSG_WARN([libini_config-devel >= 1.1.0 not available, using older version]) + ] + ) ], [ AC_MSG_WARN([libini_config-devel >= 1.0.0 not available, using older version]) ] diff --git a/src/external/samba.m4 b/src/external/samba.m4 index e896739fe..10a553b83 100644 --- a/src/external/samba.m4 +++ b/src/external/samba.m4 @@ -20,12 +20,13 @@ without them. In this case, you will need to execute configure script with argument --without-samba ]])) - PKG_CHECK_MODULES(INI_CONFIG_V1_1, ini_config >= 1.1.0, , + if test x"$HAVE_LIBINI_CONFIG_V1_1" != x1; then AC_MSG_ERROR([[Please install libini_config development libraries v1.1.0, or newer. libini_config libraries are necessary for building ipa provider, as well as for building gpo-based access control in ad provider. If you do not want to build these providers it is possible to build SSSD without them. In this case, you will need to execute configure script with argument --without-samba - ]])) + ]]) + fi fi |