Merge.
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Oct 10 17:24:36 2009 +0200 (2009-10-10)
changeset 157875d34a94e4b1
parent 1577 c774b2cc7863
parent 1571 2f44fac6b514
child 1580 2b43f4952b53
Merge.
configure
     1.1 --- a/configure	Sat Oct 10 17:19:51 2009 +0200
     1.2 +++ b/configure	Sat Oct 10 17:24:36 2009 +0200
     1.3 @@ -121,6 +121,7 @@
     1.4                      eval val="\${${var}}"
     1.5                      if [ -n "${val}" ]; then
     1.6                          printf "${val} (cached)\n"
     1.7 +                        add_to_var_list "${var}"
     1.8                          return 0
     1.9                      fi
    1.10                  fi
    1.11 @@ -129,7 +130,10 @@
    1.12                      printf "no\n"
    1.13                      continue
    1.14                  elif [ -n "${ver}" ]; then
    1.15 -                    str=$( "${where}" --version 2>&1 |grep -E "${ver}" |head -n 1 )
    1.16 +                    str=$( LC_ALL=C "${where}" --version 2>&1   \
    1.17 +                           |grep -E "${ver}"                    \
    1.18 +                           |head -n 1
    1.19 +                         )
    1.20                      if [ -z "${str}" ]; then
    1.21                          printf "no\n"
    1.22                          unset where