From 2afe3723775fdbd07c1fa77b25081dfb91c78b58 Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sun, 9 Nov 2008 10:22:34 -0500 Subject: [PATCH] Show feature status before configure exits. --- configure.ac | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 89e7a0e4..10a5d8f6 100644 --- a/configure.ac +++ b/configure.ac @@ -141,8 +141,8 @@ AC_DEFINE_UNQUOTED(PINENTRY_PATH, ["$pinentry"], [Default location of the pinent # Password quality checking. AC_ARG_ENABLE(quality, AC_HELP_STRING([--enable-quality], [Enable password quality checking with cracklib.]), - CRACKLIB=$enableval, CRACKLIB=no) -if test "x$CRACKLIB" = "xyes"; then + USE_CRACKLIB=$enableval, USE_CRACKLIB=no) +if test "x$USE_CRACKLIB" = "xyes"; then if test "x$USE_PINENTRY" != "xyes"; then AC_MSG_ERROR([--enable-quality needs --enable-pinentry]) fi @@ -151,7 +151,7 @@ if test "x$CRACKLIB" = "xyes"; then AC_CHECK_LIB([crack], FascistCheck,, AC_MSG_ERROR([Missing or invalid cracklib installation.])) AC_DEFINE(WITH_QUALITY, 1, [Define if you want password quality checking.]) fi -AM_CONDITIONAL(WITH_QUALITY, [test "x$CRACKLIB" = "xyes"]) +AM_CONDITIONAL(WITH_QUALITY, [test "x$USE_CRACKLIB" = "xyes"]) crackdict="/var/cache/cracklib/cracklib_dict" AC_ARG_WITH(crackdict, AC_HELP_STRING([--with-crack-dict=PATH], @@ -162,3 +162,11 @@ AC_DEFINE_UNQUOTED(CRACKLIB_DICT, ["$crackdict"], [The location of the cracklib AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile doc/pwmd.1 po/Makefile.in]) AC_OUTPUT +echo +echo "Features:" +echo " Debug: ${ac_cv_sys_debug}" +echo " Memory debug: ${ac_cv_sys_mem_debug}" +echo " Pinentry: $USE_PINENTRY" +echo " Pinentry location: $pinentry" +echo " Cracklib: $USE_CRACKLIB" +echo " Cracklib dictionary: $crackdict" -- 2.11.4.GIT