summaryrefslogtreecommitdiffstats
path: root/proxy
diff options
context:
space:
mode:
authorRobbie Harwood <rharwood@redhat.com>2015-09-04 15:41:38 -0400
committerSimo Sorce <simo@redhat.com>2015-09-04 15:54:21 -0400
commit2e33b23f0e3f887ced95ac62abf0bda7820e9f5e (patch)
treeb87c23ec7d22bb1bf364d54f1d6b337762d0ae7f /proxy
parente4a9474fa2cb246e0bdc0584e923aa1bb13051e6 (diff)
downloadgss-proxy-2e33b23f0e3f887ced95ac62abf0bda7820e9f5e.tar.gz
gss-proxy-2e33b23f0e3f887ced95ac62abf0bda7820e9f5e.tar.xz
gss-proxy-2e33b23f0e3f887ced95ac62abf0bda7820e9f5e.zip
Ensure ini_config >= 1.2.0 for `ini_config_augment()`
Signed-off-by: Robbie Harwood <rharwood@redhat.com> Reviewed-by: Simo Sorce <simo@redhat.com>
Diffstat (limited to 'proxy')
-rw-r--r--proxy/configure.ac5
-rw-r--r--proxy/contrib/gssproxy.spec.in4
2 files changed, 6 insertions, 3 deletions
diff --git a/proxy/configure.ac b/proxy/configure.ac
index c0bc9b0..3cd885d 100644
--- a/proxy/configure.ac
+++ b/proxy/configure.ac
@@ -83,7 +83,7 @@ if test x$have_libverto = x; then
fi
#Check for libini_config
-PKG_CHECK_MODULES([LIBINI_CONFIG], [ini_config >= 1.0.0], [have_libini_config=1], [have_libini_config=])
+PKG_CHECK_MODULES([LIBINI_CONFIG], [ini_config >= 1.2.0], [have_libini_config=1], [have_libini_config=])
if test x$have_libini_config = x; then
AC_MSG_WARN([Could not find LIBINI_CONFIG headers])
else
@@ -92,6 +92,9 @@ else
AC_CHECK_LIB(ini_config, ini_config_file_open, [],
[AC_MSG_WARN([ini_config library must support ini_config_file_open])],
[$INI_CONFIG_LIBS])
+ AC_CHECK_LIB(ini_config, ini_config_augment, [],
+ [AC_MSG_WARN([ini_config library must support ini_config_augment])],
+ [$INI_CONFIG_LIBS])
fi
if test x$have_libini_config = x1; then
diff --git a/proxy/contrib/gssproxy.spec.in b/proxy/contrib/gssproxy.spec.in
index 25ceccf..22776d9 100644
--- a/proxy/contrib/gssproxy.spec.in
+++ b/proxy/contrib/gssproxy.spec.in
@@ -20,7 +20,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: krb5-libs >= 1.11.5
Requires: keyutils-libs
Requires: libverto-tevent
-Requires: libini_config >= 1.0.0.1
+Requires: libini_config >= 1.2.0
Requires(post): systemd-units
Requires(preun): systemd-units
@@ -41,7 +41,7 @@ BuildRequires: pkgconfig
BuildRequires: krb5-devel >= 1.11.5
BuildRequires: libselinux-devel
BuildRequires: keyutils-libs-devel
-BuildRequires: libini_config-devel >= 1.0.0.1
+BuildRequires: libini_config-devel >= 1.2.0
BuildRequires: libverto-devel
BuildRequires: popt-devel
BuildRequires: findutils