[Pkg-haskell-commits] darcs: ghc: patches/configure-s390x: Add s390x to the list of known architectures.

Joachim Breitner mail at joachim-breitner.de
Mon Sep 5 12:11:51 UTC 2011


Mon Sep  5 12:11:31 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * patches/configure-s390x: Add s390x to the list of known architectures.
  Ignore-this: 188535766a4948ce0224af943f39bb22

    M ./changelog +6
    M ./patches/autoconf -201 +240
    A ./patches/configure-s390x
    M ./patches/series +1

Mon Sep  5 12:11:31 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * patches/configure-s390x: Add s390x to the list of known architectures.
  Ignore-this: 188535766a4948ce0224af943f39bb22
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2011-09-05 12:11:50.946171572 +0000
+++ new-ghc//changelog	2011-09-05 12:11:50.950341614 +0000
@@ -1,3 +1,9 @@
+ghc (7.0.4-7) UNRELEASED; urgency=low
+
+  * patches/configure-s390x: Add s390x to the list of known architectures.
+
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 05 Sep 2011 14:09:44 +0200
+
 ghc (7.0.4-6) unstable; urgency=low
 
   * Fix #609445 by actually removing the patch for #566331, not needed any
diff -rN -u old-ghc//patches/autoconf new-ghc//patches/autoconf
--- old-ghc//patches/autoconf	2011-09-05 12:11:50.917175038 +0000
+++ new-ghc//patches/autoconf	2011-09-05 12:11:50.966414275 +0000
@@ -29,8 +29,8 @@
 
 Index: ghc-7.0.4/configure
 ===================================================================
---- 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
+--- ghc-7.0.4.orig/configure	2011-09-05 14:09:21.000000000 +0200
++++ ghc-7.0.4/configure	2011-09-05 14:09:30.000000000 +0200
 @@ -1,13 +1,13 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -808,7 +808,46 @@
  esac
  target=$ac_cv_target
  ac_save_IFS=$IFS; IFS='-'
-@@ -3693,7 +3714,7 @@
+@@ -3306,6 +3327,9 @@
+   rs6000)
+     BuildArch="rs6000"
+     ;;
++  s390x*)
++    BuildArch="s390x"
++    ;;
+   s390*)
+     BuildArch="s390"
+     ;;
+@@ -3403,6 +3427,9 @@
+   rs6000)
+     HostArch="rs6000"
+     ;;
++  s390x*)
++    HostArch="s390x"
++    ;;
+   s390*)
+     HostArch="s390"
+     ;;
+@@ -3500,6 +3527,9 @@
+   rs6000)
+     TargetArch="rs6000"
+     ;;
++  s390x*)
++    TargetArch="s390x"
++    ;;
+   s390*)
+     TargetArch="s390"
+     ;;
+@@ -3581,7 +3611,7 @@
+ 
+ checkArch() {
+     case $1 in
+-    alpha|arm|hppa|hppa1_1|i386|ia64|m68k|mips|mipseb|mipsel|powerpc|powerpc64|rs6000|s390|sparc|sparc64|vax|x86_64)
++    alpha|arm|hppa|hppa1_1|i386|ia64|m68k|mips|mipseb|mipsel|powerpc|powerpc64|rs6000|s390|s390x|sparc|sparc64|vax|x86_64)
+         ;;
+     *)
+         echo "Unknown arch $1"
+@@ -3693,7 +3723,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; }
@@ -817,7 +856,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $NHC in
-@@ -3736,7 +3757,7 @@
+@@ -3736,7 +3766,7 @@
  set dummy hbc; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -826,7 +865,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $HBC in
-@@ -3779,9 +3800,9 @@
+@@ -3779,9 +3809,9 @@
  $as_echo "$as_me: Building in-tree ghc-pwd" >&6;}
                  rm -rf utils/ghc-pwd/dist-boot
      mkdir  utils/ghc-pwd/dist-boot
@@ -838,7 +877,7 @@
      fi
  
      GHC_PWD=utils/ghc-pwd/dist-boot/ghc-pwd
-@@ -3794,12 +3815,12 @@
+@@ -3794,12 +3824,12 @@
          hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mnt/|/|'`
  
      if ! test -d "$hardtop"; then
@@ -853,7 +892,7 @@
          The build system does not support building in a directory
          containing space characters.
          Suggestion: move the build tree somewhere else." "$LINENO" 5
-@@ -3856,7 +3877,7 @@
+@@ -3856,7 +3886,7 @@
          PATH=`pwd`/inplace/mingw/bin:$PATH inplace/mingw/bin/realgcc.exe driver/gcc/gcc.c driver/utils/cwrapper.c driver/utils/getLocation.c -Idriver/utils -o inplace/mingw/bin/gcc.exe
          if ! test -e inplace/mingw/bin/gcc.exe
          then
