From 8b70e6bace5bbef8b1f001241fe56998db73fe96 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Sun, 5 Dec 2010 16:29:25 +0200 Subject: [PATCH] * configure.ac: unbreak McCabe tool checking --- configure.ac | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 99107df3..913e7334 100644 --- a/configure.ac +++ b/configure.ac @@ -156,14 +156,20 @@ AS_IF([test "x$have_gtk3" != "xyes"],[ AM_CONDITIONAL(HAVE_GTK, [test "x$have_gtk2" = "xyes" -o "x$have_gtk3" = "xyes"]) -# check for pmccabe -AC_PATH_PROG([PMCCABE],[pmccabe],[yes],[no]) -AS_IF([test "x$PMCCABE" != "xyes"],[ +# check for pmccabe +AC_PATH_PROG([PMCCABE],[pmccabe],[pmccabe],[no]) +AS_IF([test "x$PMCCABE" = "xno"],[ AC_MSG_WARN([ *** Developers: you don't seem to have the 'pmccabe' tool installed. *** Please install it if you want to run the automated code checks]) ]) +if test "x$PMCCABE" = "xno"; then + have_pmccabe="no" +else + have_pmccabe="yes" +fi + AC_CONFIG_FILES([ @@ -190,8 +196,8 @@ fi echo "Xapian version : $xapian_version" echo "Build unit tests (glib >= 2.16) : $have_gtest" -echo "Build UI (requires GTK+) : $have_gtk" -echo "McCabe's Cyclomatic Complexity tool : $PMCCABE" +echo "Build 'mug' (requires GTK+) : $have_gtk" +echo "McCabe's Cyclomatic Complexity tool : $have_pmccabe" echo echo "type 'make' to build mu, or 'make check' to run the unit tests."