[Pkg-haskell-commits] darcs: ghc: Update autoconf patch
Joachim Breitner
mail at joachim-breitner.de
Sat Jul 9 21:52:35 UTC 2011
Sat Jul 9 08:54:18 UTC 2011 Joachim Breitner <mail at joachim-breitner.de>
* Update autoconf patch
Ignore-this: e50318a2af1dd5c704c9ca5245159682
M ./patches/autoconf -566 +2048
Sat Jul 9 08:54:18 UTC 2011 Joachim Breitner <mail at joachim-breitner.de>
* Update autoconf patch
Ignore-this: e50318a2af1dd5c704c9ca5245159682
diff -rN -u old-ghc//patches/autoconf new-ghc//patches/autoconf
--- old-ghc//patches/autoconf 2011-07-09 21:52:34.838246183 +0000
+++ new-ghc//patches/autoconf 2011-07-09 21:52:34.886056896 +0000
@@ -27,15 +27,15 @@
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
-Index: ghc-7.0.3/configure
+Index: ghc-7.0.4/configure
===================================================================
---- ghc-7.0.3.orig/configure 2011-03-26 23:40:47.000000000 +0530
-+++ ghc-7.0.3/configure 2011-04-09 20:27:11.000000000 +0530
+--- ghc-7.0.4.orig/configure 2011-06-13 19:11:04.000000000 +0200
++++ ghc-7.0.4/configure 2011-07-09 10:53:45.000000000 +0200
@@ -1,13 +1,13 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.65 for The Glorious Glasgow Haskell Compilation System 7.0.3.
-+# Generated by GNU Autoconf 2.67 for The Glorious Glasgow Haskell Compilation System 7.0.3.
+-# Generated by GNU Autoconf 2.65 for The Glorious Glasgow Haskell Compilation System 7.0.4.
++# Generated by GNU Autoconf 2.68 for The Glorious Glasgow Haskell Compilation System 7.0.4.
#
# Report bugs to <glasgow-haskell-bugs at haskell.org>.
#
@@ -48,7 +48,35 @@
#
#
# This configure script is free software; the Free Software Foundation
-@@ -319,7 +319,7 @@
+@@ -91,6 +91,7 @@
+ IFS=" "" $as_nl"
+
+ # Find who we are. Look in the path if we contain no directory separator.
++as_myself=
+ case $0 in #((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -216,11 +217,18 @@
+ # We cannot yet assume a decent shell, so we have to provide a
+ # neutralization value for shells without unset; and this also
+ # works around shells that cannot unset nonexistent variables.
++ # Preserve -v and -x to the replacement shell.
+ BASH_ENV=/dev/null
+ ENV=/dev/null
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ export CONFIG_SHELL
+- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++ case $- in # ((((
++ *v*x* | *x*v* ) as_opts=-vx ;;
++ *v* ) as_opts=-v ;;
++ *x* ) as_opts=-x ;;
++ * ) as_opts= ;;
++ esac
++ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ fi
+
+ if test x$as_have_required = xno; then :
+@@ -319,7 +327,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -57,7 +85,7 @@
} # as_fn_mkdir_p
-@@ -359,19 +359,19 @@
+@@ -359,19 +367,19 @@
fi # as_fn_arith
@@ -85,7 +113,7 @@
as_fn_exit $as_status
} # as_fn_error
-@@ -533,7 +533,7 @@
+@@ -533,7 +541,7 @@
exec 6>&1
# Name of the host.
@@ -94,7 +122,7 @@
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-@@ -863,8 +863,9 @@
+@@ -864,8 +872,9 @@
fi
case $ac_option in
@@ -106,7 +134,7 @@
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -909,7 +910,7 @@
+@@ -910,7 +919,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -115,7 +143,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -935,7 +936,7 @@
+@@ -936,7 +945,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -124,7 +152,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1139,7 +1140,7 @@
+@@ -1140,7 +1149,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -133,7 +161,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1155,7 +1156,7 @@
+@@ -1156,7 +1165,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -142,7 +170,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1185,8 +1186,8 @@
+@@ -1186,8 +1195,8 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -153,7 +181,7 @@
;;
*=*)
-@@ -1194,7 +1195,7 @@
+@@ -1195,7 +1204,7 @@
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
@@ -162,7 +190,16 @@
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1212,13 +1213,13 @@
+@@ -1205,7 +1214,7 @@
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+ ;;
+
+ esac
+@@ -1213,13 +1222,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -178,7 +215,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1241,7 +1242,7 @@
+@@ -1242,7 +1251,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -187,7 +224,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1255,8 +1256,8 @@
+@@ -1256,8 +1265,8 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
@@ -198,7 +235,7 @@
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
-@@ -1271,9 +1272,9 @@
+@@ -1272,9 +1281,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -210,7 +247,7 @@
# Find the source files, if location was not specified.
-@@ -1312,11 +1313,11 @@
+@@ -1313,11 +1322,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -224,7 +261,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1356,7 +1357,7 @@
+@@ -1357,7 +1366,7 @@
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
@@ -233,19 +270,28 @@
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
-@@ -1518,9 +1519,9 @@
+@@ -1519,9 +1528,9 @@
if $ac_init_version; then
cat <<\_ACEOF
- The Glorious Glasgow Haskell Compilation System configure 7.0.3
+ The Glorious Glasgow Haskell Compilation System configure 7.0.4
-generated by GNU Autoconf 2.65
-+generated by GNU Autoconf 2.67
++generated by GNU Autoconf 2.68
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
-@@ -1590,7 +1591,7 @@
+@@ -1565,7 +1574,7 @@
+
+ ac_retval=1
+ fi
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_compile
+@@ -1591,7 +1600,7 @@
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -254,20 +300,38 @@
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
-@@ -1656,10 +1657,10 @@
+@@ -1602,7 +1611,7 @@
+
+ ac_retval=1
+ fi
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_cpp
+@@ -1644,7 +1653,7 @@
+ ac_retval=$ac_status
+ fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_run
+@@ -1657,10 +1666,10 @@
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+ if eval "test \"\${$3+set}\"" = set; then :
++ if eval \${$3+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
-@@ -1695,7 +1696,7 @@
+@@ -1696,7 +1705,7 @@
else
ac_header_preproc=no
fi
@@ -276,7 +340,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
-@@ -1718,17 +1719,15 @@
+@@ -1719,17 +1728,15 @@
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
@@ -293,38 +357,88 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
-@@ -1750,7 +1749,7 @@
+@@ -1738,7 +1745,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+ fi
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+ } # ac_fn_c_check_header_mongrel
+
+@@ -1751,7 +1758,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -1781,7 +1780,7 @@
+@@ -1769,7 +1776,7 @@
+ eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+ } # ac_fn_c_check_header_compile
+
+@@ -1782,7 +1789,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
eval "$3=no"
-@@ -2058,7 +2057,7 @@
+@@ -1823,7 +1830,7 @@
+ eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+ } # ac_fn_c_check_type
+
+@@ -2000,7 +2007,7 @@
+ rm -f conftest.val
+
+ fi
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_compute_int
+@@ -2046,7 +2053,7 @@
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_link
+@@ -2059,7 +2066,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2117,15 +2116,18 @@
+@@ -2114,19 +2121,22 @@
+ eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_func
@@ -345,11 +459,11 @@
+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-+if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2134,8 +2136,12 @@
+@@ -2135,8 +2145,12 @@
int
main ()
{
@@ -364,16 +478,25 @@
#endif
;
-@@ -2160,7 +2166,7 @@
+@@ -2153,7 +2167,7 @@
+ eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+ } # ac_fn_c_check_decl
+ cat >config.log <<_ACEOF
+@@ -2161,7 +2175,7 @@
running configure, to aid debugging if configure makes a mistake.
- It was created by The Glorious Glasgow Haskell Compilation System $as_me 7.0.3, which was
+ It was created by The Glorious Glasgow Haskell Compilation System $as_me 7.0.4, which was
-generated by GNU Autoconf 2.65. Invocation command line was
-+generated by GNU Autoconf 2.67. Invocation command line was
++generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
-@@ -2270,11 +2276,9 @@
+@@ -2271,11 +2285,9 @@
{
echo
@@ -387,7 +510,7 @@
echo
# The following way of writing the cache mishandles newlines in values,
(
-@@ -2308,11 +2312,9 @@
+@@ -2309,11 +2321,9 @@
)
echo
@@ -401,7 +524,7 @@
echo
for ac_var in $ac_subst_vars
do
-@@ -2325,11 +2327,9 @@
+@@ -2326,11 +2336,9 @@
echo
if test -n "$ac_subst_files"; then
@@ -415,7 +538,7 @@
echo
for ac_var in $ac_subst_files
do
-@@ -2343,11 +2343,9 @@
+@@ -2344,11 +2352,9 @@
fi
if test -s confdefs.h; then
@@ -429,7 +552,7 @@
echo
cat confdefs.h
echo
-@@ -2402,7 +2400,12 @@
+@@ -2403,7 +2409,12 @@
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
@@ -443,7 +566,7 @@
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
-@@ -2417,7 +2420,11 @@
+@@ -2418,7 +2429,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
@@ -452,11 +575,11 @@
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
-+See \`config.log' for more details" "$LINENO" 5 ; }
++See \`config.log' for more details" "$LINENO" 5; }
fi
done
-@@ -2493,7 +2500,7 @@
+@@ -2494,7 +2509,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
@@ -465,7 +588,43 @@
fi
## -------------------- ##
## Main body of script. ##
-@@ -2768,7 +2775,7 @@
+@@ -2534,7 +2549,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_fp_prog_find+set}" = set; then :
++if ${ac_cv_path_fp_prog_find+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $fp_prog_find in
+@@ -2597,7 +2612,7 @@
+ set dummy find; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_FindCmd+set}" = set; then :
++if ${ac_cv_prog_FindCmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$FindCmd"; then
+@@ -2655,7 +2670,7 @@
+ set dummy sort; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_fp_prog_sort+set}" = set; then :
++if ${ac_cv_path_fp_prog_sort+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $fp_prog_sort in
+@@ -2704,7 +2719,7 @@
+ set dummy sort; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_SortCmd+set}" = set; then :
++if ${ac_cv_prog_SortCmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$SortCmd"; then
+@@ -2769,7 +2784,7 @@
elif test -d .git; then
ver_date=`git log -n 1 --date=short --pretty=format:%ci | sed "s/^.*\([0-9][0-9][0-9][0-9]\)-\([0-9][0-9]\)-\([0-9][0-9]\).*$/\1\2\3/"`
if echo $ver_date | grep '^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$' 2>&1 >/dev/null; then true; else
@@ -474,7 +633,7 @@
fi
PACKAGE_VERSION=${PACKAGE_VERSION}.$ver_date
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: inferred $PACKAGE_VERSION" >&5
-@@ -2777,7 +2784,7 @@
+@@ -2778,7 +2793,7 @@
# TODO: Remove this branch after conversion to Git
ver_date=`darcs changes --quiet --no-summary --xml | head -500 | grep 'date=' | sed "s/^.*date='\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\).*$/\1/g" | ${SortCmd} -n | tail -1`
if echo $ver_date | grep '^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$' 2>&1 >/dev/null; then true; else
@@ -483,16 +642,25 @@
fi
PACKAGE_VERSION=${PACKAGE_VERSION}.$ver_date
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: inferred $PACKAGE_VERSION" >&5
-@@ -2808,7 +2815,7 @@
+@@ -2809,7 +2824,7 @@
case $VERSION_MINOR in
?) ProjectVersionInt=${VERSION_MAJOR}0${VERSION_MINOR} ;;
??) ProjectVersionInt=${VERSION_MAJOR}${VERSION_MINOR} ;;
- *) as_fn_error "bad minor version in $PACKAGE_VERSION" "$LINENO" 5 ;;
-+ *) as_fn_error $? "bad minor version in $PACKAGE_VERSION" "$LINENO" 5 [...incomplete...]
More information about the Pkg-haskell-commits
mailing list