@@ -862,7 +901,7 @@
          fi
          { $as_echo "$as_me:${as_lineno-$LINENO}: In-tree mingw tree created" >&5
  $as_echo "$as_me: In-tree mingw tree created" >&6;}
-@@ -3899,7 +3920,7 @@
+@@ -3899,7 +3929,7 @@
  set dummy gcc; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -871,7 +910,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $CC in
-@@ -3937,7 +3958,7 @@
+@@ -3937,7 +3967,7 @@
  
          if test -z "$CC"
          then
@@ -880,7 +919,7 @@
          fi
      fi
  
-@@ -3970,7 +3991,7 @@
+@@ -3970,7 +4000,7 @@
  set dummy ld; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -889,7 +928,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $LD in
-@@ -4008,7 +4029,7 @@
+@@ -4008,7 +4038,7 @@
  
          if test -z "$LD"
          then
@@ -898,7 +937,7 @@
          fi
      fi
  
-@@ -4040,7 +4061,7 @@
+@@ -4040,7 +4070,7 @@
  set dummy nm; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -907,7 +946,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $NM in
-@@ -4078,7 +4099,7 @@
+@@ -4078,7 +4108,7 @@
  
          if test -z "$NM"
          then
@@ -916,7 +955,7 @@
          fi
      fi
  
-@@ -4163,7 +4184,7 @@
+@@ -4163,7 +4193,7 @@
  $as_echo "none" >&6; }
    else
      if test ! -d $MACOSX_DEPLOYMENT_SDK; then
@@ -925,7 +964,7 @@
      fi
      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${MACOSX_DEPLOYMENT_VERSION} (${MACOSX_DEPLOYMENT_SDK})" >&5
  $as_echo "${MACOSX_DEPLOYMENT_VERSION} (${MACOSX_DEPLOYMENT_SDK})" >&6; }
-@@ -4186,7 +4207,7 @@
+@@ -4186,7 +4216,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether #! works in shell scripts" >&5
  $as_echo_n "checking whether #! works in shell scripts... " >&6; }
@@ -934,7 +973,7 @@
    $as_echo_n "(cached) " >&6
  else
    echo '#! /bin/cat
-@@ -4215,7 +4236,7 @@
+@@ -4215,7 +4245,7 @@
  set dummy perl; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -943,7 +982,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PerlCmd in
-@@ -4261,7 +4282,7 @@
+@@ -4261,7 +4291,7 @@
     if grep "v5" conftest.out >/dev/null 2>&1; then
        :
     else
@@ -952,7 +991,7 @@
     fi
  rm -fr conftest*
  
-@@ -4271,7 +4292,7 @@
+@@ -4271,7 +4301,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if your perl works in shell scripts" >&5
  $as_echo_n "checking if your perl works in shell scripts... " >&6; }
@@ -961,7 +1000,7 @@
    $as_echo_n "(cached) " >&6
  else
    echo "#!$PerlCmd"'
-@@ -4294,7 +4315,7 @@
+@@ -4294,7 +4324,7 @@
  set dummy python; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -970,7 +1009,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PythonCmd in
-@@ -4341,7 +4362,7 @@
+@@ -4341,7 +4371,7 @@
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -979,7 +1018,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -4381,7 +4402,7 @@
+@@ -4381,7 +4411,7 @@
  set dummy gcc; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -988,7 +1027,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -4434,7 +4455,7 @@
+@@ -4434,7 +4464,7 @@
  set dummy ${ac_tool_prefix}cc; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -997,7 +1036,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -4474,7 +4495,7 @@
+@@ -4474,7 +4504,7 @@
  set dummy cc; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -1006,7 +1045,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -4533,7 +4554,7 @@
+@@ -4533,7 +4563,7 @@
  set dummy $ac_tool_prefix$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; }
@@ -1015,7 +1054,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -4577,7 +4598,7 @@
+@@ -4577,7 +4607,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; }
@@ -1024,7 +1063,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -4631,8 +4652,8 @@
+@@ -4631,8 +4661,8 @@
  
  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -1035,7 +1074,7 @@
  
  # Provide some information about the compiler.
  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -4746,9 +4767,8 @@
+@@ -4746,9 +4776,8 @@
  
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -1047,7 +1086,7 @@
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
-@@ -4790,8 +4810,8 @@
+@@ -4790,8 +4819,8 @@
  else
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -1058,7 +1097,7 @@
  fi
  rm -f conftest conftest$ac_cv_exeext
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -4848,9 +4868,9 @@
+@@ -4848,9 +4877,9 @@
      else
  	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -1070,7 +1109,7 @@
      fi
    fi
  fi
