summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/external/libini_config.m48
-rw-r--r--src/external/samba.m42
2 files changed, 7 insertions, 3 deletions
diff --git a/src/external/libini_config.m4 b/src/external/libini_config.m4
index b9fefcc3..13be9c2f 100644
--- a/src/external/libini_config.m4
+++ b/src/external/libini_config.m4
@@ -1,12 +1,16 @@
-PKG_CHECK_MODULES(INI_CONFIG, [
+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"
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, [
+ 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 lesser than 1.0.0])
], [
AC_MSG_ERROR([Please install libini_config-devel])
diff --git a/src/external/samba.m4 b/src/external/samba.m4
index 62a9fa3f..e896739f 100644
--- a/src/external/samba.m4
+++ b/src/external/samba.m4
@@ -20,7 +20,7 @@ without them. In this case, you will need to execute configure script
with argument --without-samba
]]))
- PKG_CHECK_MODULES(INI_CONFIG, ini_config >= 1.1.0, ,
+ PKG_CHECK_MODULES(INI_CONFIG_V1_1, ini_config >= 1.1.0, ,
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