summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2012-02-22 15:48:37 -0500
committerStephen Gallagher <sgallagh@redhat.com>2012-02-27 09:32:00 -0500
commit3b917f1d971d034cc758ceb5e215edb59afd9105 (patch)
tree542acd1141ab40ed64d022e830df23d30a5d4830
parentf3dc9ac52a808fcbedc7fb1ae83964b523c72df2 (diff)
downloadsssd-3b917f1d971d034cc758ceb5e215edb59afd9105.tar.gz
sssd-3b917f1d971d034cc758ceb5e215edb59afd9105.tar.bz2
sssd-3b917f1d971d034cc758ceb5e215edb59afd9105.zip
Eliminate build-time requirement for nscd
We will now use the autodetected location if available, or else fall back to a value provided by --with-nscd in configure and finally resort to a hard-coded default of /usr/sbin/nscd.
-rw-r--r--contrib/sssd.spec.in1
-rw-r--r--src/conf_macros.m415
-rw-r--r--src/external/nscd.m48
3 files changed, 12 insertions, 12 deletions
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index ae01bffe..27a13bb0 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -95,7 +95,6 @@ BuildRequires: libsemanage-devel
BuildRequires: bind-utils
BuildRequires: keyutils-libs-devel
BuildRequires: libnl-devel
-BuildRequires: nscd
BuildRequires: gettext-devel
BuildRequires: pkgconfig
BuildRequires: findutils
diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
index a54dd7f0..145cdd79 100644
--- a/src/conf_macros.m4
+++ b/src/conf_macros.m4
@@ -277,16 +277,17 @@ AC_DEFUN([WITH_TEST_DIR],
AC_DEFUN([WITH_NSCD],
[ AC_ARG_WITH([nscd],
- [AC_HELP_STRING([--with-nscd],
- [Whether to attempt to flush nscd cache after local domain operations [yes]]
+ [AC_HELP_STRING([--with-nscd=PATH],
+ [Path to nscd binary to attempt to flush nscd cache after local domain operations [/usr/sbin/nscd]]
)
- ],
- [],
- with_nscd=yes
+ ]
)
- if test x"$with_nscd" = xyes; then
- AC_DEFINE_UNQUOTED(HAVE_NSCD, 1, [flush nscd cache after local domain operations])
+ NSCD_PATH="/usr/sbin/nscd"
+ if test x"$with_nscd" != x; then
+ NSCD_PATH=$with_nscd
+ AC_SUBST(NSCD_PATH)
fi
+ AC_DEFINE_UNQUOTED(HAVE_NSCD, $NSCD_PATH, [flush nscd cache after local domain operations])
])
AC_DEFUN([WITH_SEMANAGE],
diff --git a/src/external/nscd.m4 b/src/external/nscd.m4
index f9f54c58..d0f12916 100644
--- a/src/external/nscd.m4
+++ b/src/external/nscd.m4
@@ -1,9 +1,9 @@
-AC_PATH_PROG(NSCD, nscd)
+AC_PATH_PROG(NSCD, nscd, $NSCD_PATH)
AC_MSG_CHECKING(for nscd)
+AC_DEFINE_UNQUOTED([NSCD_PATH], "$NSCD", [The path to nscd, if available])
+
if test -x "$NSCD"; then
- AC_DEFINE_UNQUOTED([NSCD_PATH], "$NSCD", [The path to nscd, if available])
AC_MSG_RESULT(yes)
else
- AC_MSG_RESULT(no. Manipulating nscd cache will not be available.)
+ AC_MSG_RESULT([not installed, assuming standard location])
fi
-