Ticket #13290: mpc-1.0.p0.diff

File mpc-1.0.p0.diff, 62.8 KB (added by jdemeyer, 10 years ago)

Patch for the mpc spkg, for review only

  • SPKG.txt

    diff --git a/SPKG.txt b/SPKG.txt
    a b  
    22
    33== Description ==
    44
    5 From http://www.multiprecision.org/mpc: MPC is a C library for the arithmetic
    6 of complex numbers with arbitrarily high precision and correct rounding of the
    7 result. It is built upon and follows the same principles as MPFR.
     5From http://www.multiprecision.org/mpc:
     6GNU MPC is a C library for the arithmetic of complex numbers with
     7arbitrarily high precision and correct rounding of the result. It
     8extends the principles of the IEEE-754 standard for fixed precision real
     9floating point numbers to complex numbers, providing well-defined
     10semantics for every operation. At the same time, speed of operation at
     11high precision is a major design goal.
    812
    913== License ==
    1014
    11 The MPC Library is free software; you can redistribute it and/or modify it
    12 under the terms of the GNU Lesser General Public License as published by the
    13 Free Software Foundation; either version 2.1 of the License, or (at your
    14 option) any later version.
     15LGPLv3+ for the code and GFDLv1.3+ (with no invariant sections)
     16for the documentation.
    1517
    1618== SPKG Maintainers ==
    1719
     
    3234== Special Update/Build Instructions ==
    3335
    3436Patches:
    35  * no_fortify_source.patch: on some older systems, there are linker
    36    errors when compiling MPC.  These go away when removing the compiler
    37    flag "-D_FORTIFY_SOURCE=2", which is what the patch does.
     37 * configure.patch: move AM_PROG_AR after MPC_GMP_CC_CFLAGS, see
     38   https://gforge.inria.fr/tracker/?func=detail&group_id=131&aid=14669&atid=607
     39   (patch scheduled to be merged upstream in mpc-1.0.1)
    3840
    3941== Changelog ==
    4042
     43=== mpc-1.0.p0 (Jeroen Demeyer, 1 August 2012) ===
     44 * Trac #13290: add configure.patch (see above).
     45
     46=== mpc-1.0 (Jeroen Demeyer, 27 July 2012) ===
     47 * Trac #13290: upgrade to stable version 1.0.
     48 * Remove no_fortify_source.patch (which is upstream now).
     49 * Remove legacy "unset RM" command.
     50
    4151=== mpc-1.0.0dev1126.p1 (Jeroen Demeyer, 23 March 2012) ===
    4252 * Trac #12515: add no_fortify_source.patch to remove compiler option
    4353   "-D_FORTIFY_SOURCE=2".
  • new file patches/configure.patch

    diff --git a/patches/configure.patch b/patches/configure.patch
    new file mode 100644
    - +  
     1diff -rud src/configure.ac b/configure.ac
     2--- src/configure.ac    2012-07-19 14:33:51.000000000 +0200
     3+++ b/configure.ac      2012-08-01 15:34:32.000000000 +0200
     4@@ -30,9 +30,6 @@
     5 USER_CC=$CC
     6 USER_CFLAGS=$CFLAGS
     7 
     8-# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
     9-m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
     10-
     11 AC_CANONICAL_HOST
     12 AC_CONFIG_MACRO_DIR([m4])
     13 
     14@@ -111,6 +108,11 @@
     15 AC_PROG_CC
     16 AC_LANG(C)
     17 
     18+# Automake 1.12 seems to require this, but automake 1.11 doesn't recognize it.
     19+# Do not call AM_PROG_AR before MPC_GMP_CC_CFLAGS, since otherwise ac_cv_prog_CC
     20+# is already set and overrides our CC setting (which may come from gmp.h).
     21+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
     22+
     23 # Set up LibTool
     24 LT_INIT
     25 
     26diff -rud src/aclocal.m4 b/aclocal.m4
     27--- src/aclocal.m4      2012-07-19 14:33:57.000000000 +0200
     28+++ b/aclocal.m4        2012-08-01 15:56:44.000000000 +0200
     29@@ -1,4 +1,4 @@
     30-# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
     31+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
     32 
     33 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
     34 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
     35@@ -38,7 +38,7 @@
     36 [am__api_version='1.11'
     37 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
     38 dnl require some minimum version.  Point them to the right macro.
     39-m4_if([$1], [1.11.5], [],
     40+m4_if([$1], [1.11.6], [],
     41       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
     42 ])
     43 
     44@@ -54,7 +54,7 @@
     45 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
     46 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
     47 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
     48-[AM_AUTOMAKE_VERSION([1.11.5])dnl
     49+[AM_AUTOMAKE_VERSION([1.11.6])dnl
     50 m4_ifndef([AC_AUTOCONF_VERSION],
     51   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
     52 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
     53Only in b: autom4te.cache
     54diff -rud src/configure b/configure
     55--- src/configure       2012-07-19 14:33:58.000000000 +0200
     56+++ b/configure 2012-08-01 15:56:46.000000000 +0200
     57@@ -659,18 +659,8 @@
     58 LD
     59 FGREP
     60 LIBTOOL
     61-SED
     62-EGREP
     63-GREP
     64-VALGRIND
     65-host_os
     66-host_vendor
     67-host_cpu
     68-host
     69-build_os
     70-build_vendor
     71-build_cpu
     72-build
     73+ac_ct_AR
     74+AR
     75 am__fastdepCC_FALSE
     76 am__fastdepCC_TRUE
     77 CCDEPMODE
     78@@ -688,8 +678,18 @@
     79 LDFLAGS
     80 CFLAGS
     81 CC
     82-ac_ct_AR
     83-AR
     84+SED
     85+EGREP
     86+GREP
     87+VALGRIND
     88+host_os
     89+host_vendor
     90+host_cpu
     91+host
     92+build_os
     93+build_vendor
     94+build_cpu
     95+build
     96 MAINT
     97 MAINTAINER_MODE_FALSE
     98 MAINTAINER_MODE_TRUE
     99@@ -758,7 +758,6 @@
     100 ac_user_opts='
     101 enable_option_checking
     102 enable_maintainer_mode
     103-enable_dependency_tracking
     104 with_mpfr_include
     105 with_mpfr_lib
     106 with_mpfr
     107@@ -767,6 +766,7 @@
     108 with_gmp
     109 enable_logging
     110 enable_valgrind_tests
     111+enable_dependency_tracking
     112 enable_shared
     113 enable_static
     114 with_pic
     115@@ -1404,11 +1404,11 @@
     116   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
     117   --enable-maintainer-mode  enable make rules and dependencies not useful
     118                          (and sometimes confusing) to the casual installer
     119-  --disable-dependency-tracking  speeds up one-time build
     120-  --enable-dependency-tracking   do not reject slow dependency extractors
     121   --enable-logging        enable logging of function calls to stderr (default
     122                           = no)
     123   --enable-valgrind-tests run checks through valgrind (default = no)
     124+  --disable-dependency-tracking  speeds up one-time build
     125+  --enable-dependency-tracking   do not reject slow dependency extractors
     126   --enable-shared[=PKGS]  build shared libraries [default=yes]
     127   --enable-static[=PKGS]  build static libraries [default=yes]
     128   --enable-fast-install[=PKGS]
     129@@ -2815,1149 +2815,6 @@
     130 USER_CC=$CC
     131 USER_CFLAGS=$CFLAGS
     132 
     133-# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
     134-DEPDIR="${am__leading_dot}deps"
     135-
     136-ac_config_commands="$ac_config_commands depfiles"
     137-
     138-
     139-am_make=${MAKE-make}
     140-cat > confinc << 'END'
     141-am__doit:
     142-       @echo this is the am__doit target
     143-.PHONY: am__doit
     144-END
     145-# If we don't find an include directive, just comment out the code.
     146-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
     147-$as_echo_n "checking for style of include used by $am_make... " >&6; }
     148-am__include="#"
     149-am__quote=
     150-_am_result=none
     151-# First try GNU make style include.
     152-echo "include confinc" > confmf
     153-# Ignore all kinds of additional output from `make'.
     154-case `$am_make -s -f confmf 2> /dev/null` in #(
     155-*the\ am__doit\ target*)
     156-  am__include=include
     157-  am__quote=
     158-  _am_result=GNU
     159-  ;;
     160-esac
     161-# Now try BSD make style include.
     162-if test "$am__include" = "#"; then
     163-   echo '.include "confinc"' > confmf
     164-   case `$am_make -s -f confmf 2> /dev/null` in #(
     165-   *the\ am__doit\ target*)
     166-     am__include=.include
     167-     am__quote="\""
     168-     _am_result=BSD
     169-     ;;
     170-   esac
     171-fi
     172-
     173-
     174-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
     175-$as_echo "$_am_result" >&6; }
     176-rm -f confinc confmf
     177-
     178-# Check whether --enable-dependency-tracking was given.
     179-if test "${enable_dependency_tracking+set}" = set; then :
     180-  enableval=$enable_dependency_tracking;
     181-fi
     182-
     183-if test "x$enable_dependency_tracking" != xno; then
     184-  am_depcomp="$ac_aux_dir/depcomp"
     185-  AMDEPBACKSLASH='\'
     186-  am__nodep='_no'
     187-fi
     188- if test "x$enable_dependency_tracking" != xno; then
     189-  AMDEP_TRUE=
     190-  AMDEP_FALSE='#'
     191-else
     192-  AMDEP_TRUE='#'
     193-  AMDEP_FALSE=
     194-fi
     195-
     196-
     197-ac_ext=c
     198-ac_cpp='$CPP $CPPFLAGS'
     199-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     200-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     201-ac_compiler_gnu=$ac_cv_c_compiler_gnu
     202-if test -n "$ac_tool_prefix"; then
     203-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
     204-set dummy ${ac_tool_prefix}gcc; ac_word=$2
     205-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     206-$as_echo_n "checking for $ac_word... " >&6; }
     207-if ${ac_cv_prog_CC+:} false; then :
     208-  $as_echo_n "(cached) " >&6
     209-else
     210-  if test -n "$CC"; then
     211-  ac_cv_prog_CC="$CC" # Let the user override the test.
     212-else
     213-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     214-for as_dir in $PATH
     215-do
     216-  IFS=$as_save_IFS
     217-  test -z "$as_dir" && as_dir=.
     218-    for ac_exec_ext in '' $ac_executable_extensions; do
     219-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     220-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
     221-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     222-    break 2
     223-  fi
     224-done
     225-  done
     226-IFS=$as_save_IFS
     227-
     228-fi
     229-fi
     230-CC=$ac_cv_prog_CC
     231-if test -n "$CC"; then
     232-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
     233-$as_echo "$CC" >&6; }
     234-else
     235-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     236-$as_echo "no" >&6; }
     237-fi
     238-
     239-
     240-fi
     241-if test -z "$ac_cv_prog_CC"; then
     242-  ac_ct_CC=$CC
     243-  # Extract the first word of "gcc", so it can be a program name with args.
     244-set dummy gcc; ac_word=$2
     245-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     246-$as_echo_n "checking for $ac_word... " >&6; }
     247-if ${ac_cv_prog_ac_ct_CC+:} false; then :
     248-  $as_echo_n "(cached) " >&6
     249-else
     250-  if test -n "$ac_ct_CC"; then
     251-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
     252-else
     253-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     254-for as_dir in $PATH
     255-do
     256-  IFS=$as_save_IFS
     257-  test -z "$as_dir" && as_dir=.
     258-    for ac_exec_ext in '' $ac_executable_extensions; do
     259-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     260-    ac_cv_prog_ac_ct_CC="gcc"
     261-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     262-    break 2
     263-  fi
     264-done
     265-  done
     266-IFS=$as_save_IFS
     267-
     268-fi
     269-fi
     270-ac_ct_CC=$ac_cv_prog_ac_ct_CC
     271-if test -n "$ac_ct_CC"; then
     272-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
     273-$as_echo "$ac_ct_CC" >&6; }
     274-else
     275-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     276-$as_echo "no" >&6; }
     277-fi
     278-
     279-  if test "x$ac_ct_CC" = x; then
     280-    CC=""
     281-  else
     282-    case $cross_compiling:$ac_tool_warned in
     283-yes:)
     284-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     285-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     286-ac_tool_warned=yes ;;
     287-esac
     288-    CC=$ac_ct_CC
     289-  fi
     290-else
     291-  CC="$ac_cv_prog_CC"
     292-fi
     293-
     294-if test -z "$CC"; then
     295-          if test -n "$ac_tool_prefix"; then
     296-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
     297-set dummy ${ac_tool_prefix}cc; ac_word=$2
     298-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     299-$as_echo_n "checking for $ac_word... " >&6; }
     300-if ${ac_cv_prog_CC+:} false; then :
     301-  $as_echo_n "(cached) " >&6
     302-else
     303-  if test -n "$CC"; then
     304-  ac_cv_prog_CC="$CC" # Let the user override the test.
     305-else
     306-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     307-for as_dir in $PATH
     308-do
     309-  IFS=$as_save_IFS
     310-  test -z "$as_dir" && as_dir=.
     311-    for ac_exec_ext in '' $ac_executable_extensions; do
     312-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     313-    ac_cv_prog_CC="${ac_tool_prefix}cc"
     314-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     315-    break 2
     316-  fi
     317-done
     318-  done
     319-IFS=$as_save_IFS
     320-
     321-fi
     322-fi
     323-CC=$ac_cv_prog_CC
     324-if test -n "$CC"; then
     325-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
     326-$as_echo "$CC" >&6; }
     327-else
     328-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     329-$as_echo "no" >&6; }
     330-fi
     331-
     332-
     333-  fi
     334-fi
     335-if test -z "$CC"; then
     336-  # Extract the first word of "cc", so it can be a program name with args.
     337-set dummy cc; ac_word=$2
     338-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     339-$as_echo_n "checking for $ac_word... " >&6; }
     340-if ${ac_cv_prog_CC+:} false; then :
     341-  $as_echo_n "(cached) " >&6
     342-else
     343-  if test -n "$CC"; then
     344-  ac_cv_prog_CC="$CC" # Let the user override the test.
     345-else
     346-  ac_prog_rejected=no
     347-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     348-for as_dir in $PATH
     349-do
     350-  IFS=$as_save_IFS
     351-  test -z "$as_dir" && as_dir=.
     352-    for ac_exec_ext in '' $ac_executable_extensions; do
     353-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     354-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
     355-       ac_prog_rejected=yes
     356-       continue
     357-     fi
     358-    ac_cv_prog_CC="cc"
     359-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     360-    break 2
     361-  fi
     362-done
     363-  done
     364-IFS=$as_save_IFS
     365-
     366-if test $ac_prog_rejected = yes; then
     367-  # We found a bogon in the path, so make sure we never use it.
     368-  set dummy $ac_cv_prog_CC
     369-  shift
     370-  if test $# != 0; then
     371-    # We chose a different compiler from the bogus one.
     372-    # However, it has the same basename, so the bogon will be chosen
     373-    # first if we set CC to just the basename; use the full file name.
     374-    shift
     375-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
     376-  fi
     377-fi
     378-fi
     379-fi
     380-CC=$ac_cv_prog_CC
     381-if test -n "$CC"; then
     382-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
     383-$as_echo "$CC" >&6; }
     384-else
     385-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     386-$as_echo "no" >&6; }
     387-fi
     388-
     389-
     390-fi
     391-if test -z "$CC"; then
     392-  if test -n "$ac_tool_prefix"; then
     393-  for ac_prog in cl.exe
     394-  do
     395-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     396-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
     397-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     398-$as_echo_n "checking for $ac_word... " >&6; }
     399-if ${ac_cv_prog_CC+:} false; then :
     400-  $as_echo_n "(cached) " >&6
     401-else
     402-  if test -n "$CC"; then
     403-  ac_cv_prog_CC="$CC" # Let the user override the test.
     404-else
     405-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     406-for as_dir in $PATH
     407-do
     408-  IFS=$as_save_IFS
     409-  test -z "$as_dir" && as_dir=.
     410-    for ac_exec_ext in '' $ac_executable_extensions; do
     411-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     412-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     413-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     414-    break 2
     415-  fi
     416-done
     417-  done
     418-IFS=$as_save_IFS
     419-
     420-fi
     421-fi
     422-CC=$ac_cv_prog_CC
     423-if test -n "$CC"; then
     424-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
     425-$as_echo "$CC" >&6; }
     426-else
     427-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     428-$as_echo "no" >&6; }
     429-fi
     430-
     431-
     432-    test -n "$CC" && break
     433-  done
     434-fi
     435-if test -z "$CC"; then
     436-  ac_ct_CC=$CC
     437-  for ac_prog in cl.exe
     438-do
     439-  # Extract the first word of "$ac_prog", so it can be a program name with args.
     440-set dummy $ac_prog; ac_word=$2
     441-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     442-$as_echo_n "checking for $ac_word... " >&6; }
     443-if ${ac_cv_prog_ac_ct_CC+:} false; then :
     444-  $as_echo_n "(cached) " >&6
     445-else
     446-  if test -n "$ac_ct_CC"; then
     447-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
     448-else
     449-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     450-for as_dir in $PATH
     451-do
     452-  IFS=$as_save_IFS
     453-  test -z "$as_dir" && as_dir=.
     454-    for ac_exec_ext in '' $ac_executable_extensions; do
     455-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     456-    ac_cv_prog_ac_ct_CC="$ac_prog"
     457-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     458-    break 2
     459-  fi
     460-done
     461-  done
     462-IFS=$as_save_IFS
     463-
     464-fi
     465-fi
     466-ac_ct_CC=$ac_cv_prog_ac_ct_CC
     467-if test -n "$ac_ct_CC"; then
     468-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
     469-$as_echo "$ac_ct_CC" >&6; }
     470-else
     471-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     472-$as_echo "no" >&6; }
     473-fi
     474-
     475-
     476-  test -n "$ac_ct_CC" && break
     477-done
     478-
     479-  if test "x$ac_ct_CC" = x; then
     480-    CC=""
     481-  else
     482-    case $cross_compiling:$ac_tool_warned in
     483-yes:)
     484-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     485-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     486-ac_tool_warned=yes ;;
     487-esac
     488-    CC=$ac_ct_CC
     489-  fi
     490-fi
     491-
     492-fi
     493-
     494-
     495-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     496-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     497-as_fn_error $? "no acceptable C compiler found in \$PATH
     498-See \`config.log' for more details" "$LINENO" 5; }
     499-
     500-# Provide some information about the compiler.
     501-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
     502-set X $ac_compile
     503-ac_compiler=$2
     504-for ac_option in --version -v -V -qversion; do
     505-  { { ac_try="$ac_compiler $ac_option >&5"
     506-case "(($ac_try" in
     507-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     508-  *) ac_try_echo=$ac_try;;
     509-esac
     510-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     511-$as_echo "$ac_try_echo"; } >&5
     512-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
     513-  ac_status=$?
     514-  if test -s conftest.err; then
     515-    sed '10a\
     516-... rest of stderr output deleted ...
     517-         10q' conftest.err >conftest.er1
     518-    cat conftest.er1 >&5
     519-  fi
     520-  rm -f conftest.er1 conftest.err
     521-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     522-  test $ac_status = 0; }
     523-done
     524-
     525-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     526-/* end confdefs.h.  */
     527-
     528-int
     529-main ()
     530-{
     531-
     532-  ;
     533-  return 0;
     534-}
     535-_ACEOF
     536-ac_clean_files_save=$ac_clean_files
     537-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
     538-# Try to create an executable without -o first, disregard a.out.
     539-# It will help us diagnose broken compilers, and finding out an intuition
     540-# of exeext.
     541-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
     542-$as_echo_n "checking whether the C compiler works... " >&6; }
     543-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
     544-
     545-# The possible output files:
     546-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
     547-
     548-ac_rmfiles=
     549-for ac_file in $ac_files
     550-do
     551-  case $ac_file in
     552-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     553-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
     554-  esac
     555-done
     556-rm -f $ac_rmfiles
     557-
     558-if { { ac_try="$ac_link_default"
     559-case "(($ac_try" in
     560-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     561-  *) ac_try_echo=$ac_try;;
     562-esac
     563-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     564-$as_echo "$ac_try_echo"; } >&5
     565-  (eval "$ac_link_default") 2>&5
     566-  ac_status=$?
     567-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     568-  test $ac_status = 0; }; then :
     569-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
     570-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
     571-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
     572-# so that the user can short-circuit this test for compilers unknown to
     573-# Autoconf.
     574-for ac_file in $ac_files ''
     575-do
     576-  test -f "$ac_file" || continue
     577-  case $ac_file in
     578-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
     579-       ;;
     580-    [ab].out )
     581-       # We found the default executable, but exeext='' is most
     582-       # certainly right.
     583-       break;;
     584-    *.* )
     585-       if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
     586-       then :; else
     587-          ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
     588-       fi
     589-       # We set ac_cv_exeext here because the later test for it is not
     590-       # safe: cross compilers may not add the suffix if given an `-o'
     591-       # argument, so we may need to know it at that point already.
     592-       # Even if this section looks crufty: it has the advantage of
     593-       # actually working.
     594-       break;;
     595-    * )
     596-       break;;
     597-  esac
     598-done
     599-test "$ac_cv_exeext" = no && ac_cv_exeext=
     600-
     601-else
     602-  ac_file=''
     603-fi
     604-if test -z "$ac_file"; then :
     605-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     606-$as_echo "no" >&6; }
     607-$as_echo "$as_me: failed program was:" >&5
     608-sed 's/^/| /' conftest.$ac_ext >&5
     609-
     610-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     611-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     612-as_fn_error 77 "C compiler cannot create executables
     613-See \`config.log' for more details" "$LINENO" 5; }
     614-else
     615-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     616-$as_echo "yes" >&6; }
     617-fi
     618-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
     619-$as_echo_n "checking for C compiler default output file name... " >&6; }
     620-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
     621-$as_echo "$ac_file" >&6; }
     622-ac_exeext=$ac_cv_exeext
     623-
     624-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
     625-ac_clean_files=$ac_clean_files_save
     626-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
     627-$as_echo_n "checking for suffix of executables... " >&6; }
     628-if { { ac_try="$ac_link"
     629-case "(($ac_try" in
     630-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     631-  *) ac_try_echo=$ac_try;;
     632-esac
     633-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     634-$as_echo "$ac_try_echo"; } >&5
     635-  (eval "$ac_link") 2>&5
     636-  ac_status=$?
     637-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     638-  test $ac_status = 0; }; then :
     639-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
     640-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
     641-# work properly (i.e., refer to `conftest.exe'), while it won't with
     642-# `rm'.
     643-for ac_file in conftest.exe conftest conftest.*; do
     644-  test -f "$ac_file" || continue
     645-  case $ac_file in
     646-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     647-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
     648-         break;;
     649-    * ) break;;
     650-  esac
     651-done
     652-else
     653-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     654-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     655-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
     656-See \`config.log' for more details" "$LINENO" 5; }
     657-fi
     658-rm -f conftest conftest$ac_cv_exeext
     659-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
     660-$as_echo "$ac_cv_exeext" >&6; }
     661-
     662-rm -f conftest.$ac_ext
     663-EXEEXT=$ac_cv_exeext
     664-ac_exeext=$EXEEXT
     665-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     666-/* end confdefs.h.  */
     667-#include <stdio.h>
     668-int
     669-main ()
     670-{
     671-FILE *f = fopen ("conftest.out", "w");
     672- return ferror (f) || fclose (f) != 0;
     673-
     674-  ;
     675-  return 0;
     676-}
     677-_ACEOF
     678-ac_clean_files="$ac_clean_files conftest.out"
     679-# Check that the compiler produces executables we can run.  If not, either
     680-# the compiler is broken, or we cross compile.
     681-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
     682-$as_echo_n "checking whether we are cross compiling... " >&6; }
     683-if test "$cross_compiling" != yes; then
     684-  { { ac_try="$ac_link"
     685-case "(($ac_try" in
     686-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     687-  *) ac_try_echo=$ac_try;;
     688-esac
     689-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     690-$as_echo "$ac_try_echo"; } >&5
     691-  (eval "$ac_link") 2>&5
     692-  ac_status=$?
     693-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     694-  test $ac_status = 0; }
     695-  if { ac_try='./conftest$ac_cv_exeext'
     696-  { { case "(($ac_try" in
     697-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     698-  *) ac_try_echo=$ac_try;;
     699-esac
     700-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     701-$as_echo "$ac_try_echo"; } >&5
     702-  (eval "$ac_try") 2>&5
     703-  ac_status=$?
     704-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     705-  test $ac_status = 0; }; }; then
     706-    cross_compiling=no
     707-  else
     708-    if test "$cross_compiling" = maybe; then
     709-       cross_compiling=yes
     710-    else
     711-       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     712-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     713-as_fn_error $? "cannot run C compiled programs.
     714-If you meant to cross compile, use \`--host'.
     715-See \`config.log' for more details" "$LINENO" 5; }
     716-    fi
     717-  fi
     718-fi
     719-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
     720-$as_echo "$cross_compiling" >&6; }
     721-
     722-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
     723-ac_clean_files=$ac_clean_files_save
     724-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
     725-$as_echo_n "checking for suffix of object files... " >&6; }
     726-if ${ac_cv_objext+:} false; then :
     727-  $as_echo_n "(cached) " >&6
     728-else
     729-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     730-/* end confdefs.h.  */
     731-
     732-int
     733-main ()
     734-{
     735-
     736-  ;
     737-  return 0;
     738-}
     739-_ACEOF
     740-rm -f conftest.o conftest.obj
     741-if { { ac_try="$ac_compile"
     742-case "(($ac_try" in
     743-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     744-  *) ac_try_echo=$ac_try;;
     745-esac
     746-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     747-$as_echo "$ac_try_echo"; } >&5
     748-  (eval "$ac_compile") 2>&5
     749-  ac_status=$?
     750-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     751-  test $ac_status = 0; }; then :
     752-  for ac_file in conftest.o conftest.obj conftest.*; do
     753-  test -f "$ac_file" || continue;
     754-  case $ac_file in
     755-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     756-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
     757-       break;;
     758-  esac
     759-done
     760-else
     761-  $as_echo "$as_me: failed program was:" >&5
     762-sed 's/^/| /' conftest.$ac_ext >&5
     763-
     764-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     765-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     766-as_fn_error $? "cannot compute suffix of object files: cannot compile
     767-See \`config.log' for more details" "$LINENO" 5; }
     768-fi
     769-rm -f conftest.$ac_cv_objext conftest.$ac_ext
     770-fi
     771-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
     772-$as_echo "$ac_cv_objext" >&6; }
     773-OBJEXT=$ac_cv_objext
     774-ac_objext=$OBJEXT
     775-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
     776-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
     777-if ${ac_cv_c_compiler_gnu+:} false; then :
     778-  $as_echo_n "(cached) " >&6
     779-else
     780-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     781-/* end confdefs.h.  */
     782-
     783-int
     784-main ()
     785-{
     786-#ifndef __GNUC__
     787-       choke me
     788-#endif
     789-
     790-  ;
     791-  return 0;
     792-}
     793-_ACEOF
     794-if ac_fn_c_try_compile "$LINENO"; then :
     795-  ac_compiler_gnu=yes
     796-else
     797-  ac_compiler_gnu=no
     798-fi
     799-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     800-ac_cv_c_compiler_gnu=$ac_compiler_gnu
     801-
     802-fi
     803-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
     804-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
     805-if test $ac_compiler_gnu = yes; then
     806-  GCC=yes
     807-else
     808-  GCC=
     809-fi
     810-ac_test_CFLAGS=${CFLAGS+set}
     811-ac_save_CFLAGS=$CFLAGS
     812-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
     813-$as_echo_n "checking whether $CC accepts -g... " >&6; }
     814-if ${ac_cv_prog_cc_g+:} false; then :
     815-  $as_echo_n "(cached) " >&6
     816-else
     817-  ac_save_c_werror_flag=$ac_c_werror_flag
     818-   ac_c_werror_flag=yes
     819-   ac_cv_prog_cc_g=no
     820-   CFLAGS="-g"
     821-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     822-/* end confdefs.h.  */
     823-
     824-int
     825-main ()
     826-{
     827-
     828-  ;
     829-  return 0;
     830-}
     831-_ACEOF
     832-if ac_fn_c_try_compile "$LINENO"; then :
     833-  ac_cv_prog_cc_g=yes
     834-else
     835-  CFLAGS=""
     836-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     837-/* end confdefs.h.  */
     838-
     839-int
     840-main ()
     841-{
     842-
     843-  ;
     844-  return 0;
     845-}
     846-_ACEOF
     847-if ac_fn_c_try_compile "$LINENO"; then :
     848-
     849-else
     850-  ac_c_werror_flag=$ac_save_c_werror_flag
     851-        CFLAGS="-g"
     852-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     853-/* end confdefs.h.  */
     854-
     855-int
     856-main ()
     857-{
     858-
     859-  ;
     860-  return 0;
     861-}
     862-_ACEOF
     863-if ac_fn_c_try_compile "$LINENO"; then :
     864-  ac_cv_prog_cc_g=yes
     865-fi
     866-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     867-fi
     868-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     869-fi
     870-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     871-   ac_c_werror_flag=$ac_save_c_werror_flag
     872-fi
     873-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
     874-$as_echo "$ac_cv_prog_cc_g" >&6; }
     875-if test "$ac_test_CFLAGS" = set; then
     876-  CFLAGS=$ac_save_CFLAGS
     877-elif test $ac_cv_prog_cc_g = yes; then
     878-  if test "$GCC" = yes; then
     879-    CFLAGS="-g -O2"
     880-  else
     881-    CFLAGS="-g"
     882-  fi
     883-else
     884-  if test "$GCC" = yes; then
     885-    CFLAGS="-O2"
     886-  else
     887-    CFLAGS=
     888-  fi
     889-fi
     890-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
     891-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
     892-if ${ac_cv_prog_cc_c89+:} false; then :
     893-  $as_echo_n "(cached) " >&6
     894-else
     895-  ac_cv_prog_cc_c89=no
     896-ac_save_CC=$CC
     897-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     898-/* end confdefs.h.  */
     899-#include <stdarg.h>
     900-#include <stdio.h>
     901-struct stat;
     902-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
     903-struct buf { int x; };
     904-FILE * (*rcsopen) (struct buf *, struct stat *, int);
     905-static char *e (p, i)
     906-     char **p;
     907-     int i;
     908-{
     909-  return p[i];
     910-}
     911-static char *f (char * (*g) (char **, int), char **p, ...)
     912-{
     913-  char *s;
     914-  va_list v;
     915-  va_start (v,p);
     916-  s = g (p, va_arg (v,int));
     917-  va_end (v);
     918-  return s;
     919-}
     920-
     921-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     922-   function prototypes and stuff, but not '\xHH' hex character constants.
     923-   These don't provoke an error unfortunately, instead are silently treated
     924-   as 'x'.  The following induces an error, until -std is added to get
     925-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
     926-   array size at least.  It's necessary to write '\x00'==0 to get something
     927-   that's true only with -std.  */
     928-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
     929-
     930-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
     931-   inside strings and character constants.  */
     932-#define FOO(x) 'x'
     933-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
     934-
     935-int test (int i, double x);
     936-struct s1 {int (*f) (int a);};
     937-struct s2 {int (*f) (double a);};
     938-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
     939-int argc;
     940-char **argv;
     941-int
     942-main ()
     943-{
     944-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
     945-  ;
     946-  return 0;
     947-}
     948-_ACEOF
     949-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
     950-       -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
     951-do
     952-  CC="$ac_save_CC $ac_arg"
     953-  if ac_fn_c_try_compile "$LINENO"; then :
     954-  ac_cv_prog_cc_c89=$ac_arg
     955-fi
     956-rm -f core conftest.err conftest.$ac_objext
     957-  test "x$ac_cv_prog_cc_c89" != "xno" && break
     958-done
     959-rm -f conftest.$ac_ext
     960-CC=$ac_save_CC
     961-
     962-fi
     963-# AC_CACHE_VAL
     964-case "x$ac_cv_prog_cc_c89" in
     965-  x)
     966-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
     967-$as_echo "none needed" >&6; } ;;
     968-  xno)
     969-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
     970-$as_echo "unsupported" >&6; } ;;
     971-  *)
     972-    CC="$CC $ac_cv_prog_cc_c89"
     973-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
     974-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
     975-esac
     976-if test "x$ac_cv_prog_cc_c89" != xno; then :
     977-
     978-fi
     979-
     980-ac_ext=c
     981-ac_cpp='$CPP $CPPFLAGS'
     982-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     983-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     984-ac_compiler_gnu=$ac_cv_c_compiler_gnu
     985-
     986-depcc="$CC"   am_compiler_list=
     987-
     988-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
     989-$as_echo_n "checking dependency style of $depcc... " >&6; }
     990-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
     991-  $as_echo_n "(cached) " >&6
     992-else
     993-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
     994-  # We make a subdir and do the tests there.  Otherwise we can end up
     995-  # making bogus files that we don't know about and never remove.  For
     996-  # instance it was reported that on HP-UX the gcc test will end up
     997-  # making a dummy file named `D' -- because `-MD' means `put the output
     998-  # in D'.
     999-  rm -rf conftest.dir
     1000-  mkdir conftest.dir
     1001-  # Copy depcomp to subdir because otherwise we won't find it if we're
     1002-  # using a relative directory.
     1003-  cp "$am_depcomp" conftest.dir
     1004-  cd conftest.dir
     1005-  # We will build objects and dependencies in a subdirectory because
     1006-  # it helps to detect inapplicable dependency modes.  For instance
     1007-  # both Tru64's cc and ICC support -MD to output dependencies as a
     1008-  # side effect of compilation, but ICC will put the dependencies in
     1009-  # the current directory while Tru64 will put them in the object
     1010-  # directory.
     1011-  mkdir sub
     1012-
     1013-  am_cv_CC_dependencies_compiler_type=none
     1014-  if test "$am_compiler_list" = ""; then
     1015-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
     1016-  fi
     1017-  am__universal=false
     1018-  case " $depcc " in #(
     1019-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
     1020-     esac
     1021-
     1022-  for depmode in $am_compiler_list; do
     1023-    # Setup a source with many dependencies, because some compilers
     1024-    # like to wrap large dependency lists on column 80 (with \), and
     1025-    # we should not choose a depcomp mode which is confused by this.
     1026-    #
     1027-    # We need to recreate these files for each test, as the compiler may
     1028-    # overwrite some of them when testing with obscure command lines.
     1029-    # This happens at least with the AIX C compiler.
     1030-    : > sub/conftest.c
     1031-    for i in 1 2 3 4 5 6; do
     1032-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
     1033-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
     1034-      # Solaris 8's {/usr,}/bin/sh.
     1035-      touch sub/conftst$i.h
     1036-    done
     1037-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
     1038-
     1039-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
     1040-    # mode.  It turns out that the SunPro C++ compiler does not properly
     1041-    # handle `-M -o', and we need to detect this.  Also, some Intel
     1042-    # versions had trouble with output in subdirs
     1043-    am__obj=sub/conftest.${OBJEXT-o}
     1044-    am__minus_obj="-o $am__obj"
     1045-    case $depmode in
     1046-    gcc)
     1047-      # This depmode causes a compiler race in universal mode.
     1048-      test "$am__universal" = false || continue
     1049-      ;;
     1050-    nosideeffect)
     1051-      # after this tag, mechanisms are not by side-effect, so they'll
     1052-      # only be used when explicitly requested
     1053-      if test "x$enable_dependency_tracking" = xyes; then
     1054-       continue
     1055-      else
     1056-       break
     1057-      fi
     1058-      ;;
     1059-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
     1060-      # This compiler won't grok `-c -o', but also, the minuso test has
     1061-      # not run yet.  These depmodes are late enough in the game, and
     1062-      # so weak that their functioning should not be impacted.
     1063-      am__obj=conftest.${OBJEXT-o}
     1064-      am__minus_obj=
     1065-      ;;
     1066-    none) break ;;
     1067-    esac
     1068-    if depmode=$depmode \
     1069-       source=sub/conftest.c object=$am__obj \
     1070-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
     1071-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
     1072-         >/dev/null 2>conftest.err &&
     1073-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
     1074-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
     1075-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
     1076-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
     1077-      # icc doesn't choke on unknown options, it will just issue warnings
     1078-      # or remarks (even with -Werror).  So we grep stderr for any message
     1079-      # that says an option was ignored or not supported.
     1080-      # When given -MP, icc 7.0 and 7.1 complain thusly:
     1081-      #   icc: Command line warning: ignoring option '-M'; no argument required
     1082-      # The diagnosis changed in icc 8.0:
     1083-      #   icc: Command line remark: option '-MP' not supported
     1084-      if (grep 'ignoring option' conftest.err ||
     1085-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
     1086-        am_cv_CC_dependencies_compiler_type=$depmode
     1087-        break
     1088-      fi
     1089-    fi
     1090-  done
     1091-
     1092-  cd ..
     1093-  rm -rf conftest.dir
     1094-else
     1095-  am_cv_CC_dependencies_compiler_type=none
     1096-fi
     1097-
     1098-fi
     1099-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
     1100-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
     1101-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
     1102-
     1103- if
     1104-  test "x$enable_dependency_tracking" != xno \
     1105-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
     1106-  am__fastdepCC_TRUE=
     1107-  am__fastdepCC_FALSE='#'
     1108-else
     1109-  am__fastdepCC_TRUE='#'
     1110-  am__fastdepCC_FALSE=
     1111-fi
     1112-
     1113-
     1114-
     1115-if test -n "$ac_tool_prefix"; then
     1116-  for ac_prog in ar lib "link -lib"
     1117-  do
     1118-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     1119-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
     1120-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     1121-$as_echo_n "checking for $ac_word... " >&6; }
     1122-if ${ac_cv_prog_AR+:} false; then :
     1123-  $as_echo_n "(cached) " >&6
     1124-else
     1125-  if test -n "$AR"; then
     1126-  ac_cv_prog_AR="$AR" # Let the user override the test.
     1127-else
     1128-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     1129-for as_dir in $PATH
     1130-do
     1131-  IFS=$as_save_IFS
     1132-  test -z "$as_dir" && as_dir=.
     1133-    for ac_exec_ext in '' $ac_executable_extensions; do
     1134-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     1135-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     1136-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     1137-    break 2
     1138-  fi
     1139-done
     1140-  done
     1141-IFS=$as_save_IFS
     1142-
     1143-fi
     1144-fi
     1145-AR=$ac_cv_prog_AR
     1146-if test -n "$AR"; then
     1147-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
     1148-$as_echo "$AR" >&6; }
     1149-else
     1150-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     1151-$as_echo "no" >&6; }
     1152-fi
     1153-
     1154-
     1155-    test -n "$AR" && break
     1156-  done
     1157-fi
     1158-if test -z "$AR"; then
     1159-  ac_ct_AR=$AR
     1160-  for ac_prog in ar lib "link -lib"
     1161-do
     1162-  # Extract the first word of "$ac_prog", so it can be a program name with args.
     1163-set dummy $ac_prog; ac_word=$2
     1164-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     1165-$as_echo_n "checking for $ac_word... " >&6; }
     1166-if ${ac_cv_prog_ac_ct_AR+:} false; then :
     1167-  $as_echo_n "(cached) " >&6
     1168-else
     1169-  if test -n "$ac_ct_AR"; then
     1170-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
     1171-else
     1172-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     1173-for as_dir in $PATH
     1174-do
     1175-  IFS=$as_save_IFS
     1176-  test -z "$as_dir" && as_dir=.
     1177-    for ac_exec_ext in '' $ac_executable_extensions; do
     1178-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     1179-    ac_cv_prog_ac_ct_AR="$ac_prog"
     1180-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     1181-    break 2
     1182-  fi
     1183-done
     1184-  done
     1185-IFS=$as_save_IFS
     1186-
     1187-fi
     1188-fi
     1189-ac_ct_AR=$ac_cv_prog_ac_ct_AR
     1190-if test -n "$ac_ct_AR"; then
     1191-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
     1192-$as_echo "$ac_ct_AR" >&6; }
     1193-else
     1194-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     1195-$as_echo "no" >&6; }
     1196-fi
     1197-
     1198-
     1199-  test -n "$ac_ct_AR" && break
     1200-done
     1201-
     1202-  if test "x$ac_ct_AR" = x; then
     1203-    AR="false"
     1204-  else
     1205-    case $cross_compiling:$ac_tool_warned in
     1206-yes:)
     1207-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     1208-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     1209-ac_tool_warned=yes ;;
     1210-esac
     1211-    AR=$ac_ct_AR
     1212-  fi
     1213-fi
     1214-
     1215-: ${AR=ar}
     1216-
     1217-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
     1218-$as_echo_n "checking the archiver ($AR) interface... " >&6; }
     1219-if ${am_cv_ar_interface+:} false; then :
     1220-  $as_echo_n "(cached) " >&6
     1221-else
     1222-  am_cv_ar_interface=ar
     1223-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     1224-/* end confdefs.h.  */
     1225-int some_variable = 0;
     1226-_ACEOF
     1227-if ac_fn_c_try_compile "$LINENO"; then :
     1228-  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
     1229-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
     1230-  (eval $am_ar_try) 2>&5
     1231-  ac_status=$?
     1232-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     1233-  test $ac_status = 0; }
     1234-      if test "$ac_status" -eq 0; then
     1235-        am_cv_ar_interface=ar
     1236-      else
     1237-        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
     1238-        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
     1239-  (eval $am_ar_try) 2>&5
     1240-  ac_status=$?
     1241-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     1242-  test $ac_status = 0; }
     1243-        if test "$ac_status" -eq 0; then
     1244-          am_cv_ar_interface=lib
     1245-        else
     1246-          am_cv_ar_interface=unknown
     1247-        fi
     1248-      fi
     1249-      rm -f conftest.lib libconftest.a
     1250-
     1251-fi
     1252-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     1253-
     1254-fi
     1255-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
     1256-$as_echo "$am_cv_ar_interface" >&6; }
     1257-
     1258-case $am_cv_ar_interface in
     1259-ar)
     1260-  ;;
     1261-lib)
     1262-  # Microsoft lib, so override with the ar-lib wrapper script.
     1263-  # FIXME: It is wrong to rewrite AR.
     1264-  # But if we don't then we get into trouble of one sort or another.
     1265-  # A longer-term fix would be to have automake use am__AR in this case,
     1266-  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
     1267-  # similar.
     1268-  AR="$am_aux_dir/ar-lib $AR"
     1269-  ;;
     1270-unknown)
     1271-  as_fn_error $? "could not determine $AR interface" "$LINENO" 5
     1272-  ;;
     1273-esac
     1274-
     1275-
     1276 # Make sure we can run config.sub.
     1277 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
     1278   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
     1279@@ -4770,6 +3627,256 @@
     1280   test $ac_status = 0; }
     1281 done
     1282 
     1283+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     1284+/* end confdefs.h.  */
     1285+
     1286+int
     1287+main ()
     1288+{
     1289+
     1290+  ;
     1291+  return 0;
     1292+}
     1293+_ACEOF
     1294+ac_clean_files_save=$ac_clean_files
     1295+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
     1296+# Try to create an executable without -o first, disregard a.out.
     1297+# It will help us diagnose broken compilers, and finding out an intuition
     1298+# of exeext.
     1299+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
     1300+$as_echo_n "checking whether the C compiler works... " >&6; }
     1301+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
     1302+
     1303+# The possible output files:
     1304+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
     1305+
     1306+ac_rmfiles=
     1307+for ac_file in $ac_files
     1308+do
     1309+  case $ac_file in
     1310+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     1311+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
     1312+  esac
     1313+done
     1314+rm -f $ac_rmfiles
     1315+
     1316+if { { ac_try="$ac_link_default"
     1317+case "(($ac_try" in
     1318+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     1319+  *) ac_try_echo=$ac_try;;
     1320+esac
     1321+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     1322+$as_echo "$ac_try_echo"; } >&5
     1323+  (eval "$ac_link_default") 2>&5
     1324+  ac_status=$?
     1325+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     1326+  test $ac_status = 0; }; then :
     1327+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
     1328+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
     1329+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
     1330+# so that the user can short-circuit this test for compilers unknown to
     1331+# Autoconf.
     1332+for ac_file in $ac_files ''
     1333+do
     1334+  test -f "$ac_file" || continue
     1335+  case $ac_file in
     1336+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
     1337+       ;;
     1338+    [ab].out )
     1339+       # We found the default executable, but exeext='' is most
     1340+       # certainly right.
     1341+       break;;
     1342+    *.* )
     1343+       if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
     1344+       then :; else
     1345+          ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
     1346+       fi
     1347+       # We set ac_cv_exeext here because the later test for it is not
     1348+       # safe: cross compilers may not add the suffix if given an `-o'
     1349+       # argument, so we may need to know it at that point already.
     1350+       # Even if this section looks crufty: it has the advantage of
     1351+       # actually working.
     1352+       break;;
     1353+    * )
     1354+       break;;
     1355+  esac
     1356+done
     1357+test "$ac_cv_exeext" = no && ac_cv_exeext=
     1358+
     1359+else
     1360+  ac_file=''
     1361+fi
     1362+if test -z "$ac_file"; then :
     1363+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     1364+$as_echo "no" >&6; }
     1365+$as_echo "$as_me: failed program was:" >&5
     1366+sed 's/^/| /' conftest.$ac_ext >&5
     1367+
     1368+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     1369+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     1370+as_fn_error 77 "C compiler cannot create executables
     1371+See \`config.log' for more details" "$LINENO" 5; }
     1372+else
     1373+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     1374+$as_echo "yes" >&6; }
     1375+fi
     1376+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
     1377+$as_echo_n "checking for C compiler default output file name... " >&6; }
     1378+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
     1379+$as_echo "$ac_file" >&6; }
     1380+ac_exeext=$ac_cv_exeext
     1381+
     1382+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
     1383+ac_clean_files=$ac_clean_files_save
     1384+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
     1385+$as_echo_n "checking for suffix of executables... " >&6; }
     1386+if { { ac_try="$ac_link"
     1387+case "(($ac_try" in
     1388+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     1389+  *) ac_try_echo=$ac_try;;
     1390+esac
     1391+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     1392+$as_echo "$ac_try_echo"; } >&5
     1393+  (eval "$ac_link") 2>&5
     1394+  ac_status=$?
     1395+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     1396+  test $ac_status = 0; }; then :
     1397+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
     1398+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
     1399+# work properly (i.e., refer to `conftest.exe'), while it won't with
     1400+# `rm'.
     1401+for ac_file in conftest.exe conftest conftest.*; do
     1402+  test -f "$ac_file" || continue
     1403+  case $ac_file in
     1404+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     1405+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
     1406+         break;;
     1407+    * ) break;;
     1408+  esac
     1409+done
     1410+else
     1411+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     1412+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     1413+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
     1414+See \`config.log' for more details" "$LINENO" 5; }
     1415+fi
     1416+rm -f conftest conftest$ac_cv_exeext
     1417+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
     1418+$as_echo "$ac_cv_exeext" >&6; }
     1419+
     1420+rm -f conftest.$ac_ext
     1421+EXEEXT=$ac_cv_exeext
     1422+ac_exeext=$EXEEXT
     1423+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     1424+/* end confdefs.h.  */
     1425+#include <stdio.h>
     1426+int
     1427+main ()
     1428+{
     1429+FILE *f = fopen ("conftest.out", "w");
     1430+ return ferror (f) || fclose (f) != 0;
     1431+
     1432+  ;
     1433+  return 0;
     1434+}
     1435+_ACEOF
     1436+ac_clean_files="$ac_clean_files conftest.out"
     1437+# Check that the compiler produces executables we can run.  If not, either
     1438+# the compiler is broken, or we cross compile.
     1439+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
     1440+$as_echo_n "checking whether we are cross compiling... " >&6; }
     1441+if test "$cross_compiling" != yes; then
     1442+  { { ac_try="$ac_link"
     1443+case "(($ac_try" in
     1444+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     1445+  *) ac_try_echo=$ac_try;;
     1446+esac
     1447+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     1448+$as_echo "$ac_try_echo"; } >&5
     1449+  (eval "$ac_link") 2>&5
     1450+  ac_status=$?
     1451+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     1452+  test $ac_status = 0; }
     1453+  if { ac_try='./conftest$ac_cv_exeext'
     1454+  { { case "(($ac_try" in
     1455+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     1456+  *) ac_try_echo=$ac_try;;
     1457+esac
     1458+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     1459+$as_echo "$ac_try_echo"; } >&5
     1460+  (eval "$ac_try") 2>&5
     1461+  ac_status=$?
     1462+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     1463+  test $ac_status = 0; }; }; then
     1464+    cross_compiling=no
     1465+  else
     1466+    if test "$cross_compiling" = maybe; then
     1467+       cross_compiling=yes
     1468+    else
     1469+       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     1470+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     1471+as_fn_error $? "cannot run C compiled programs.
     1472+If you meant to cross compile, use \`--host'.
     1473+See \`config.log' for more details" "$LINENO" 5; }
     1474+    fi
     1475+  fi
     1476+fi
     1477+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
     1478+$as_echo "$cross_compiling" >&6; }
     1479+
     1480+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
     1481+ac_clean_files=$ac_clean_files_save
     1482+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
     1483+$as_echo_n "checking for suffix of object files... " >&6; }
     1484+if ${ac_cv_objext+:} false; then :
     1485+  $as_echo_n "(cached) " >&6
     1486+else
     1487+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     1488+/* end confdefs.h.  */
     1489+
     1490+int
     1491+main ()
     1492+{
     1493+
     1494+  ;
     1495+  return 0;
     1496+}
     1497+_ACEOF
     1498+rm -f conftest.o conftest.obj
     1499+if { { ac_try="$ac_compile"
     1500+case "(($ac_try" in
     1501+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     1502+  *) ac_try_echo=$ac_try;;
     1503+esac
     1504+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
     1505+$as_echo "$ac_try_echo"; } >&5
     1506+  (eval "$ac_compile") 2>&5
     1507+  ac_status=$?
     1508+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     1509+  test $ac_status = 0; }; then :
     1510+  for ac_file in conftest.o conftest.obj conftest.*; do
     1511+  test -f "$ac_file" || continue;
     1512+  case $ac_file in
     1513+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     1514+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
     1515+       break;;
     1516+  esac
     1517+done
     1518+else
     1519+  $as_echo "$as_me: failed program was:" >&5
     1520+sed 's/^/| /' conftest.$ac_ext >&5
     1521+
     1522+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     1523+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     1524+as_fn_error $? "cannot compute suffix of object files: cannot compile
     1525+See \`config.log' for more details" "$LINENO" 5; }
     1526+fi
     1527+rm -f conftest.$ac_cv_objext conftest.$ac_ext
     1528+fi
     1529+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
     1530+$as_echo "$ac_cv_objext" >&6; }
     1531+OBJEXT=$ac_cv_objext
     1532+ac_objext=$OBJEXT
     1533 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
     1534 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
     1535 if ${ac_cv_c_compiler_gnu+:} false; then :
     1536@@ -4980,6 +4087,69 @@
     1537 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     1538 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     1539 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     1540+DEPDIR="${am__leading_dot}deps"
     1541+
     1542+ac_config_commands="$ac_config_commands depfiles"
     1543+
     1544+
     1545+am_make=${MAKE-make}
     1546+cat > confinc << 'END'
     1547+am__doit:
     1548+       @echo this is the am__doit target
     1549+.PHONY: am__doit
     1550+END
     1551+# If we don't find an include directive, just comment out the code.
     1552+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
     1553+$as_echo_n "checking for style of include used by $am_make... " >&6; }
     1554+am__include="#"
     1555+am__quote=
     1556+_am_result=none
     1557+# First try GNU make style include.
     1558+echo "include confinc" > confmf
     1559+# Ignore all kinds of additional output from `make'.
     1560+case `$am_make -s -f confmf 2> /dev/null` in #(
     1561+*the\ am__doit\ target*)
     1562+  am__include=include
     1563+  am__quote=
     1564+  _am_result=GNU
     1565+  ;;
     1566+esac
     1567+# Now try BSD make style include.
     1568+if test "$am__include" = "#"; then
     1569+   echo '.include "confinc"' > confmf
     1570+   case `$am_make -s -f confmf 2> /dev/null` in #(
     1571+   *the\ am__doit\ target*)
     1572+     am__include=.include
     1573+     am__quote="\""
     1574+     _am_result=BSD
     1575+     ;;
     1576+   esac
     1577+fi
     1578+
     1579+
     1580+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
     1581+$as_echo "$_am_result" >&6; }
     1582+rm -f confinc confmf
     1583+
     1584+# Check whether --enable-dependency-tracking was given.
     1585+if test "${enable_dependency_tracking+set}" = set; then :
     1586+  enableval=$enable_dependency_tracking;
     1587+fi
     1588+
     1589+if test "x$enable_dependency_tracking" != xno; then
     1590+  am_depcomp="$ac_aux_dir/depcomp"
     1591+  AMDEPBACKSLASH='\'
     1592+  am__nodep='_no'
     1593+fi
     1594+ if test "x$enable_dependency_tracking" != xno; then
     1595+  AMDEP_TRUE=
     1596+  AMDEP_FALSE='#'
     1597+else
     1598+  AMDEP_TRUE='#'
     1599+  AMDEP_FALSE=
     1600+fi
     1601+
     1602+
     1603 
     1604 depcc="$CC"   am_compiler_list=
     1605 
     1606@@ -5116,6 +4286,171 @@
     1607 ac_compiler_gnu=$ac_cv_c_compiler_gnu
     1608 
     1609 
     1610+# Automake 1.12 seems to require this, but automake 1.11 doesn't recognize it.
     1611+# Do not call AM_PROG_AR before MPC_GMP_CC_CFLAGS, since otherwise ac_cv_prog_CC
     1612+# is already set and overrides our CC setting (which may come from gmp.h).
     1613+
     1614+if test -n "$ac_tool_prefix"; then
     1615+  for ac_prog in ar lib "link -lib"
     1616+  do
     1617+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     1618+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
     1619+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     1620+$as_echo_n "checking for $ac_word... " >&6; }
     1621+if ${ac_cv_prog_AR+:} false; then :
     1622+  $as_echo_n "(cached) " >&6
     1623+else
     1624+  if test -n "$AR"; then
     1625+  ac_cv_prog_AR="$AR" # Let the user override the test.
     1626+else
     1627+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     1628+for as_dir in $PATH
     1629+do
     1630+  IFS=$as_save_IFS
     1631+  test -z "$as_dir" && as_dir=.
     1632+    for ac_exec_ext in '' $ac_executable_extensions; do
     1633+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     1634+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     1635+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     1636+    break 2
     1637+  fi
     1638+done
     1639+  done
     1640+IFS=$as_save_IFS
     1641+
     1642+fi
     1643+fi
     1644+AR=$ac_cv_prog_AR
     1645+if test -n "$AR"; then
     1646+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
     1647+$as_echo "$AR" >&6; }
     1648+else
     1649+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     1650+$as_echo "no" >&6; }
     1651+fi
     1652+
     1653+
     1654+    test -n "$AR" && break
     1655+  done
     1656+fi
     1657+if test -z "$AR"; then
     1658+  ac_ct_AR=$AR
     1659+  for ac_prog in ar lib "link -lib"
     1660+do
     1661+  # Extract the first word of "$ac_prog", so it can be a program name with args.
     1662+set dummy $ac_prog; ac_word=$2
     1663+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     1664+$as_echo_n "checking for $ac_word... " >&6; }
     1665+if ${ac_cv_prog_ac_ct_AR+:} false; then :
     1666+  $as_echo_n "(cached) " >&6
     1667+else
     1668+  if test -n "$ac_ct_AR"; then
     1669+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
     1670+else
     1671+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     1672+for as_dir in $PATH
     1673+do
     1674+  IFS=$as_save_IFS
     1675+  test -z "$as_dir" && as_dir=.
     1676+    for ac_exec_ext in '' $ac_executable_extensions; do
     1677+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     1678+    ac_cv_prog_ac_ct_AR="$ac_prog"
     1679+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     1680+    break 2
     1681+  fi
     1682+done
     1683+  done
     1684+IFS=$as_save_IFS
     1685+
     1686+fi
     1687+fi
     1688+ac_ct_AR=$ac_cv_prog_ac_ct_AR
     1689+if test -n "$ac_ct_AR"; then
     1690+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
     1691+$as_echo "$ac_ct_AR" >&6; }
     1692+else
     1693+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     1694+$as_echo "no" >&6; }
     1695+fi
     1696+
     1697+
     1698+  test -n "$ac_ct_AR" && break
     1699+done
     1700+
     1701+  if test "x$ac_ct_AR" = x; then
     1702+    AR="false"
     1703+  else
     1704+    case $cross_compiling:$ac_tool_warned in
     1705+yes:)
     1706+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     1707+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     1708+ac_tool_warned=yes ;;
     1709+esac
     1710+    AR=$ac_ct_AR
     1711+  fi
     1712+fi
     1713+
     1714+: ${AR=ar}
     1715+
     1716+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
     1717+$as_echo_n "checking the archiver ($AR) interface... " >&6; }
     1718+if ${am_cv_ar_interface+:} false; then :
     1719+  $as_echo_n "(cached) " >&6
     1720+else
     1721+  am_cv_ar_interface=ar
     1722+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     1723+/* end confdefs.h.  */
     1724+int some_variable = 0;
     1725+_ACEOF
     1726+if ac_fn_c_try_compile "$LINENO"; then :
     1727+  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
     1728+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
     1729+  (eval $am_ar_try) 2>&5
     1730+  ac_status=$?
     1731+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     1732+  test $ac_status = 0; }
     1733+      if test "$ac_status" -eq 0; then
     1734+        am_cv_ar_interface=ar
     1735+      else
     1736+        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
     1737+        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
     1738+  (eval $am_ar_try) 2>&5
     1739+  ac_status=$?
     1740+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     1741+  test $ac_status = 0; }
     1742+        if test "$ac_status" -eq 0; then
     1743+          am_cv_ar_interface=lib
     1744+        else
     1745+          am_cv_ar_interface=unknown
     1746+        fi
     1747+      fi
     1748+      rm -f conftest.lib libconftest.a
     1749+
     1750+fi
     1751+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     1752+
     1753+fi
     1754+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
     1755+$as_echo "$am_cv_ar_interface" >&6; }
     1756+
     1757+case $am_cv_ar_interface in
     1758+ar)
     1759+  ;;
     1760+lib)
     1761+  # Microsoft lib, so override with the ar-lib wrapper script.
     1762+  # FIXME: It is wrong to rewrite AR.
     1763+  # But if we don't then we get into trouble of one sort or another.
     1764+  # A longer-term fix would be to have automake use am__AR in this case,
     1765+  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
     1766+  # similar.
     1767+  AR="$am_aux_dir/ar-lib $AR"
     1768+  ;;
     1769+unknown)
     1770+  as_fn_error $? "could not determine $AR interface" "$LINENO" 5
     1771+  ;;
     1772+esac
     1773+
     1774+
     1775 # Set up LibTool
     1776 case `pwd` in
     1777   *\ * | *\    *)
     1778@@ -14665,7 +14000,7 @@
     1779 
     1780          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for current svn version" >&5
     1781 $as_echo_n "checking for current svn version... " >&6; }
     1782-         SVNVERSION=1241M
     1783+         SVNVERSION=exported
     1784 
     1785          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SVNVERSION" >&5
     1786 $as_echo "$SVNVERSION" >&6; }
     1787@@ -14805,10 +14140,6 @@
     1788   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
     1789 Usually this means the macro was only invoked conditionally." "$LINENO" 5
     1790 fi
     1791-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
     1792-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
     1793-Usually this means the macro was only invoked conditionally." "$LINENO" 5
     1794-fi
     1795 
     1796 : "${CONFIG_STATUS=./config.status}"
     1797 ac_write_fail=0
     1798diff -rud src/Makefile.in b/Makefile.in
     1799--- src/Makefile.in     2012-07-19 14:33:58.000000000 +0200
     1800+++ b/Makefile.in       2012-08-01 15:56:48.000000000 +0200
     1801@@ -1,4 +1,4 @@
     1802-# Makefile.in generated by automake 1.11.5 from Makefile.am.
     1803+# Makefile.in generated by automake 1.11.6 from Makefile.am.
     1804 # @configure_input@
     1805 
     1806 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
     1807@@ -634,7 +634,7 @@
     1808        *.zip*) \
     1809          unzip $(distdir).zip ;;\
     1810        esac
     1811-       chmod -R a-w $(distdir); chmod a+w $(distdir)
     1812+       chmod -R a-w $(distdir); chmod u+w $(distdir)
     1813        mkdir $(distdir)/_build
     1814        mkdir $(distdir)/_inst
     1815        chmod a-w $(distdir)
     1816diff -rud src/doc/Makefile.in b/doc/Makefile.in
     1817--- src/doc/Makefile.in 2012-07-19 14:33:58.000000000 +0200
     1818+++ b/doc/Makefile.in   2012-08-01 15:56:47.000000000 +0200
     1819@@ -1,4 +1,4 @@
     1820-# Makefile.in generated by automake 1.11.5 from Makefile.am.
     1821+# Makefile.in generated by automake 1.11.6 from Makefile.am.
     1822 # @configure_input@
     1823 
     1824 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
     1825diff -rud src/src/Makefile.in b/src/Makefile.in
     1826--- src/src/Makefile.in 2012-07-19 14:33:58.000000000 +0200
     1827+++ b/src/Makefile.in   2012-08-01 15:56:47.000000000 +0200
     1828@@ -1,4 +1,4 @@
     1829-# Makefile.in generated by automake 1.11.5 from Makefile.am.
     1830+# Makefile.in generated by automake 1.11.6 from Makefile.am.
     1831 # @configure_input@
     1832 
     1833 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
     1834diff -rud src/tests/Makefile.in b/tests/Makefile.in
     1835--- src/tests/Makefile.in       2012-07-19 14:33:58.000000000 +0200
     1836+++ b/tests/Makefile.in 2012-08-01 15:56:47.000000000 +0200
     1837@@ -1,4 +1,4 @@
     1838-# Makefile.in generated by automake 1.11.5 from Makefile.am.
     1839+# Makefile.in generated by automake 1.11.6 from Makefile.am.
     1840 # @configure_input@
     1841 
     1842 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
  • deleted file patches/no_fortify_source.patch

    diff --git a/patches/no_fortify_source.patch b/patches/no_fortify_source.patch
    deleted file mode 100644
    + -  
    1 diff -ru mpc-1.0.0dev1126/m4/mpc.m4 mpc-1.0.0dev1126M/m4/mpc.m4
    2 --- mpc-1.0.0dev1126/m4/mpc.m4  2012-03-22 15:02:41.000000000 +0100
    3 +++ mpc-1.0.0dev1126M/m4/mpc.m4 2012-03-23 14:08:42.000000000 +0100
    4 @@ -91,10 +91,6 @@
    5    AC_REQUIRE([AC_PROG_GREP])
    6    if echo $VERSION | grep -c dev >/dev/null 2>&1 ; then
    7      if test "x$GCC" = "xyes" -a "x$compiler" != "xicc" -a "x$compiler" != "xg++"; then
    8 -      case $host in
    9 -         *darwin*) ;;
    10 -         *) MPC_C_CHECK_FLAG(-D_FORTIFY_SOURCE=2,$1) ;;
    11 -      esac
    12        MPC_C_CHECK_FLAG(-g)
    13        MPC_C_CHECK_FLAG(-std=c99)
    14        MPC_C_CHECK_FLAG(-pedantic)
    15 diff -ru mpc-1.0.0dev1126/configure mpc-1.0.0dev1126M/configure
    16 --- mpc-1.0.0dev1126/configure  2012-03-23 10:05:22.000000000 +0100
    17 +++ mpc-1.0.0dev1126M/configure 2012-03-23 14:08:55.000000000 +0100
    18 @@ -11630,85 +11630,6 @@
    19  
    20    if echo $VERSION | grep -c dev >/dev/null 2>&1 ; then
    21      if test "x$GCC" = "xyes" -a "x$compiler" != "xicc" -a "x$compiler" != "xg++"; then
    22 -      case $host in
    23 -         *darwin*) ;;
    24 -         *)
    25 -
    26 -
    27 -
    28 -
    29 -
    30 -  flag=`echo "-D_FORTIFY_SOURCE=2" | $SED 'y% .=/+-(){}<>:*,%_______________%'`
    31 -
    32 -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler accepts the -D_FORTIFY_SOURCE=2 flag" >&5
    33 -$as_echo_n "checking whether the C compiler accepts the -D_FORTIFY_SOURCE=2 flag... " >&6; }
    34 -if eval \${ax_cv_c_check_flag_$flag+:} false; then :
    35 -  $as_echo_n "(cached) " >&6
    36 -else
    37 -
    38 -
    39 -    ac_ext=c
    40 -ac_cpp='$CPP $CPPFLAGS'
    41 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    42 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    43 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
    44 -
    45 -
    46 -    save_CFLAGS="$CFLAGS"
    47 -    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
    48 -    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    49 -/* end confdefs.h.  */
    50 -
    51 -
    52 -int
    53 -main ()
    54 -{
    55 -
    56 -  ;
    57 -  return 0;
    58 -}
    59 -
    60 -_ACEOF
    61 -if ac_fn_c_try_compile "$LINENO"; then :
    62 -
    63 -      eval "ax_cv_c_check_flag_$flag=yes"
    64 -
    65 -else
    66 -
    67 -      eval "ax_cv_c_check_flag_$flag=no"
    68 -
    69 -fi
    70 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    71 -
    72 -    CFLAGS="$save_CFLAGS"
    73 -
    74 -    ac_ext=c
    75 -ac_cpp='$CPP $CPPFLAGS'
    76 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
    77 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    78 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
    79 -
    80 -
    81 -
    82 -fi
    83 -eval ac_res=\$ax_cv_c_check_flag_$flag
    84 -              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
    85 -$as_echo "$ac_res" >&6; }
    86 -
    87 -  if eval "test \"`echo '$ax_cv_c_check_flag_'$flag`\" = yes"; then :
    88 -
    89 -    :
    90 -    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
    91 -
    92 -else
    93 -
    94 -    :
    95 -
    96 -
    97 -fi
    98 -
    99 - ;;
    100 -      esac
    101  
    102  
    103  
  • spkg-check

    diff --git a/spkg-check b/spkg-check
    a b  
    66    exit 1
    77fi
    88
    9 # Unset RM because it messes with libtool
    10 unset RM
    11 
    129cd src
    1310
    1411$MAKE check
  • spkg-install

    diff --git a/spkg-install b/spkg-install
    a b  
    66    exit 1
    77fi
    88
    9 # Unset RM since it messes with libtool
    10 unset RM
    11 
    129cd src
    1310
    1411# Apply patches.  See SPKG.txt for information about what each patch
    1512# does.
    1613for patch in ../patches/*.patch; do
     14    [ -r "$patch" ] || continue  # Skip non-existing or non-readable patches
    1715    patch -p1 <"$patch"
    1816    if [ $? -ne 0 ]; then
    1917        echo >&2 "Error applying '$patch'"