-@@ -4861,7 +4881,7 @@
+@@ -4861,7 +4890,7 @@
  ac_clean_files=$ac_clean_files_save
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
  $as_echo_n "checking for suffix of object files... " >&6; }
@@ -1079,7 +1118,7 @@
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -4901,8 +4921,8 @@
+@@ -4901,8 +4930,8 @@
  
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -1090,7 +1129,7 @@
  fi
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
-@@ -4912,7 +4932,7 @@
+@@ -4912,7 +4941,7 @@
  ac_objext=$OBJEXT
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
  $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
@@ -1099,7 +1138,7 @@
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -4949,7 +4969,7 @@
+@@ -4949,7 +4978,7 @@
  ac_save_CFLAGS=$CFLAGS
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
  $as_echo_n "checking whether $CC accepts -g... " >&6; }
@@ -1108,7 +1147,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_save_c_werror_flag=$ac_c_werror_flag
-@@ -5027,7 +5047,7 @@
+@@ -5027,7 +5056,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
  $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
@@ -1117,7 +1156,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_cv_prog_cc_c89=no
-@@ -5129,12 +5149,12 @@
+@@ -5129,12 +5158,12 @@
     fp_have_gcc=YES
  fi
  if test "$fp_have_gcc" = "NO" -a -d $srcdir/ghc; then
@@ -1132,7 +1171,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test "$fp_have_gcc" = "YES"; then
-@@ -5160,7 +5180,7 @@
+@@ -5160,7 +5189,7 @@
  done
  IFS=$fp_save_IFS
  if test "$fp_num1" -lt "$fp_num2"; then :
@@ -1141,7 +1180,7 @@
  fi
     # See #2770: gcc 2.95 doesn't work any more, apparently.  There probably
     # isn't a very good reason for that, but for now just make configure
-@@ -5339,7 +5359,7 @@
+@@ -5339,7 +5368,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra options to pass gcc when compiling via C" >&5
  $as_echo_n "checking for extra options to pass gcc when compiling via C... " >&6; }
@@ -1150,7 +1189,7 @@
    $as_echo_n "(cached) " >&6
  else
    fp_cv_gcc_extra_opts=
-@@ -5486,7 +5506,7 @@
+@@ -5486,7 +5515,7 @@
    CPP=
  fi
  if test -z "$CPP"; then
@@ -1159,7 +1198,7 @@
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
-@@ -5516,7 +5536,7 @@
+@@ -5516,7 +5545,7 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -1168,7 +1207,7 @@
  
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
-@@ -5532,11 +5552,11 @@
+@@ -5532,11 +5561,11 @@
  ac_preproc_ok=:
  break
  fi
@@ -1182,7 +1221,7 @@
  if $ac_preproc_ok; then :
    break
  fi
-@@ -5575,7 +5595,7 @@
+@@ -5575,7 +5604,7 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -1191,7 +1230,7 @@
  
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
-@@ -5591,18 +5611,18 @@
+@@ -5591,18 +5620,18 @@
  ac_preproc_ok=:
  break
  fi
@@ -1214,7 +1253,7 @@
  fi
  
  ac_ext=c
-@@ -5627,7 +5647,7 @@
+@@ -5627,7 +5656,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working context diff" >&5
  $as_echo_n "checking for a working context diff... " >&6; }
@@ -1223,7 +1262,7 @@
    $as_echo_n "(cached) " >&6
  else
    echo foo > conftest1
-@@ -5644,7 +5664,7 @@
+@@ -5644,7 +5673,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fp_cv_context_diff" >&5
  $as_echo "$fp_cv_context_diff" >&6; }
  if test x"$fp_cv_context_diff" = xno; then
@@ -1232,7 +1271,7 @@
  fi
  ContextDiffCmd=$fp_cv_context_diff
  
-@@ -5668,7 +5688,7 @@
+@@ -5668,7 +5697,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
  $as_echo_n "checking for a BSD-compatible install... " >&6; }
  if test -z "$INSTALL"; then
@@ -1241,7 +1280,7 @@
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -5753,7 +5773,7 @@
+@@ -5753,7 +5782,7 @@
  set dummy ar; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -1250,7 +1289,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $fp_prog_ar_raw in
-@@ -5790,7 +5810,7 @@
+@@ -5790,7 +5819,7 @@
  
  
  if test -z "$fp_prog_ar_raw"; then
@@ -1259,7 +1298,7 @@
  fi
  fp_prog_ar="$fp_prog_ar_raw"
  case $HostPlatform in
