summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Spacek <pspacek@redhat.com>2016-10-14 12:09:17 +0200
committerDavid Kupka <dkupka@redhat.com>2016-10-24 13:30:12 +0200
commit8acb1f37f581e92a56951c069c990c77e83f3c42 (patch)
tree0353c0d268efed63450f0b939508fda208d0be61
parent1e0143c159134337a00a91d4ae64e614f72da62e (diff)
downloadfreeipa-8acb1f37f581e92a56951c069c990c77e83f3c42.tar.gz
freeipa-8acb1f37f581e92a56951c069c990c77e83f3c42.tar.xz
freeipa-8acb1f37f581e92a56951c069c990c77e83f3c42.zip
Build: cleanup INI library detection
Explicit check for symbols is unncecessary because libini_config >= 1.2.0 contains all the symbols we need. https://fedorahosted.org/freeipa/ticket/6418 Reviewed-By: Lukas Slebodnik <lslebodn@redhat.com> Reviewed-By: Stanislav Laznicka <slaznick@redhat.com> Reviewed-By: Christian Heimes <cheimes@redhat.com>
-rw-r--r--configure.ac24
1 files changed, 1 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac
index 487c6f5c5..55c8e4e5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,29 +244,7 @@ AC_SUBST(LIBINTL_LIBS)
dnl ---------------------------------------------------------------------------
dnl - Check for libini_config
dnl ---------------------------------------------------------------------------
-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
- INI_CONFIG_CFLAGS="`$PKG_CONFIG --cflags ini_config`"
- INI_CONFIG_LIBS="`$PKG_CONFIG --libs ini_config`"
- 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
- INI_CFLAGS="$INI_CONFIG_CFLAGS"
- INI_LIBS="$INI_CONFIG_LIBS"
-else
- AC_MSG_ERROR([ini_config development packages not available])
-fi
-
-AC_SUBST(INI_LIBS)
-AC_SUBST(INI_CFLAGS)
+PKG_CHECK_MODULES([INI], [ini_config >= 1.2.0], [], [AC_MSG_ERROR([ini_config >= 1.2.0 not found])])
dnl ---------------------------------------------------------------------------
dnl - Check for systemd unit directory