From 94314fce7cf1f93fad7f0b872c0623165f6b0fbb Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Thu, 26 May 2011 18:40:53 +0200
Subject: configure: move error message down to has_or_abort

When has_or_warn will come, we do want to print the error message
only in has_or_abort, so move it down there.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff --git a/configure b/configure
index 70263c8..9fff8ea 100755
--- a/configure
+++ b/configure
@@ -97,13 +97,13 @@ add_to_var_list() {
 #     optional, defaults to: '${prog}: none found'
 #       eg: err="'bash' 3.x or above was not found"
 check_for() {
-    local prog inc lib
-    local var ver err
     local val
     local item
     local where
     local status
 
+    # Note: prog/inc/lib and var/ver/err are set here,
+    # but declared by the caller (because it needs it)
     for item in "${@}"; do
         case "${item}" in
             prog=*|inc=*|lib=*|var=*|ver=*|err=*)
@@ -170,13 +170,6 @@ check_for() {
     esac
 
     if [ -z "${status}" ]; then
-        printf "\n${err:-${prog}${inc}${lib}: none found}\n\n"
-        printf "Either you are missing entirely the needed tool,\n"
-        printf "or the version you have is too old.\n"
-        if [ -n "${var}" ]; then
-            printf "You can give the path to this tool using: --with-${var}=PATH\n"
-        fi
-        printf "\n"
         return 1
     fi
 
@@ -191,10 +184,21 @@ check_for() {
 # This function checks for a tool, and aborts if not found
 # See check_for(), above, for how to call has_or_abort
 has_or_abort() {
+    # We declare these 6 variables here, although they are
+    # set in check_for(), called below
+    local prog inc lib
+    local var ver err
+
     if ! check_for "$@"; then
-        # FORCE can be set in the environment
-        [ -z "${FORCE}" ] && do_error "Bailing out..."
+        printf "\n${err:-${prog}${inc}${lib}: none found}\n\n"
+        printf "Either you are missing entirely the needed tool,\n"
+        printf "or the version you have is too old.\n"
+        if [ -n "${var}" ]; then
+            printf "You can give the path to this tool using: --with-${var}=PATH\n"
+        fi
         printf "\n"
+        # Bail out if --force is not specified
+        [ -z "${FORCE}" ] && do_error "Bailing out..."
         printf "<*                                          *>\n"
         printf "<*            FORCE in action:              *>\n"
         printf "<* Continuing despite missing pre-requisite *>\n"
-- 
cgit v0.10.2-6-g49f6