-@@ -5805,7 +5825,7 @@
+@@ -5805,7 +5834,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $fp_prog_ar_raw is GNU ar" >&5
  $as_echo_n "checking whether $fp_prog_ar_raw is GNU ar... " >&6; }
@@ -1268,7 +1307,7 @@
    $as_echo_n "(cached) " >&6
  else
    if "$fp_prog_ar_raw" --version 2> /dev/null | grep "GNU" > /dev/null 2>&1; then
-@@ -5823,7 +5843,7 @@
+@@ -5823,7 +5852,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ar arguments" >&5
  $as_echo_n "checking for ar arguments... " >&6; }
@@ -1277,7 +1316,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -5843,7 +5863,7 @@
+@@ -5843,7 +5872,7 @@
    done
    rm -f conftest*
    if test -z "$fp_cv_prog_ar_args"; then
@@ -1286,7 +1325,7 @@
    fi
  fi
  fi
-@@ -5860,7 +5880,7 @@
+@@ -5860,7 +5889,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $fp_prog_ar_raw supports @file" >&5
  $as_echo_n "checking whether $fp_prog_ar_raw supports @file... " >&6; }
@@ -1295,7 +1334,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -5889,7 +5909,7 @@
+@@ -5889,7 +5918,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ranlib is needed" >&5
  $as_echo_n "checking whether ranlib is needed... " >&6; }
@@ -1304,7 +1343,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test $fp_prog_ar_is_gnu = yes; then
-@@ -5912,7 +5932,7 @@
+@@ -5912,7 +5941,7 @@
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -1313,7 +1352,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$RANLIB"; then
-@@ -5952,7 +5972,7 @@
+@@ -5952,7 +5981,7 @@
  set dummy ranlib; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -1322,7 +1361,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_RANLIB"; then
-@@ -6008,7 +6028,7 @@
+@@ -6008,7 +6037,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $fp_prog_ar_raw supports -input" >&5
  $as_echo_n "checking whether $fp_prog_ar_raw supports -input... " >&6; }
@@ -1331,7 +1370,7 @@
    $as_echo_n "(cached) " >&6
  else
    fp_cv_prog_ar_supports_input=no
-@@ -6054,7 +6074,7 @@
+@@ -6054,7 +6083,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; }
@@ -1340,7 +1379,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $SedCmd in
-@@ -6100,7 +6120,7 @@
+@@ -6100,7 +6129,7 @@
  set dummy time; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -1349,7 +1388,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $TimeCmd in
-@@ -6143,7 +6163,7 @@
+@@ -6143,7 +6172,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; }
@@ -1358,7 +1397,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $TarCmd in
-@@ -6190,7 +6210,7 @@
+@@ -6190,7 +6219,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; }
@@ -1367,7 +1406,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PatchCmd in
-@@ -6236,7 +6256,7 @@
+@@ -6236,7 +6265,7 @@
  set dummy dtrace; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -1376,7 +1415,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $DtraceCmd in
-@@ -6283,7 +6303,7 @@
+@@ -6283,7 +6312,7 @@
  set dummy HsColour; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -1385,7 +1424,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $HSCOLOUR in
-@@ -6332,7 +6352,7 @@
+@@ -6332,7 +6361,7 @@
  set dummy xmllint; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -1394,7 +1433,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $XmllintCmd in
-@@ -6418,7 +6438,7 @@
+@@ -6418,7 +6447,7 @@
  set dummy xsltproc; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -1403,7 +1442,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $XsltprocCmd in
-@@ -6462,7 +6482,7 @@
+@@ -6462,7 +6491,7 @@
  if test -n "$XsltprocCmd"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XSL stylesheet" >&5
  $as_echo_n "checking for DocBook XSL stylesheet... " >&6; }
@@ -1412,7 +1451,7 @@
    $as_echo_n "(cached) " >&6
  else
    rm -f conftest.xml conftest-book.xml
-@@ -6511,7 +6531,7 @@
+@@ -6511,7 +6540,7 @@
  set dummy dblatex; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -1421,7 +1460,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $DblatexCmd in
-@@ -6557,7 +6577,7 @@
+@@ -6557,7 +6586,7 @@
  set dummy hasktags; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -1430,7 +1469,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $HstagsCmd in
-@@ -6601,7 +6621,7 @@
+@@ -6601,7 +6630,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ghc-pkg matching $WithGhc" >&5
  $as_echo_n "checking for ghc-pkg matching $WithGhc... " >&6; }
@@ -1439,7 +1478,7 @@
    $as_echo_n "(cached) " >&6
  else
  
-@@ -6614,7 +6634,7 @@
+@@ -6614,7 +6643,7 @@
  if "$fp_ghc_[...incomplete...]



More information about the Pkg-haskell-commits mailing list