From 3b917f1d971d034cc758ceb5e215edb59afd9105 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 22 Feb 2012 15:48:37 -0500 Subject: 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. --- src/conf_macros.m4 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/conf_macros.m4') 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], -- cgit