[freefempp] 02/04: Merge tag 'upstream/3.36' into experimental

Dimitrios Eftaxiopoulos eftaxiop-guest at moszumanska.debian.org
Fri Mar 27 19:41:24 UTC 2015


This is an automated email from the git hooks/post-receive script.

eftaxiop-guest pushed a commit to branch experimental
in repository freefempp.

commit f325eec482482ca74c7b484a0dbdbb0479b76878
Merge: f11fe08 12a4ddf
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Fri Mar 27 18:36:35 2015 +0200

    Merge tag 'upstream/3.36' into experimental
    
    Upstream version 3.36
    
    Conflicts:
    	DOC/Makefile.in
    	Makefile.in
    	aclocal.m4
    	configure
    	download/Makefile
    	download/arpack/Makefile
    	download/blas/Makefile.in
    	download/fftw/Makefile
    	download/umfpack/Makefile
    	examples++-3d/Makefile.in
    	examples++-bug/Makefile.in
    	examples++-chapt3/Makefile.in
    	examples++-eigen/Makefile.in
    	examples++-load/Makefile.in
    	examples++-mpi/Makefile.in
    	examples++-other/Makefile.in
    	examples++-tutorial/Makefile.in
    	examples++/Makefile.in
    	src/Algo/Makefile.in
    	src/Graphics/Makefile.in
    	src/Makefile.in
    	src/bamg/Makefile.in
    	src/bamglib/Makefile.in
    	src/bin-win32/Makefile.in
    	src/femlib/Makefile.in
    	src/fflib/Makefile.in
    	src/fflib/strversionnumber.cpp
    	src/lglib/Makefile.in
    	src/libMesh/Makefile.in
    	src/medit/Makefile.in
    	src/mpi/Makefile.in
    	src/nw/Makefile.in

 ._TODO                                       |   Bin 171 -> 0 bytes
 ._ax_lib_hdf5.m4                             |   Bin 507 -> 0 bytes
 DOC/Makefile.in                              |   687 +
 DOC/freefem++doc.pdf                         |   Bin 9576121 -> 9566844 bytes
 HISTORY                                      |   172 +-
 INNOVATION                                   |   236 +-
 Makefile.in                                  |  1212 ++
 README_MAC                                   |    18 +-
 aclocal.m4                                   |  1206 ++
 aclocal.m4.orig                              |  1206 ++
 acmpi.m4                                     |     4 +-
 config.h.in                                  |     3 +
 configure                                    | 20888 +++++++++++++++++++++++++
 configure.ac                                 |    23 +-
 download/Makefile                            |   634 +-
 download/Makefile.am                         |    10 +-
 download/{Makefile => Makefile.orig}         |   331 +-
 download/arpack/Makefile                     |   637 +-
 download/blas/Makefile.in                    |  4360 ++++++
 download/fftw/Makefile                       |   613 +-
 download/fftw/{Makefile => Makefile.orig}    |   314 +-
 download/gmm/cxxflags                        |     3 +-
 download/parmetis/Makefile-parmetis.in       |     5 +-
 download/parmetis/makefile                   |    13 +-
 download/parmetis/parmetis-3.1.1.patch       |    21 -
 download/parmetis/parmetis-4.0.3.patch       |    32 +
 download/parms/makefile-parms.in             |     2 +-
 download/pastix/Makefile                     |     8 +-
 download/pastix/config-pastix-complex.in     |     4 +-
 download/pastix/config-pastix-real.in        |     2 +-
 download/scotch/Makefile                     |     4 +-
 download/scotch/Makefile-scotch.inc          |    15 +-
 download/umfpack/Makefile                    |   621 +-
 download/umfpack/{Makefile => Makefile.orig} |   314 +-
 examples++-3d/Makefile.in                    |  1241 ++
 examples++-bug/Makefile.in                   |   592 +
 examples++-chapt3/Makefile.in                |  1123 ++
 examples++-eigen/Makefile.in                 |  1054 ++
 examples++-load/Makefile.am                  |     6 +-
 examples++-load/Makefile.in                  |  1842 +++
 examples++-load/metis.cpp                    |     8 +-
 examples++-load/scotch.cpp                   |    85 +-
 examples++-mpi/DDM-Schwarz-Lame-2d.edp       |     2 +-
 examples++-mpi/DDM-Schwarz-Lame-3d.edp       |     2 +-
 examples++-mpi/DDM-Schwarz-Lap-2dd.edp       |    10 +-
 examples++-mpi/DDM-Schwarz-Lap-3d.edp        |     2 +-
 examples++-mpi/DDM-Schwarz-Stokes-2d.edp     |     2 +-
 examples++-mpi/DDM-Schwarz-macro.idp         |    19 +-
 examples++-mpi/DDM-funcs-v2.idp              |     1 +
 examples++-mpi/MPIGMRES2D.edp                |     2 +-
 examples++-mpi/MPIGMRES3D.edp                |     2 +-
 examples++-mpi/Makefile.am                   |     6 +-
 examples++-mpi/Makefile.in                   |  1287 ++
 examples++-mpi/NSCaraCyl.edp                 |   336 +
 examples++-mpi/additional.idp                |    92 +-
 examples++-mpi/diffusion-3d.edp              |   183 +
 examples++-mpi/elasticity-3d.edp             |   196 +
 examples++-mpi/func-max.idp                  |    72 +
 examples++-mpi/schwarz-add-macro.idp         |   214 +
 examples++-mpi/schwarz-macro.idp             |   244 +
 examples++-mpi/schwarz.cpp                   |   280 +-
 examples++-mpi/schwarz.edp                   |     5 +-
 examples++-mpi/utility.cpp                   |    96 +-
 examples++-other/Makefile.in                 |   967 ++
 examples++-tutorial/Makefile.in              |  1417 ++
 examples++/Makefile.in                       |  1136 ++
 src/Algo/Makefile.in                         |   600 +
 src/Graphics/Makefile.in                     |   601 +
 src/Makefile.in                              |   796 +
 src/bamg/Makefile.in                         |   781 +
 src/bamglib/Makefile.in                      |   601 +
 src/bin-win32/Makefile.in                    |   666 +
 src/femlib/Makefile.in                       |   628 +
 src/femlib/RNM.hpp                           |    35 +-
 src/femlib/RNM_op.hpp                        |     4 +-
 src/fflib/Makefile.in                        |  1412 ++
 src/fflib/array_complex.cpp                  |     4 +-
 src/fflib/array_long.cpp                     |    13 +-
 src/fflib/array_real.cpp                     |    15 +-
 src/fflib/array_tlp.hpp                      |    60 +-
 src/fflib/lgmat.cpp                          |   215 +-
 src/fflib/lgmesh.cpp                         |    42 +
 src/fflib/problem.cpp                        |     5 +-
 src/fflib/strversionnumber.cpp               |     4 +-
 src/lglib/Makefile.in                        |   753 +
 src/libMesh/Makefile.in                      |   733 +
 src/medit/Makefile.in                        |   857 +
 src/mpi/Makefile.in                          |   912 ++
 src/nw/Makefile.in                           |  1024 ++
 89 files changed, 55170 insertions(+), 1713 deletions(-)

diff --cc aclocal.m4.orig
index 0000000,0000000..99dd963
new file mode 100644
--- /dev/null
+++ b/aclocal.m4.orig
@@@ -1,0 -1,0 +1,1206 @@@
++# generated automatically by aclocal 1.15 -*- Autoconf -*-
++
++# Copyright (C) 1996-2014 Free Software Foundation, Inc.
++
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
++m4_ifndef([AC_AUTOCONF_VERSION],
++  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
++[m4_warning([this file was generated for autoconf 2.69.
++You have another version of autoconf.  It may work, but is not guaranteed to.
++If you have problems, you may need to regenerate the build system entirely.
++To do so, use the procedure documented by the package, typically 'autoreconf'.])])
++
++# Copyright (C) 2002-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_AUTOMAKE_VERSION(VERSION)
++# ----------------------------
++# Automake X.Y traces this macro to ensure aclocal.m4 has been
++# generated from the m4 files accompanying Automake X.Y.
++# (This private macro should not be called outside this file.)
++AC_DEFUN([AM_AUTOMAKE_VERSION],
++[am__api_version='1.15'
++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
++dnl require some minimum version.  Point them to the right macro.
++m4_if([$1], [1.15], [],
++      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
++])
++
++# _AM_AUTOCONF_VERSION(VERSION)
++# -----------------------------
++# aclocal traces this macro to find the Autoconf version.
++# This is a private macro too.  Using m4_define simplifies
++# the logic in aclocal, which can simply ignore this definition.
++m4_define([_AM_AUTOCONF_VERSION], [])
++
++# AM_SET_CURRENT_AUTOMAKE_VERSION
++# -------------------------------
++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
++[AM_AUTOMAKE_VERSION([1.15])dnl
++m4_ifndef([AC_AUTOCONF_VERSION],
++  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
++
++# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
++
++# Copyright (C) 2001-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
++# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
++# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
++#
++# Of course, Automake must honor this variable whenever it calls a
++# tool from the auxiliary directory.  The problem is that $srcdir (and
++# therefore $ac_aux_dir as well) can be either absolute or relative,
++# depending on how configure is run.  This is pretty annoying, since
++# it makes $ac_aux_dir quite unusable in subdirectories: in the top
++# source directory, any form will work fine, but in subdirectories a
++# relative path needs to be adjusted first.
++#
++# $ac_aux_dir/missing
++#    fails when called from a subdirectory if $ac_aux_dir is relative
++# $top_srcdir/$ac_aux_dir/missing
++#    fails if $ac_aux_dir is absolute,
++#    fails when called from a subdirectory in a VPATH build with
++#          a relative $ac_aux_dir
++#
++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
++# are both prefixed by $srcdir.  In an in-source build this is usually
++# harmless because $srcdir is '.', but things will broke when you
++# start a VPATH build or use an absolute $srcdir.
++#
++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
++# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
++#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
++# and then we would define $MISSING as
++#   MISSING="\${SHELL} $am_aux_dir/missing"
++# This will work as long as MISSING is not called from configure, because
++# unfortunately $(top_srcdir) has no meaning in configure.
++# However there are other variables, like CC, which are often used in
++# configure, and could therefore not use this "fixed" $ac_aux_dir.
++#
++# Another solution, used here, is to always expand $ac_aux_dir to an
++# absolute PATH.  The drawback is that using absolute paths prevent a
++# configured tree to be moved without reconfiguration.
++
++AC_DEFUN([AM_AUX_DIR_EXPAND],
++[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
++# Expand $ac_aux_dir to an absolute path.
++am_aux_dir=`cd "$ac_aux_dir" && pwd`
++])
++
++# AM_CONDITIONAL                                            -*- Autoconf -*-
++
++# Copyright (C) 1997-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_CONDITIONAL(NAME, SHELL-CONDITION)
++# -------------------------------------
++# Define a conditional.
++AC_DEFUN([AM_CONDITIONAL],
++[AC_PREREQ([2.52])dnl
++ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
++       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
++AC_SUBST([$1_TRUE])dnl
++AC_SUBST([$1_FALSE])dnl
++_AM_SUBST_NOTMAKE([$1_TRUE])dnl
++_AM_SUBST_NOTMAKE([$1_FALSE])dnl
++m4_define([_AM_COND_VALUE_$1], [$2])dnl
++if $2; then
++  $1_TRUE=
++  $1_FALSE='#'
++else
++  $1_TRUE='#'
++  $1_FALSE=
++fi
++AC_CONFIG_COMMANDS_PRE(
++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
++  AC_MSG_ERROR([[conditional "$1" was never defined.
++Usually this means the macro was only invoked conditionally.]])
++fi])])
++
++# Copyright (C) 1999-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++
++# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
++# written in clear, in which case automake, when reading aclocal.m4,
++# will think it sees a *use*, and therefore will trigger all it's
++# C support machinery.  Also note that it means that autoscan, seeing
++# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
++
++
++# _AM_DEPENDENCIES(NAME)
++# ----------------------
++# See how the compiler implements dependency checking.
++# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
++# We try a few techniques and use that to set a single cache variable.
++#
++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
++# dependency, and given that the user is not expected to run this macro,
++# just rely on AC_PROG_CC.
++AC_DEFUN([_AM_DEPENDENCIES],
++[AC_REQUIRE([AM_SET_DEPDIR])dnl
++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
++AC_REQUIRE([AM_MAKE_INCLUDE])dnl
++AC_REQUIRE([AM_DEP_TRACK])dnl
++
++m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
++      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
++      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
++      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
++      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
++      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
++                    [depcc="$$1"   am_compiler_list=])
++
++AC_CACHE_CHECK([dependency style of $depcc],
++               [am_cv_$1_dependencies_compiler_type],
++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++  # We make a subdir and do the tests there.  Otherwise we can end up
++  # making bogus files that we don't know about and never remove.  For
++  # instance it was reported that on HP-UX the gcc test will end up
++  # making a dummy file named 'D' -- because '-MD' means "put the output
++  # in D".
++  rm -rf conftest.dir
++  mkdir conftest.dir
++  # Copy depcomp to subdir because otherwise we won't find it if we're
++  # using a relative directory.
++  cp "$am_depcomp" conftest.dir
++  cd conftest.dir
++  # We will build objects and dependencies in a subdirectory because
++  # it helps to detect inapplicable dependency modes.  For instance
++  # both Tru64's cc and ICC support -MD to output dependencies as a
++  # side effect of compilation, but ICC will put the dependencies in
++  # the current directory while Tru64 will put them in the object
++  # directory.
++  mkdir sub
++
++  am_cv_$1_dependencies_compiler_type=none
++  if test "$am_compiler_list" = ""; then
++     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
++  fi
++  am__universal=false
++  m4_case([$1], [CC],
++    [case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac],
++    [CXX],
++    [case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac])
++
++  for depmode in $am_compiler_list; do
++    # Setup a source with many dependencies, because some compilers
++    # like to wrap large dependency lists on column 80 (with \), and
++    # we should not choose a depcomp mode which is confused by this.
++    #
++    # We need to recreate these files for each test, as the compiler may
++    # overwrite some of them when testing with obscure command lines.
++    # This happens at least with the AIX C compiler.
++    : > sub/conftest.c
++    for i in 1 2 3 4 5 6; do
++      echo '#include "conftst'$i'.h"' >> sub/conftest.c
++      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
++      # Solaris 10 /bin/sh.
++      echo '/* dummy */' > sub/conftst$i.h
++    done
++    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++
++    # We check with '-c' and '-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle '-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs.
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
++    case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
++      ;;
++    nosideeffect)
++      # After this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested.
++      if test "x$enable_dependency_tracking" = xyes; then
++	continue
++      else
++	break
++      fi
++      ;;
++    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
++      # This compiler won't grok '-c -o', but also, the minuso test has
++      # not run yet.  These depmodes are late enough in the game, and
++      # so weak that their functioning should not be impacted.
++      am__obj=conftest.${OBJEXT-o}
++      am__minus_obj=
++      ;;
++    none) break ;;
++    esac
++    if depmode=$depmode \
++       source=sub/conftest.c object=$am__obj \
++       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
++         >/dev/null 2>conftest.err &&
++       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
++       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++      # icc doesn't choke on unknown options, it will just issue warnings
++      # or remarks (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored or not supported.
++      # When given -MP, icc 7.0 and 7.1 complain thusly:
++      #   icc: Command line warning: ignoring option '-M'; no argument required
++      # The diagnosis changed in icc 8.0:
++      #   icc: Command line remark: option '-MP' not supported
++      if (grep 'ignoring option' conftest.err ||
++          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++        am_cv_$1_dependencies_compiler_type=$depmode
++        break
++      fi
++    fi
++  done
++
++  cd ..
++  rm -rf conftest.dir
++else
++  am_cv_$1_dependencies_compiler_type=none
++fi
++])
++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
++AM_CONDITIONAL([am__fastdep$1], [
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
++])
++
++
++# AM_SET_DEPDIR
++# -------------
++# Choose a directory name for dependency files.
++# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
++AC_DEFUN([AM_SET_DEPDIR],
++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
++])
++
++
++# AM_DEP_TRACK
++# ------------
++AC_DEFUN([AM_DEP_TRACK],
++[AC_ARG_ENABLE([dependency-tracking], [dnl
++AS_HELP_STRING(
++  [--enable-dependency-tracking],
++  [do not reject slow dependency extractors])
++AS_HELP_STRING(
++  [--disable-dependency-tracking],
++  [speeds up one-time build])])
++if test "x$enable_dependency_tracking" != xno; then
++  am_depcomp="$ac_aux_dir/depcomp"
++  AMDEPBACKSLASH='\'
++  am__nodep='_no'
++fi
++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
++AC_SUBST([AMDEPBACKSLASH])dnl
++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
++AC_SUBST([am__nodep])dnl
++_AM_SUBST_NOTMAKE([am__nodep])dnl
++])
++
++# Generate code to set up dependency tracking.              -*- Autoconf -*-
++
++# Copyright (C) 1999-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++
++# _AM_OUTPUT_DEPENDENCY_COMMANDS
++# ------------------------------
++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
++[{
++  # Older Autoconf quotes --file arguments for eval, but not when files
++  # are listed without --file.  Let's play safe and only enable the eval
++  # if we detect the quoting.
++  case $CONFIG_FILES in
++  *\'*) eval set x "$CONFIG_FILES" ;;
++  *)   set x $CONFIG_FILES ;;
++  esac
++  shift
++  for mf
++  do
++    # Strip MF so we end up with the name of the file.
++    mf=`echo "$mf" | sed -e 's/:.*$//'`
++    # Check whether this is an Automake generated Makefile or not.
++    # We used to match only the files named 'Makefile.in', but
++    # some people rename them; so instead we look at the file content.
++    # Grep'ing the first line is not enough: some people post-process
++    # each Makefile.in and add a new line on top of each file to say so.
++    # Grep'ing the whole file is not good either: AIX grep has a line
++    # limit of 2048, but all sed's we know have understand at least 4000.
++    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++      dirpart=`AS_DIRNAME("$mf")`
++    else
++      continue
++    fi
++    # Extract the definition of DEPDIR, am__include, and am__quote
++    # from the Makefile without running 'make'.
++    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++    test -z "$DEPDIR" && continue
++    am__include=`sed -n 's/^am__include = //p' < "$mf"`
++    test -z "$am__include" && continue
++    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++    # Find all dependency output files, they are included files with
++    # $(DEPDIR) in their names.  We invoke sed twice because it is the
++    # simplest approach to changing $(DEPDIR) to its actual value in the
++    # expansion.
++    for file in `sed -n "
++      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
++      # Make sure the directory exists.
++      test -f "$dirpart/$file" && continue
++      fdir=`AS_DIRNAME(["$file"])`
++      AS_MKDIR_P([$dirpart/$fdir])
++      # echo "creating $dirpart/$file"
++      echo '# dummy' > "$dirpart/$file"
++    done
++  done
++}
++])# _AM_OUTPUT_DEPENDENCY_COMMANDS
++
++
++# AM_OUTPUT_DEPENDENCY_COMMANDS
++# -----------------------------
++# This macro should only be invoked once -- use via AC_REQUIRE.
++#
++# This code is only required when automatic dependency tracking
++# is enabled.  FIXME.  This creates each '.P' file that we will
++# need in order to bootstrap the dependency handling code.
++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
++[AC_CONFIG_COMMANDS([depfiles],
++     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
++     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
++])
++
++# Do all the work for Automake.                             -*- Autoconf -*-
++
++# Copyright (C) 1996-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This macro actually does too much.  Some checks are only needed if
++# your package does certain things.  But this isn't really a big deal.
++
++dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
++m4_define([AC_PROG_CC],
++m4_defn([AC_PROG_CC])
++[_AM_PROG_CC_C_O
++])
++
++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
++# AM_INIT_AUTOMAKE([OPTIONS])
++# -----------------------------------------------
++# The call with PACKAGE and VERSION arguments is the old style
++# call (pre autoconf-2.50), which is being phased out.  PACKAGE
++# and VERSION should now be passed to AC_INIT and removed from
++# the call to AM_INIT_AUTOMAKE.
++# We support both call styles for the transition.  After
++# the next Automake release, Autoconf can make the AC_INIT
++# arguments mandatory, and then we can depend on a new Autoconf
++# release and drop the old call support.
++AC_DEFUN([AM_INIT_AUTOMAKE],
++[AC_PREREQ([2.65])dnl
++dnl Autoconf wants to disallow AM_ names.  We explicitly allow
++dnl the ones we care about.
++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
++AC_REQUIRE([AC_PROG_INSTALL])dnl
++if test "`cd $srcdir && pwd`" != "`pwd`"; then
++  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
++  # is not polluted with repeated "-I."
++  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
++  # test to see if srcdir already configured
++  if test -f $srcdir/config.status; then
++    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++  fi
++fi
++
++# test whether we have cygpath
++if test -z "$CYGPATH_W"; then
++  if (cygpath --version) >/dev/null 2>/dev/null; then
++    CYGPATH_W='cygpath -w'
++  else
++    CYGPATH_W=echo
++  fi
++fi
++AC_SUBST([CYGPATH_W])
++
++# Define the identity of the package.
++dnl Distinguish between old-style and new-style calls.
++m4_ifval([$2],
++[AC_DIAGNOSE([obsolete],
++             [$0: two- and three-arguments forms are deprecated.])
++m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
++ AC_SUBST([PACKAGE], [$1])dnl
++ AC_SUBST([VERSION], [$2])],
++[_AM_SET_OPTIONS([$1])dnl
++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
++m4_if(
++  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
++  [ok:ok],,
++  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
++
++_AM_IF_OPTION([no-define],,
++[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
++ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
++
++# Some tools Automake needs.
++AC_REQUIRE([AM_SANITY_CHECK])dnl
++AC_REQUIRE([AC_ARG_PROGRAM])dnl
++AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
++AM_MISSING_PROG([AUTOCONF], [autoconf])
++AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
++AM_MISSING_PROG([AUTOHEADER], [autoheader])
++AM_MISSING_PROG([MAKEINFO], [makeinfo])
++AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
++# For better backward compatibility.  To be removed once Automake 1.9.x
++# dies out for good.  For more background, see:
++# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
++# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
++AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
++# We need awk for the "check" target (and possibly the TAP driver).  The
++# system "awk" is bad on some platforms.
++AC_REQUIRE([AC_PROG_AWK])dnl
++AC_REQUIRE([AC_PROG_MAKE_SET])dnl
++AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
++	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
++			     [_AM_PROG_TAR([v7])])])
++_AM_IF_OPTION([no-dependencies],,
++[AC_PROVIDE_IFELSE([AC_PROG_CC],
++		  [_AM_DEPENDENCIES([CC])],
++		  [m4_define([AC_PROG_CC],
++			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_CXX],
++		  [_AM_DEPENDENCIES([CXX])],
++		  [m4_define([AC_PROG_CXX],
++			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_OBJC],
++		  [_AM_DEPENDENCIES([OBJC])],
++		  [m4_define([AC_PROG_OBJC],
++			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
++		  [_AM_DEPENDENCIES([OBJCXX])],
++		  [m4_define([AC_PROG_OBJCXX],
++			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
++])
++AC_REQUIRE([AM_SILENT_RULES])dnl
++dnl The testsuite driver may need to know about EXEEXT, so add the
++dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
++dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
++AC_CONFIG_COMMANDS_PRE(dnl
++[m4_provide_if([_AM_COMPILER_EXEEXT],
++  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
++
++# POSIX will say in a future version that running "rm -f" with no argument
++# is OK; and we want to be able to make that assumption in our Makefile
++# recipes.  So use an aggressive probe to check that the usage we want is
++# actually supported "in the wild" to an acceptable degree.
++# See automake bug#10828.
++# To make any issue more visible, cause the running configure to be aborted
++# by default if the 'rm' program in use doesn't match our expectations; the
++# user can still override this though.
++if rm -f && rm -fr && rm -rf; then : OK; else
++  cat >&2 <<'END'
++Oops!
++
++Your 'rm' program seems unable to run without file operands specified
++on the command line, even when the '-f' option is present.  This is contrary
++to the behaviour of most rm programs out there, and not conforming with
++the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
++
++Please tell bug-automake at gnu.org about your system, including the value
++of your $PATH and any error possibly output before this message.  This
++can help us improve future automake versions.
++
++END
++  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
++    echo 'Configuration will proceed anyway, since you have set the' >&2
++    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
++    echo >&2
++  else
++    cat >&2 <<'END'
++Aborting the configuration process, to ensure you take notice of the issue.
++
++You can download and install GNU coreutils to get an 'rm' implementation
++that behaves properly: <http://www.gnu.org/software/coreutils/>.
++
++If you want to complete the configuration process using your problematic
++'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
++to "yes", and re-run configure.
++
++END
++    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
++  fi
++fi
++dnl The trailing newline in this macro's definition is deliberate, for
++dnl backward compatibility and to allow trailing 'dnl'-style comments
++dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
++])
++
++dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
++dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
++dnl mangled by Autoconf and run in a shell conditional statement.
++m4_define([_AC_COMPILER_EXEEXT],
++m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
++
++# When config.status generates a header, we must update the stamp-h file.
++# This file resides in the same directory as the config header
++# that is generated.  The stamp files are numbered to have different names.
++
++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
++# loop where config.status creates the headers, so we can generate
++# our stamp files there.
++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
++[# Compute $1's index in $config_headers.
++_am_arg=$1
++_am_stamp_count=1
++for _am_header in $config_headers :; do
++  case $_am_header in
++    $_am_arg | $_am_arg:* )
++      break ;;
++    * )
++      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
++  esac
++done
++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
++
++# Copyright (C) 2001-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_PROG_INSTALL_SH
++# ------------------
++# Define $install_sh.
++AC_DEFUN([AM_PROG_INSTALL_SH],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++if test x"${install_sh+set}" != xset; then
++  case $am_aux_dir in
++  *\ * | *\	*)
++    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
++  *)
++    install_sh="\${SHELL} $am_aux_dir/install-sh"
++  esac
++fi
++AC_SUBST([install_sh])])
++
++# Copyright (C) 2003-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# Check whether the underlying file-system supports filenames
++# with a leading dot.  For instance MS-DOS doesn't.
++AC_DEFUN([AM_SET_LEADING_DOT],
++[rm -rf .tst 2>/dev/null
++mkdir .tst 2>/dev/null
++if test -d .tst; then
++  am__leading_dot=.
++else
++  am__leading_dot=_
++fi
++rmdir .tst 2>/dev/null
++AC_SUBST([am__leading_dot])])
++
++# Copyright (C) 1998-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_PROG_LEX
++# -----------
++# Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
++# "missing" invocation, for better error output.
++AC_DEFUN([AM_PROG_LEX],
++[AC_PREREQ([2.50])dnl
++AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
++AC_REQUIRE([AC_PROG_LEX])dnl
++if test "$LEX" = :; then
++  LEX=${am_missing_run}flex
++fi])
++
++# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
++# From Jim Meyering
++
++# Copyright (C) 1996-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_MAINTAINER_MODE([DEFAULT-MODE])
++# ----------------------------------
++# Control maintainer-specific portions of Makefiles.
++# Default is to disable them, unless 'enable' is passed literally.
++# For symmetry, 'disable' may be passed as well.  Anyway, the user
++# can override the default with the --enable/--disable switch.
++AC_DEFUN([AM_MAINTAINER_MODE],
++[m4_case(m4_default([$1], [disable]),
++       [enable], [m4_define([am_maintainer_other], [disable])],
++       [disable], [m4_define([am_maintainer_other], [enable])],
++       [m4_define([am_maintainer_other], [enable])
++        m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
++AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
++  AC_ARG_ENABLE([maintainer-mode],
++    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
++      am_maintainer_other[ make rules and dependencies not useful
++      (and sometimes confusing) to the casual installer])],
++    [USE_MAINTAINER_MODE=$enableval],
++    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
++  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
++  MAINT=$MAINTAINER_MODE_TRUE
++  AC_SUBST([MAINT])dnl
++]
++)
++
++# Check to see how 'make' treats includes.	            -*- Autoconf -*-
++
++# Copyright (C) 2001-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_MAKE_INCLUDE()
++# -----------------
++# Check to see how make treats includes.
++AC_DEFUN([AM_MAKE_INCLUDE],
++[am_make=${MAKE-make}
++cat > confinc << 'END'
++am__doit:
++	@echo this is the am__doit target
++.PHONY: am__doit
++END
++# If we don't find an include directive, just comment out the code.
++AC_MSG_CHECKING([for style of include used by $am_make])
++am__include="#"
++am__quote=
++_am_result=none
++# First try GNU make style include.
++echo "include confinc" > confmf
++# Ignore all kinds of additional output from 'make'.
++case `$am_make -s -f confmf 2> /dev/null` in #(
++*the\ am__doit\ target*)
++  am__include=include
++  am__quote=
++  _am_result=GNU
++  ;;
++esac
++# Now try BSD make style include.
++if test "$am__include" = "#"; then
++   echo '.include "confinc"' > confmf
++   case `$am_make -s -f confmf 2> /dev/null` in #(
++   *the\ am__doit\ target*)
++     am__include=.include
++     am__quote="\""
++     _am_result=BSD
++     ;;
++   esac
++fi
++AC_SUBST([am__include])
++AC_SUBST([am__quote])
++AC_MSG_RESULT([$_am_result])
++rm -f confinc confmf
++])
++
++# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
++
++# Copyright (C) 1997-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_MISSING_PROG(NAME, PROGRAM)
++# ------------------------------
++AC_DEFUN([AM_MISSING_PROG],
++[AC_REQUIRE([AM_MISSING_HAS_RUN])
++$1=${$1-"${am_missing_run}$2"}
++AC_SUBST($1)])
++
++# AM_MISSING_HAS_RUN
++# ------------------
++# Define MISSING if not defined so far and test if it is modern enough.
++# If it is, set am_missing_run to use it, otherwise, to nothing.
++AC_DEFUN([AM_MISSING_HAS_RUN],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++AC_REQUIRE_AUX_FILE([missing])dnl
++if test x"${MISSING+set}" != xset; then
++  case $am_aux_dir in
++  *\ * | *\	*)
++    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
++  *)
++    MISSING="\${SHELL} $am_aux_dir/missing" ;;
++  esac
++fi
++# Use eval to expand $SHELL
++if eval "$MISSING --is-lightweight"; then
++  am_missing_run="$MISSING "
++else
++  am_missing_run=
++  AC_MSG_WARN(['missing' script is too old or missing])
++fi
++])
++
++# Helper functions for option handling.                     -*- Autoconf -*-
++
++# Copyright (C) 2001-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# _AM_MANGLE_OPTION(NAME)
++# -----------------------
++AC_DEFUN([_AM_MANGLE_OPTION],
++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++
++# _AM_SET_OPTION(NAME)
++# --------------------
++# Set option NAME.  Presently that only means defining a flag for this option.
++AC_DEFUN([_AM_SET_OPTION],
++[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
++
++# _AM_SET_OPTIONS(OPTIONS)
++# ------------------------
++# OPTIONS is a space-separated list of Automake options.
++AC_DEFUN([_AM_SET_OPTIONS],
++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++
++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
++# -------------------------------------------
++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
++AC_DEFUN([_AM_IF_OPTION],
++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
++
++# Copyright (C) 1999-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# _AM_PROG_CC_C_O
++# ---------------
++# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
++# to automatically call this.
++AC_DEFUN([_AM_PROG_CC_C_O],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++AC_REQUIRE_AUX_FILE([compile])dnl
++AC_LANG_PUSH([C])dnl
++AC_CACHE_CHECK(
++  [whether $CC understands -c and -o together],
++  [am_cv_prog_cc_c_o],
++  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
++  # Make sure it works both with $CC and with simple cc.
++  # Following AC_PROG_CC_C_O, we do the test twice because some
++  # compilers refuse to overwrite an existing .o file with -o,
++  # though they will create one.
++  am_cv_prog_cc_c_o=yes
++  for am_i in 1 2; do
++    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
++         && test -f conftest2.$ac_objext; then
++      : OK
++    else
++      am_cv_prog_cc_c_o=no
++      break
++    fi
++  done
++  rm -f core conftest*
++  unset am_i])
++if test "$am_cv_prog_cc_c_o" != yes; then
++   # Losing compiler, so override with the script.
++   # FIXME: It is wrong to rewrite CC.
++   # But if we don't then we get into trouble of one sort or another.
++   # A longer-term fix would be to have automake use am__CC in this case,
++   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
++   CC="$am_aux_dir/compile $CC"
++fi
++AC_LANG_POP([C])])
++
++# For backward compatibility.
++AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
++
++# Copyright (C) 2001-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_RUN_LOG(COMMAND)
++# -------------------
++# Run COMMAND, save the exit status in ac_status, and log it.
++# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
++AC_DEFUN([AM_RUN_LOG],
++[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
++   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
++   ac_status=$?
++   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   (exit $ac_status); }])
++
++# Check to make sure that the build environment is sane.    -*- Autoconf -*-
++
++# Copyright (C) 1996-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_SANITY_CHECK
++# ---------------
++AC_DEFUN([AM_SANITY_CHECK],
++[AC_MSG_CHECKING([whether build environment is sane])
++# Reject unsafe characters in $srcdir or the absolute working directory
++# name.  Accept space and tab only in the latter.
++am_lf='
++'
++case `pwd` in
++  *[[\\\"\#\$\&\'\`$am_lf]]*)
++    AC_MSG_ERROR([unsafe absolute working directory name]);;
++esac
++case $srcdir in
++  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
++    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
++esac
++
++# Do 'set' in a subshell so we don't clobber the current shell's
++# arguments.  Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++   am_has_slept=no
++   for am_try in 1 2; do
++     echo "timestamp, slept: $am_has_slept" > conftest.file
++     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
++     if test "$[*]" = "X"; then
++	# -L didn't work.
++	set X `ls -t "$srcdir/configure" conftest.file`
++     fi
++     if test "$[*]" != "X $srcdir/configure conftest.file" \
++	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
++
++	# If neither matched, then we have a broken ls.  This can happen
++	# if, for instance, CONFIG_SHELL is bash and it inherits a
++	# broken ls alias from the environment.  This has actually
++	# happened.  Such a system could not be considered "sane".
++	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
++  alias in your environment])
++     fi
++     if test "$[2]" = conftest.file || test $am_try -eq 2; then
++       break
++     fi
++     # Just in case.
++     sleep 1
++     am_has_slept=yes
++   done
++   test "$[2]" = conftest.file
++   )
++then
++   # Ok.
++   :
++else
++   AC_MSG_ERROR([newly created file is older than distributed files!
++Check your system clock])
++fi
++AC_MSG_RESULT([yes])
++# If we didn't sleep, we still need to ensure time stamps of config.status and
++# generated files are strictly newer.
++am_sleep_pid=
++if grep 'slept: no' conftest.file >/dev/null 2>&1; then
++  ( sleep 1 ) &
++  am_sleep_pid=$!
++fi
++AC_CONFIG_COMMANDS_PRE(
++  [AC_MSG_CHECKING([that generated files are newer than configure])
++   if test -n "$am_sleep_pid"; then
++     # Hide warnings about reused PIDs.
++     wait $am_sleep_pid 2>/dev/null
++   fi
++   AC_MSG_RESULT([done])])
++rm -f conftest.file
++])
++
++# Copyright (C) 2009-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_SILENT_RULES([DEFAULT])
++# --------------------------
++# Enable less verbose build rules; with the default set to DEFAULT
++# ("yes" being less verbose, "no" or empty being verbose).
++AC_DEFUN([AM_SILENT_RULES],
++[AC_ARG_ENABLE([silent-rules], [dnl
++AS_HELP_STRING(
++  [--enable-silent-rules],
++  [less verbose build output (undo: "make V=1")])
++AS_HELP_STRING(
++  [--disable-silent-rules],
++  [verbose build output (undo: "make V=0")])dnl
++])
++case $enable_silent_rules in @%:@ (((
++  yes) AM_DEFAULT_VERBOSITY=0;;
++   no) AM_DEFAULT_VERBOSITY=1;;
++    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
++esac
++dnl
++dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
++dnl do not support nested variable expansions.
++dnl See automake bug#9928 and bug#10237.
++am_make=${MAKE-make}
++AC_CACHE_CHECK([whether $am_make supports nested variables],
++   [am_cv_make_support_nested_variables],
++   [if AS_ECHO([['TRUE=$(BAR$(V))
++BAR0=false
++BAR1=true
++V=1
++am__doit:
++	@$(TRUE)
++.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
++  am_cv_make_support_nested_variables=yes
++else
++  am_cv_make_support_nested_variables=no
++fi])
++if test $am_cv_make_support_nested_variables = yes; then
++  dnl Using '$V' instead of '$(V)' breaks IRIX make.
++  AM_V='$(V)'
++  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
++else
++  AM_V=$AM_DEFAULT_VERBOSITY
++  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
++fi
++AC_SUBST([AM_V])dnl
++AM_SUBST_NOTMAKE([AM_V])dnl
++AC_SUBST([AM_DEFAULT_V])dnl
++AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
++AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
++AM_BACKSLASH='\'
++AC_SUBST([AM_BACKSLASH])dnl
++_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
++])
++
++# Copyright (C) 2001-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_PROG_INSTALL_STRIP
++# ---------------------
++# One issue with vendor 'install' (even GNU) is that you can't
++# specify the program used to strip binaries.  This is especially
++# annoying in cross-compiling environments, where the build's strip
++# is unlikely to handle the host's binaries.
++# Fortunately install-sh will honor a STRIPPROG variable, so we
++# always use install-sh in "make install-strip", and initialize
++# STRIPPROG with the value of the STRIP variable (set by the user).
++AC_DEFUN([AM_PROG_INSTALL_STRIP],
++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++# Installed binaries are usually stripped using 'strip' when the user
++# run "make install-strip".  However 'strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the 'STRIP' environment variable to overrule this program.
++dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
++if test "$cross_compiling" != no; then
++  AC_CHECK_TOOL([STRIP], [strip], :)
++fi
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
++AC_SUBST([INSTALL_STRIP_PROGRAM])])
++
++# Copyright (C) 2006-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# _AM_SUBST_NOTMAKE(VARIABLE)
++# ---------------------------
++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
++# This macro is traced by Automake.
++AC_DEFUN([_AM_SUBST_NOTMAKE])
++
++# AM_SUBST_NOTMAKE(VARIABLE)
++# --------------------------
++# Public sister of _AM_SUBST_NOTMAKE.
++AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
++
++# Check how to create a tarball.                            -*- Autoconf -*-
++
++# Copyright (C) 2004-2014 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# _AM_PROG_TAR(FORMAT)
++# --------------------
++# Check how to create a tarball in format FORMAT.
++# FORMAT should be one of 'v7', 'ustar', or 'pax'.
++#
++# Substitute a variable $(am__tar) that is a command
++# writing to stdout a FORMAT-tarball containing the directory
++# $tardir.
++#     tardir=directory && $(am__tar) > result.tar
++#
++# Substitute a variable $(am__untar) that extract such
++# a tarball read from stdin.
++#     $(am__untar) < result.tar
++#
++AC_DEFUN([_AM_PROG_TAR],
++[# Always define AMTAR for backward compatibility.  Yes, it's still used
++# in the wild :-(  We should find a proper way to deprecate it ...
++AC_SUBST([AMTAR], ['$${TAR-tar}'])
++
++# We'll loop over all known methods to create a tar archive until one works.
++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
++
++m4_if([$1], [v7],
++  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
++
++  [m4_case([$1],
++    [ustar],
++     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
++      # There is notably a 21 bits limit for the UID and the GID.  In fact,
++      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
++      # and bug#13588).
++      am_max_uid=2097151 # 2^21 - 1
++      am_max_gid=$am_max_uid
++      # The $UID and $GID variables are not portable, so we need to resort
++      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
++      # below are definitely unexpected, so allow the users to see them
++      # (that is, avoid stderr redirection).
++      am_uid=`id -u || echo unknown`
++      am_gid=`id -g || echo unknown`
++      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
++      if test $am_uid -le $am_max_uid; then
++         AC_MSG_RESULT([yes])
++      else
++         AC_MSG_RESULT([no])
++         _am_tools=none
++      fi
++      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
++      if test $am_gid -le $am_max_gid; then
++         AC_MSG_RESULT([yes])
++      else
++        AC_MSG_RESULT([no])
++        _am_tools=none
++      fi],
++
++  [pax],
++    [],
++
++  [m4_fatal([Unknown tar format])])
++
++  AC_MSG_CHECKING([how to create a $1 tar archive])
++
++  # Go ahead even if we have the value already cached.  We do so because we
++  # need to set the values for the 'am__tar' and 'am__untar' variables.
++  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
++
++  for _am_tool in $_am_tools; do
++    case $_am_tool in
++    gnutar)
++      for _am_tar in tar gnutar gtar; do
++        AM_RUN_LOG([$_am_tar --version]) && break
++      done
++      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
++      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
++      am__untar="$_am_tar -xf -"
++      ;;
++    plaintar)
++      # Must skip GNU tar: if it does not support --format= it doesn't create
++      # ustar tarball either.
++      (tar --version) >/dev/null 2>&1 && continue
++      am__tar='tar chf - "$$tardir"'
++      am__tar_='tar chf - "$tardir"'
++      am__untar='tar xf -'
++      ;;
++    pax)
++      am__tar='pax -L -x $1 -w "$$tardir"'
++      am__tar_='pax -L -x $1 -w "$tardir"'
++      am__untar='pax -r'
++      ;;
++    cpio)
++      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
++      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
++      am__untar='cpio -i -H $1 -d'
++      ;;
++    none)
++      am__tar=false
++      am__tar_=false
++      am__untar=false
++      ;;
++    esac
++
++    # If the value was cached, stop now.  We just wanted to have am__tar
++    # and am__untar set.
++    test -n "${am_cv_prog_tar_$1}" && break
++
++    # tar/untar a dummy directory, and stop if the command works.
++    rm -rf conftest.dir
++    mkdir conftest.dir
++    echo GrepMe > conftest.dir/file
++    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
++    rm -rf conftest.dir
++    if test -s conftest.tar; then
++      AM_RUN_LOG([$am__untar <conftest.tar])
++      AM_RUN_LOG([cat conftest.dir/file])
++      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
++    fi
++  done
++  rm -rf conftest.dir
++
++  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
++  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
++
++AC_SUBST([am__tar])
++AC_SUBST([am__untar])
++]) # _AM_PROG_TAR
++
diff --cc download/Makefile.orig
index 01c4178,867ddfe..d65274f
--- a/download/Makefile.orig
+++ b/download/Makefile.orig
@@@ -1,7 -1,7 +1,12 @@@
++<<<<<<< HEAD:download/Makefile
 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
 +# download/Makefile.  Generated from Makefile.in by configure.
++=======
+ # Makefile.in generated by automake 1.15 from Makefile.am.
+ # @configure_input@
++>>>>>>> upstream/3.36:download/Makefile.in
  
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+ # Copyright (C) 1994-2014 Free Software Foundation, Inc.
  
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
@@@ -18,8 -18,18 +23,23 @@@
  # -----------------------------------------
  
  # $Id: Makefile.am,v 1.16 2010/05/06 21:20:38 hecht Exp $
++<<<<<<< HEAD:download/Makefile
 +
 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++=======
+ VPATH = @srcdir@
+ am__is_gnu_make = { \
+   if test -z '$(MAKELEVEL)'; then \
+     false; \
+   elif test -n '$(MAKE_HOST)'; then \
+     true; \
+   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+     true; \
+   else \
+     false; \
+   fi; \
+ }
++>>>>>>> upstream/3.36:download/Makefile.in
  am__make_running_with_option = \
    case $${target_option-} in \
        ?) ;; \
@@@ -80,10 -90,9 +100,13 @@@ POST_INSTALL = 
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
 -build_triplet = @build@
 -host_triplet = @host@
 +build_triplet = x86_64-pc-linux-gnu
 +host_triplet = x86_64-pc-linux-gnu
  subdir = download
++<<<<<<< HEAD:download/Makefile
 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am AUTHORS
++=======
++>>>>>>> upstream/3.36:download/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/acmacros.m4 \
  	$(top_srcdir)/acoptim.m4 $(top_srcdir)/ax_lib_hdf5.m4 \
@@@ -91,7 -100,8 +114,12 @@@
  	$(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
++<<<<<<< HEAD:download/Makefile
 +mkinstalldirs = $(install_sh) -d
++=======
+ DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++>>>>>>> upstream/3.36:download/Makefile.in
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
@@@ -176,282 -188,283 +206,562 @@@ am__relativize = 
      dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
    done; \
    reldir="$$dir2"
++<<<<<<< HEAD:download/Makefile
 +ACLOCAL = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing aclocal-1.14
 +ADD_PACKAGE_NAME = 
 +AMTAR = $${TAR-tar}
 +AM_DEFAULT_VERBOSITY = 1
 +AR = ar
 +ARFLAGS = rv
 +ARPACKLIB = 
 +ARPACKLIBS = -larpack -llapack
 +AUTOCONF = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing autoconf
 +AUTOHEADER = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing autoheader
 +AUTOMAKE = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing automake-1.14
 +AWK = gawk
 +BAMGPROG = bamg cvmsh2
 +BLASINC = 
 +BLASLIBS = -lblas
 +CC = gcc -Wl,-z,relro
 +CCDEPMODE = depmode=none
 +CFLAGS = -g  -fstack-protector-strong -Wformat -Werror=format-security -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
 +CFLAGSF77 = -DAdd_
 +CNOFLAGS =  -fPIC
 +COMPILE_OPENBLAS = 
 +CPPFLAGS = -D_FORTIFY_SOURCE=2
 +CXX = g++ -Wl,-z,relro
 +CXX11FLAGS = -std=c++11
 +CXXCPP = g++ -Wl,-z,relro -E
 +CXXDEPMODE = depmode=none
 +CXXFLAGS =  -DBAMG_LONG_LONG  -DNCHECKPTR -fPIC
 +CYGPATH_W = echo
 +DEFS = -DHAVE_CONFIG_H
 +DEPDIR = .deps
 +DOCPDF = freefem++doc.pdf
 +DOCPS = freefem++doc.ps
 +DOCPSGZ = freefem++doc.ps.gz
 +DOWNLOADCOMPILE = 
 +DOWNLOADED_BLAS = 
 +DOWNLOADED_BLAS_BUILT_SOURCES = 
 +DOWNLOAD_ARPACK = 
 +DOWNLOAD_FFTW = 
 +DOWNLOAD_UMFPACK = 
 +DYLIB_SUFFIX = so
 +ECHO_C = 
 +ECHO_N = -n
 +ECHO_T = 
 +EGREP = /bin/grep -E
 +EIGENOBJ = eigenvalue.$(OBJEXT)
 +ENABLE_FFCS = no
 +EPSTOPDF = epstopdf
 +EXEEXT = 
 +F77 = gfortran
 +FC = gfortran
 +FCFLAGS = -g -O2 -fstack-protector-strong -fPIC
 +FFGLUTNAME = 
 +FFGLUTPROG = ffglut
 +FFLAGS = -g  -fstack-protector-strong -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
 +FFMETIS_CFLAGS = 
 +FF_LAPACKdir = 
 +FF_MALLOC_H = 1
 +FF_SECOND = second.o
 +FF_UMFPACK_CONFIG = 
 +FLIBS = /usr/lib/gcc/x86_64-linux-gnu/4.9/libgfortran.so
 +FNOFLAGS =  -fPIC
 +G2CLIB = /usr/lib/gcc/x86_64-linux-gnu/4.9/libgfortran.so
 +GCCNOCYGWIN = 
 +GREP = /bin/grep
 +GSL_CFLAGS = -I/usr/include
 +GSL_CONFIG = /usr/bin/gsl-config
 +GSL_LIBS = -L/usr/lib -lgsl -lgslcblas -lm
 +H5CC = /usr/bin/h5cc
 +H5FC = /usr/bin/h5fc
 +HDF5_CC = /usr/bin/cc
 +HDF5_CFLAGS = 
 +HDF5_CPPFLAGS = -I/usr/include/hdf5/serial -I/usr/include
 +HDF5_FC = 
 +HDF5_FFLAGS = -I/usr/lib/x86_64-linux-gnu/hdf5/serial -L/usr/lib/x86_64-linux-gnu/hdf5/serial -I/usr/include/hdf5/serial 
 +HDF5_FLIBS =  -lm -ldl -lz -lpthread -lhdf5_fortran -lhdf5 -lhdf5hl_fortran -lhdf5_hl
 +HDF5_LDFLAGS = -L/usr/lib/x86_64-linux-gnu/hdf5/serial 
 +HDF5_LIBS = -lm -ldl -lz -lpthread  -lhdf5 -lhdf5_hl
 +HDF5_VERSION = 1.8.13
 +HISTORY = 
 +INSTALL = /usr/bin/install -c
 +INSTALL_DATA = ${INSTALL} -m 644
 +INSTALL_PROGRAM = ${INSTALL}
 +INSTALL_SCRIPT = ${INSTALL}
 +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 +KERNEL_VERSION = 3.16.0
 +LAPACKLIBS = -llapack
 +LAPACK_arpack_LIB = 
 +LDFLAGS = -Wl,-z,relro -rdynamic
 +LEX = flex
 +LEXLIB = 
 +LEX_OUTPUT_ROOT = lex.yy
 +LIBC_VERSION = libc-2.19
 +LIBOBJS = 
 +LIBS = -ldl -lm  /usr/lib/gcc/x86_64-linux-gnu/4.9/libgfortran.so -L/usr/lib/x86_64-linux-gnu/hdf5/serial   -lm -ldl -lz -lpthread  -lhdf5 -lhdf5_hl
 +LIBSGLUT = -lglut -lGLU -lGL
 +LIBSNOCONSOLE = 
 +LIBSPTHREAD = -lpthread
 +LOAD_COMPILE = load_compile
 +LOAD_TESTS = ../regtests.sh
 +LTLIBOBJS = 
 +MAINT = #
 +MAKEINFO = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing makeinfo
 +MEDITPROG = ffmedit
 +MKDIR_P = /bin/mkdir -p
 +MPICC = /usr/bin/mpicc
 +MPICXX = mpic++ -Wl,-z,relro
 +MPIF77 = /usr/bin/mpif90
 +MPIFC = /usr/bin/mpif90
 +MPIPROG = FreeFem++-mpi
 +MPIRUN = /usr/bin/mpirun
 +MPISCRIPT = ff-mpirun
 +MPI_INCLUDE = 
 +MPI_INC_DIR = 
 +MPI_LIB = -Wl,-z,relro 
 +MPI_LIBC = 
 +MPI_LIBFC = -pthread -L/usr//lib -L/usr/lib/openmpi/lib -lmpi_f90 -lmpi_f77 -lmpi -ldl -lhwloc 
 +MPI_LIB_DIRS = 
 +NO_RANGE_CHECK = 
 +OBJEXT = o
 +OPTIM_TYPE = 
 +PACKAGE = freefem++
 +PACKAGE_BUGREPORT = hecht at ann.jussieu.fr
 +PACKAGE_NAME = FreeFem++
 +PACKAGE_STRING = FreeFem++ 3.35
 +PACKAGE_TARNAME = freefem++
 +PACKAGE_URL = 
 +PACKAGE_VERSION = 3.35
 +PASTIX_HOSTARCH = 
 +PATH_SEPARATOR = :
 +RANLIB = ranlib
 +RANLIN = ranlib
 +SCOTCH_INCLUDE = /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/download/include/scotch
 +SED = /bin/sed
 +SET_MAKE = 
 +SHELL = /bin/bash
 +SIZEOF_INT = 4
 +SIZEOF_LONG = 8
 +SIZEOF_PTR = 8
 +SIZEOF_PTRINBIT = 64
 +SKIP_TESTS_EIGEN = 
 +SKIP_TESTS_MPI = no
 +STATICTOOL = 
 +STDPROG = 
 +STD_GRAPH_OBJ = 
 +STD_LDFLAGS = 
 +STD_LIBS = 
 +STRIP = 
 +TEST_FFPP = ../src/nw/FreeFem++
 +TEST_FFPPMPI = ../src/mpi/ff-mpirun
 +TEST_FFPP_MPI = ../src/mpi/FreeFem++-mpi
 +TOOL_COMPILE_NewSolver = NewSolver
 +TOOL_COMPILE_fflapack = fflapack
 +TOOL_COMPILE_gsl = gsl
 +TOOL_COMPILE_hips = hips
 +TOOL_COMPILE_iohdf5 = iohdf5
 +TOOL_COMPILE_ipopt = ipopt
 +TOOL_COMPILE_lapack = lapack
 +TOOL_COMPILE_metis = metis
 +TOOL_COMPILE_mmg3d = mmg3d
 +TOOL_COMPILE_mshmet = mshmet
 +TOOL_COMPILE_mumps = mumps
 +TOOL_COMPILE_mumps_seq = mumps-seq
 +TOOL_COMPILE_nlopt = nlopt
 +TOOL_COMPILE_pardiso = 
 +TOOL_COMPILE_parmetis = parmetis
 +TOOL_COMPILE_parms = parms
 +TOOL_COMPILE_pastix = pastix
 +TOOL_COMPILE_pipe = pipe
 +TOOL_COMPILE_schwarz = 
 +TOOL_COMPILE_scotch = scotch
 +TOOL_COMPILE_superlu = superlu
 +TOOL_COMPILE_superludist = superludist
 +TOOL_COMPILE_umfpack = umfpack
 +TOOL_COMPILE_yams = yams
 +TOOL_DYLIB_NewSolver = NewSolver.so
 +TOOL_DYLIB_fflapack = fflapack.so
 +TOOL_DYLIB_gsl = gsl.so
 +TOOL_DYLIB_hips = hips_FreeFem.so
 +TOOL_DYLIB_iohdf5 = iohdf5.so
 +TOOL_DYLIB_ipopt = ff-Ipopt.so
 +TOOL_DYLIB_lapack = lapack.so
 +TOOL_DYLIB_metis = metis.so
 +TOOL_DYLIB_mmg3d = mmg3d-v4.0.so
 +TOOL_DYLIB_mshmet = mshmet.so
 +TOOL_DYLIB_mumps = MUMPS_FreeFem.so MUMPS.so
 +TOOL_DYLIB_mumps_seq = MUMPS_seq.so MUMPS.so
 +TOOL_DYLIB_nlopt = ff-NLopt.so
 +TOOL_DYLIB_pardiso = 
 +TOOL_DYLIB_parmetis = 
 +TOOL_DYLIB_parms = parms_FreeFem.so
 +TOOL_DYLIB_pastix = interfacepastix.so complex_pastix_FreeFem.so real_pastix_FreeFem.so
 +TOOL_DYLIB_pipe = pipe.so
 +TOOL_DYLIB_schwarz = 
 +TOOL_DYLIB_scotch = scotch.so
 +TOOL_DYLIB_superlu = SuperLu.so
 +TOOL_DYLIB_superludist = complex_SuperLU_DIST_FreeFem.so real_SuperLU_DIST_FreeFem.so dSuperLU_DIST.so
 +TOOL_DYLIB_umfpack = UMFPACK64.so
 +TOOL_DYLIB_yams = freeyams.so
 +UMFPACKLIBS = -lumfpack  -lamd -lcholmod -lcolamd
 +VERSION = 3.35
 +WGET = wget --no-check-certificate
 +WIN32DLLTARGET = 
 +WINDRESOBJ = 
 +WITH_CXX11 = yes
 +YACC = bison -y
 +YFLAGS = 
 +abs_builddir = /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/download
 +abs_srcdir = /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/download
 +abs_top_builddir = /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++
 +abs_top_srcdir = /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++
 +ac_ct_CC = gcc -Wl,-z,relro
 +ac_ct_CXX = 
 +ac_ct_F77 = gfortran
 +ac_ct_FC = gfortran
 +am__include = include
 +am__leading_dot = .
 +am__quote = 
 +am__tar = $${TAR-tar} chof - "$$tardir"
 +am__untar = $${TAR-tar} xf -
 +bindir = ${exec_prefix}/bin
 +build = x86_64-pc-linux-gnu
 +build_alias = x86_64-linux-gnu
 +build_cpu = x86_64
 +build_os = linux-gnu
 +build_vendor = pc
 +builddir = .
 +datadir = ${datarootdir}
 +datarootdir = ${prefix}/share
 +docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 +dvidir = ${docdir}
 +exec_prefix = ${prefix}
 +ff_bison = yes
 +ff_convert = yes
 +ff_curl = 
 +ff_dvips = yes
 +ff_git = 
 +ff_gzip = yes
 +ff_history = 
 +ff_latex = yes
 +ff_libtool = yes
 +ff_m4 = yes
 +ff_makeindex = yes
 +ff_patch = yes
 +ff_pdf2ps = yes
 +ff_pdflatex = yes
 +ff_prefix_dir = /usr/lib/ff++/3.35
 +ff_unzip = 
 +ff_wget = yes
 +host = x86_64-pc-linux-gnu
 +host_alias = 
 +host_cpu = x86_64
 +host_os = linux-gnu
 +host_vendor = pc
 +htmldir = ${docdir}
 +includedir = ${prefix}/include
 +infodir = ${prefix}/share/info
 +install_sh = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/install-sh
 +libdir = ${prefix}/lib/x86_64-linux-gnu
 +libexecdir = ${prefix}/lib/x86_64-linux-gnu
 +localedir = ${datarootdir}/locale
 +localstatedir = /var
 +mandir = ${prefix}/share/man
 +mkdir_p = $(MKDIR_P)
 +oldincludedir = /usr/include
 +pdfdir = ${docdir}
 +prefix = /usr
 +program_transform_name = s,x,x,
 +psdir = ${docdir}
 +sbindir = ${exec_prefix}/sbin
 +sharedstatedir = ${prefix}/com
 +srcdir = .
 +sysconfdir = /etc
 +target_alias = 
 +top_build_prefix = ../
 +top_builddir = ..
 +top_srcdir = ..
++=======
+ ACLOCAL = @ACLOCAL@
+ ADD_PACKAGE_NAME = @ADD_PACKAGE_NAME@
+ AMTAR = @AMTAR@
+ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ AR = @AR@
+ ARFLAGS = @ARFLAGS@
+ ARPACKLIB = @ARPACKLIB@
+ ARPACKLIBS = @ARPACKLIBS@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ BAMGPROG = @BAMGPROG@
+ BLASINC = @BLASINC@
+ BLASLIBS = @BLASLIBS@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CFLAGSF77 = @CFLAGSF77@
+ CNOFLAGS = @CNOFLAGS@
+ COMPILE_OPENBLAS = @COMPILE_OPENBLAS@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXX11FLAGS = @CXX11FLAGS@
+ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DOCPDF = @DOCPDF@
+ DOCPS = @DOCPS@
+ DOCPSGZ = @DOCPSGZ@
+ DOWNLOADCOMPILE = @DOWNLOADCOMPILE@
+ DOWNLOADED_BLAS = @DOWNLOADED_BLAS@
+ DOWNLOADED_BLAS_BUILT_SOURCES = @DOWNLOADED_BLAS_BUILT_SOURCES@
+ DOWNLOAD_ARPACK = @DOWNLOAD_ARPACK@
+ DOWNLOAD_FFTW = @DOWNLOAD_FFTW@
+ DOWNLOAD_UMFPACK = @DOWNLOAD_UMFPACK@
+ DYLIB_SUFFIX = @DYLIB_SUFFIX@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EIGENOBJ = @EIGENOBJ@
+ ENABLE_FFCS = @ENABLE_FFCS@
+ EPSTOPDF = @EPSTOPDF@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FC = @FC@
+ FCFLAGS = @FCFLAGS@
+ FFGLUTNAME = @FFGLUTNAME@
+ FFGLUTPROG = @FFGLUTPROG@
+ FFLAGS = @FFLAGS@
+ FF_HAVE_REGEX_H = @FF_HAVE_REGEX_H@
+ FF_LAPACKdir = @FF_LAPACKdir@
+ FF_MALLOC_H = @FF_MALLOC_H@
+ FF_SECOND = @FF_SECOND@
+ FF_UMFPACK_CONFIG = @FF_UMFPACK_CONFIG@
+ FLIBS = @FLIBS@
+ FNOFLAGS = @FNOFLAGS@
+ G2CLIB = @G2CLIB@
+ GCCNOCYGWIN = @GCCNOCYGWIN@
+ GREP = @GREP@
+ GSL_CFLAGS = @GSL_CFLAGS@
+ GSL_CONFIG = @GSL_CONFIG@
+ GSL_LIBS = @GSL_LIBS@
+ H5CC = @H5CC@
+ H5FC = @H5FC@
+ HDF5_CC = @HDF5_CC@
+ HDF5_CFLAGS = @HDF5_CFLAGS@
+ HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
+ HDF5_FC = @HDF5_FC@
+ HDF5_FFLAGS = @HDF5_FFLAGS@
+ HDF5_FLIBS = @HDF5_FLIBS@
+ HDF5_LDFLAGS = @HDF5_LDFLAGS@
+ HDF5_LIBS = @HDF5_LIBS@
+ HDF5_VERSION = @HDF5_VERSION@
+ HISTORY = @HISTORY@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ KERNEL_VERSION = @KERNEL_VERSION@
+ LAPACKLIBS = @LAPACKLIBS@
+ LAPACK_arpack_LIB = @LAPACK_arpack_LIB@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBC_VERSION = @LIBC_VERSION@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBSGLUT = @LIBSGLUT@
+ LIBSNOCONSOLE = @LIBSNOCONSOLE@
+ LIBSPTHREAD = @LIBSPTHREAD@
+ LOAD_COMPILE = @LOAD_COMPILE@
+ LOAD_TESTS = @LOAD_TESTS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MEDITPROG = @MEDITPROG@
+ MKDIR_P = @MKDIR_P@
+ MPICC = @MPICC@
+ MPICXX = @MPICXX@
+ MPIF77 = @MPIF77@
+ MPIFC = @MPIFC@
+ MPIPROG = @MPIPROG@
+ MPIRUN = @MPIRUN@
+ MPISCRIPT = @MPISCRIPT@
+ MPI_INCLUDE = @MPI_INCLUDE@
+ MPI_INC_DIR = @MPI_INC_DIR@
+ MPI_LIB = @MPI_LIB@
+ MPI_LIBC = @MPI_LIBC@
+ MPI_LIBFC = @MPI_LIBFC@
+ MPI_LIB_DIRS = @MPI_LIB_DIRS@
+ NO_RANGE_CHECK = @NO_RANGE_CHECK@
+ OBJEXT = @OBJEXT@
+ OPTIM_TYPE = @OPTIM_TYPE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASTIX_HOSTARCH = @PASTIX_HOSTARCH@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ RANLIB = @RANLIB@
+ RANLIN = @RANLIN@
+ SCOTCH_INCLUDE = @SCOTCH_INCLUDE@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SIZEOF_INT = @SIZEOF_INT@
+ SIZEOF_LONG = @SIZEOF_LONG@
+ SIZEOF_PTR = @SIZEOF_PTR@
+ SIZEOF_PTRINBIT = @SIZEOF_PTRINBIT@
+ SKIP_TESTS_EIGEN = @SKIP_TESTS_EIGEN@
+ SKIP_TESTS_MPI = @SKIP_TESTS_MPI@
+ STATICTOOL = @STATICTOOL@
+ STDPROG = @STDPROG@
+ STD_GRAPH_OBJ = @STD_GRAPH_OBJ@
+ STD_LDFLAGS = @STD_LDFLAGS@
+ STD_LIBS = @STD_LIBS@
+ STRIP = @STRIP@
+ TEST_FFPP = @TEST_FFPP@
+ TEST_FFPPMPI = @TEST_FFPPMPI@
+ TEST_FFPP_MPI = @TEST_FFPP_MPI@
+ TOOL_COMPILE_NewSolver = @TOOL_COMPILE_NewSolver@
+ TOOL_COMPILE_fflapack = @TOOL_COMPILE_fflapack@
+ TOOL_COMPILE_gmm = @TOOL_COMPILE_gmm@
+ TOOL_COMPILE_gsl = @TOOL_COMPILE_gsl@
+ TOOL_COMPILE_hips = @TOOL_COMPILE_hips@
+ TOOL_COMPILE_iohdf5 = @TOOL_COMPILE_iohdf5@
+ TOOL_COMPILE_ipopt = @TOOL_COMPILE_ipopt@
+ TOOL_COMPILE_lapack = @TOOL_COMPILE_lapack@
+ TOOL_COMPILE_mmg3d = @TOOL_COMPILE_mmg3d@
+ TOOL_COMPILE_mshmet = @TOOL_COMPILE_mshmet@
+ TOOL_COMPILE_mumps = @TOOL_COMPILE_mumps@
+ TOOL_COMPILE_mumps_seq = @TOOL_COMPILE_mumps_seq@
+ TOOL_COMPILE_nlopt = @TOOL_COMPILE_nlopt@
+ TOOL_COMPILE_pardiso = @TOOL_COMPILE_pardiso@
+ TOOL_COMPILE_parmetis = @TOOL_COMPILE_parmetis@
+ TOOL_COMPILE_parms = @TOOL_COMPILE_parms@
+ TOOL_COMPILE_pastix = @TOOL_COMPILE_pastix@
+ TOOL_COMPILE_pipe = @TOOL_COMPILE_pipe@
+ TOOL_COMPILE_schwarz = @TOOL_COMPILE_schwarz@
+ TOOL_COMPILE_scotch = @TOOL_COMPILE_scotch@
+ TOOL_COMPILE_superlu = @TOOL_COMPILE_superlu@
+ TOOL_COMPILE_superludist = @TOOL_COMPILE_superludist@
+ TOOL_COMPILE_umfpack = @TOOL_COMPILE_umfpack@
+ TOOL_COMPILE_yams = @TOOL_COMPILE_yams@
+ TOOL_DYLIB_NewSolver = @TOOL_DYLIB_NewSolver@
+ TOOL_DYLIB_fflapack = @TOOL_DYLIB_fflapack@
+ TOOL_DYLIB_gmm = @TOOL_DYLIB_gmm@
+ TOOL_DYLIB_gsl = @TOOL_DYLIB_gsl@
+ TOOL_DYLIB_hips = @TOOL_DYLIB_hips@
+ TOOL_DYLIB_iohdf5 = @TOOL_DYLIB_iohdf5@
+ TOOL_DYLIB_ipopt = @TOOL_DYLIB_ipopt@
+ TOOL_DYLIB_lapack = @TOOL_DYLIB_lapack@
+ TOOL_DYLIB_mmg3d = @TOOL_DYLIB_mmg3d@
+ TOOL_DYLIB_mshmet = @TOOL_DYLIB_mshmet@
+ TOOL_DYLIB_mumps = @TOOL_DYLIB_mumps@
+ TOOL_DYLIB_mumps_seq = @TOOL_DYLIB_mumps_seq@
+ TOOL_DYLIB_nlopt = @TOOL_DYLIB_nlopt@
+ TOOL_DYLIB_pardiso = @TOOL_DYLIB_pardiso@
+ TOOL_DYLIB_parmetis = @TOOL_DYLIB_parmetis@
+ TOOL_DYLIB_parms = @TOOL_DYLIB_parms@
+ TOOL_DYLIB_pastix = @TOOL_DYLIB_pastix@
+ TOOL_DYLIB_pipe = @TOOL_DYLIB_pipe@
+ TOOL_DYLIB_schwarz = @TOOL_DYLIB_schwarz@
+ TOOL_DYLIB_scotch = @TOOL_DYLIB_scotch@
+ TOOL_DYLIB_superlu = @TOOL_DYLIB_superlu@
+ TOOL_DYLIB_superludist = @TOOL_DYLIB_superludist@
+ TOOL_DYLIB_umfpack = @TOOL_DYLIB_umfpack@
+ TOOL_DYLIB_yams = @TOOL_DYLIB_yams@
+ UMFPACKLIBS = @UMFPACKLIBS@
+ VERSION = @VERSION@
+ WGET = @WGET@
+ WIN32DLLTARGET = @WIN32DLLTARGET@
+ WINDRESOBJ = @WINDRESOBJ@
+ WITH_CXX11 = @WITH_CXX11@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_FC = @ac_ct_FC@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ ff_bison = @ff_bison@
+ ff_convert = @ff_convert@
+ ff_curl = @ff_curl@
+ ff_dvips = @ff_dvips@
+ ff_flex = @ff_flex@
+ ff_git = @ff_git@
+ ff_gzip = @ff_gzip@
+ ff_history = @ff_history@
+ ff_latex = @ff_latex@
+ ff_libtool = @ff_libtool@
+ ff_m4 = @ff_m4@
+ ff_makeindex = @ff_makeindex@
+ ff_patch = @ff_patch@
+ ff_pdf2ps = @ff_pdf2ps@
+ ff_pdflatex = @ff_pdflatex@
+ ff_prefix_dir = @ff_prefix_dir@
+ ff_unzip = @ff_unzip@
+ ff_wget = @ff_wget@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
++>>>>>>> upstream/3.36:download/Makefile.in
  SUBDIRS = blas arpack umfpack  
  EXTRA_DIST = \
  ./nlopt/Make.inc ./nlopt/Makefile \
@@@ -537,15 -550,15 +847,27 @@@ getal
  # FFCS: See [[file:../../../configure.ac::tools_problems_all_platforms]] for reasons why some tools may be deactivated
  
  # <<no_more_blacs>> blacs is included in scalapack 2.0.2
++<<<<<<< HEAD:download/Makefile
 +MPI_SOFT = parmetis scalapack superludist	\
 +	mumps pastix			\
 +	hips parms
 +
 +LIST_SOFT = tetgen superlu fftw metis	\
 +	scotch mshmet			\
 +	yams mmg3d gmm			\
 +	nlopt mumps-seq			\
 +	ipopt 
++=======
+ MPI_SOFT = scalapack @TOOL_COMPILE_superludist@	\
+ 	@TOOL_COMPILE_mumps@ @TOOL_COMPILE_pastix@			\
+ 	@TOOL_COMPILE_hips@ @TOOL_COMPILE_parms@
+ 
+ LIST_SOFT = tetgen @TOOL_COMPILE_parmetis@ @TOOL_COMPILE_superlu@ fftw 	\
+ 	@TOOL_COMPILE_scotch@ @TOOL_COMPILE_mshmet@			\
+ 	@TOOL_COMPILE_yams@ @TOOL_COMPILE_mmg3d@  @TOOL_COMPILE_gmm@	\
+ 	@TOOL_COMPILE_nlopt@ @TOOL_COMPILE_mumps_seq@			\
+ 	@TOOL_COMPILE_ipopt@ 
++>>>>>>> upstream/3.36:download/Makefile.in
  
  all: all-recursive
  
diff --cc download/fftw/Makefile.orig
index ce818a2,7cdb753..26b9bad
--- a/download/fftw/Makefile.orig
+++ b/download/fftw/Makefile.orig
@@@ -1,7 -1,7 +1,12 @@@
++<<<<<<< HEAD:download/fftw/Makefile
 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
 +# download/fftw/Makefile.  Generated from Makefile.in by configure.
++=======
+ # Makefile.in generated by automake 1.15 from Makefile.am.
+ # @configure_input@
++>>>>>>> upstream/3.36:download/fftw/Makefile.in
  
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+ # Copyright (C) 1994-2014 Free Software Foundation, Inc.
  
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
@@@ -16,8 -16,18 +21,23 @@@
  
  # Downloading and compiling extra libraries
  # -----------------------------------------
++<<<<<<< HEAD:download/fftw/Makefile
 +
 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++=======
+ VPATH = @srcdir@
+ am__is_gnu_make = { \
+   if test -z '$(MAKELEVEL)'; then \
+     false; \
+   elif test -n '$(MAKE_HOST)'; then \
+     true; \
+   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+     true; \
+   else \
+     false; \
+   fi; \
+ }
++>>>>>>> upstream/3.36:download/fftw/Makefile.in
  am__make_running_with_option = \
    case $${target_option-} in \
        ?) ;; \
@@@ -78,10 -88,9 +98,13 @@@ POST_INSTALL = 
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
 -build_triplet = @build@
 -host_triplet = @host@
 +build_triplet = x86_64-pc-linux-gnu
 +host_triplet = x86_64-pc-linux-gnu
  subdir = download/fftw
++<<<<<<< HEAD:download/fftw/Makefile
 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
++=======
++>>>>>>> upstream/3.36:download/fftw/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/acmacros.m4 \
  	$(top_srcdir)/acoptim.m4 $(top_srcdir)/ax_lib_hdf5.m4 \
@@@ -89,7 -98,8 +112,12 @@@
  	$(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
++<<<<<<< HEAD:download/fftw/Makefile
 +mkinstalldirs = $(install_sh) -d
++=======
+ DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++>>>>>>> upstream/3.36:download/fftw/Makefile.in
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
@@@ -113,283 -123,285 +141,564 @@@ am__can_run_installinfo = 
      *) (install-info --version) >/dev/null 2>&1;; \
    esac
  am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++<<<<<<< HEAD:download/fftw/Makefile
 +ACLOCAL = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing aclocal-1.14
 +ADD_PACKAGE_NAME = 
 +AMTAR = $${TAR-tar}
 +AM_DEFAULT_VERBOSITY = 1
 +AR = ar
 +ARFLAGS = rv
 +ARPACKLIB = 
 +ARPACKLIBS = -larpack -llapack
 +AUTOCONF = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing autoconf
 +AUTOHEADER = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing autoheader
 +AUTOMAKE = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing automake-1.14
 +AWK = gawk
 +BAMGPROG = bamg cvmsh2
 +BLASINC = 
 +BLASLIBS = -lblas
 +CC = gcc -Wl,-z,relro
 +CCDEPMODE = depmode=none
 +CFLAGS = -g  -fstack-protector-strong -Wformat -Werror=format-security -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
 +CFLAGSF77 = -DAdd_
 +CNOFLAGS =  -fPIC
 +COMPILE_OPENBLAS = 
 +CPPFLAGS = -D_FORTIFY_SOURCE=2
 +CXX = g++ -Wl,-z,relro
 +CXX11FLAGS = -std=c++11
 +CXXCPP = g++ -Wl,-z,relro -E
 +CXXDEPMODE = depmode=none
 +CXXFLAGS =  -DBAMG_LONG_LONG  -DNCHECKPTR -fPIC
 +CYGPATH_W = echo
 +DEFS = -DHAVE_CONFIG_H
 +DEPDIR = .deps
 +DOCPDF = freefem++doc.pdf
 +DOCPS = freefem++doc.ps
 +DOCPSGZ = freefem++doc.ps.gz
 +DOWNLOADCOMPILE = 
 +DOWNLOADED_BLAS = 
 +DOWNLOADED_BLAS_BUILT_SOURCES = 
 +DOWNLOAD_ARPACK = 
 +DOWNLOAD_FFTW = 
 +DOWNLOAD_UMFPACK = 
 +DYLIB_SUFFIX = so
 +ECHO_C = 
 +ECHO_N = -n
 +ECHO_T = 
 +EGREP = /bin/grep -E
 +EIGENOBJ = eigenvalue.$(OBJEXT)
 +ENABLE_FFCS = no
 +EPSTOPDF = epstopdf
 +EXEEXT = 
 +F77 = gfortran
 +FC = gfortran
 +FCFLAGS = -g -O2 -fstack-protector-strong -fPIC
 +FFGLUTNAME = 
 +FFGLUTPROG = ffglut
 +FFLAGS = -g  -fstack-protector-strong -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
 +FFMETIS_CFLAGS = 
 +FF_LAPACKdir = 
 +FF_MALLOC_H = 1
 +FF_SECOND = second.o
 +FF_UMFPACK_CONFIG = 
 +FLIBS = /usr/lib/gcc/x86_64-linux-gnu/4.9/libgfortran.so
 +FNOFLAGS =  -fPIC
 +G2CLIB = /usr/lib/gcc/x86_64-linux-gnu/4.9/libgfortran.so
 +GCCNOCYGWIN = 
 +GREP = /bin/grep
 +GSL_CFLAGS = -I/usr/include
 +GSL_CONFIG = /usr/bin/gsl-config
 +GSL_LIBS = -L/usr/lib -lgsl -lgslcblas -lm
 +H5CC = /usr/bin/h5cc
 +H5FC = /usr/bin/h5fc
 +HDF5_CC = /usr/bin/cc
 +HDF5_CFLAGS = 
 +HDF5_CPPFLAGS = -I/usr/include/hdf5/serial -I/usr/include
 +HDF5_FC = 
 +HDF5_FFLAGS = -I/usr/lib/x86_64-linux-gnu/hdf5/serial -L/usr/lib/x86_64-linux-gnu/hdf5/serial -I/usr/include/hdf5/serial 
 +HDF5_FLIBS =  -lm -ldl -lz -lpthread -lhdf5_fortran -lhdf5 -lhdf5hl_fortran -lhdf5_hl
 +HDF5_LDFLAGS = -L/usr/lib/x86_64-linux-gnu/hdf5/serial 
 +HDF5_LIBS = -lm -ldl -lz -lpthread  -lhdf5 -lhdf5_hl
 +HDF5_VERSION = 1.8.13
 +HISTORY = 
 +INSTALL = /usr/bin/install -c
 +INSTALL_DATA = ${INSTALL} -m 644
 +INSTALL_PROGRAM = ${INSTALL}
 +INSTALL_SCRIPT = ${INSTALL}
 +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 +KERNEL_VERSION = 3.16.0
 +LAPACKLIBS = -llapack
 +LAPACK_arpack_LIB = 
 +LDFLAGS = -Wl,-z,relro -rdynamic
 +LEX = flex
 +LEXLIB = 
 +LEX_OUTPUT_ROOT = lex.yy
 +LIBC_VERSION = libc-2.19
 +LIBOBJS = 
 +LIBS = -ldl -lm  /usr/lib/gcc/x86_64-linux-gnu/4.9/libgfortran.so -L/usr/lib/x86_64-linux-gnu/hdf5/serial   -lm -ldl -lz -lpthread  -lhdf5 -lhdf5_hl
 +LIBSGLUT = -lglut -lGLU -lGL
 +LIBSNOCONSOLE = 
 +LIBSPTHREAD = -lpthread
 +LOAD_COMPILE = load_compile
 +LOAD_TESTS = ../regtests.sh
 +LTLIBOBJS = 
 +MAINT = #
 +MAKEINFO = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing makeinfo
 +MEDITPROG = ffmedit
 +MKDIR_P = /bin/mkdir -p
 +MPICC = /usr/bin/mpicc
 +MPICXX = mpic++ -Wl,-z,relro
 +MPIF77 = /usr/bin/mpif90
 +MPIFC = /usr/bin/mpif90
 +MPIPROG = FreeFem++-mpi
 +MPIRUN = /usr/bin/mpirun
 +MPISCRIPT = ff-mpirun
 +MPI_INCLUDE = 
 +MPI_INC_DIR = 
 +MPI_LIB = -Wl,-z,relro 
 +MPI_LIBC = 
 +MPI_LIBFC = -pthread -L/usr//lib -L/usr/lib/openmpi/lib -lmpi_f90 -lmpi_f77 -lmpi -ldl -lhwloc 
 +MPI_LIB_DIRS = 
 +NO_RANGE_CHECK = 
 +OBJEXT = o
 +OPTIM_TYPE = 
 +PACKAGE = fftw-$(FFTW_VERSION).tar.gz
 +PACKAGE_BUGREPORT = hecht at ann.jussieu.fr
 +PACKAGE_NAME = FreeFem++
 +PACKAGE_STRING = FreeFem++ 3.35
 +PACKAGE_TARNAME = freefem++
 +PACKAGE_URL = 
 +PACKAGE_VERSION = 3.35
 +PASTIX_HOSTARCH = 
 +PATH_SEPARATOR = :
 +RANLIB = ranlib
 +RANLIN = ranlib
 +SCOTCH_INCLUDE = /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/download/include/scotch
 +SED = /bin/sed
 +SET_MAKE = 
 +SHELL = /bin/bash
 +SIZEOF_INT = 4
 +SIZEOF_LONG = 8
 +SIZEOF_PTR = 8
 +SIZEOF_PTRINBIT = 64
 +SKIP_TESTS_EIGEN = 
 +SKIP_TESTS_MPI = no
 +STATICTOOL = 
 +STDPROG = 
 +STD_GRAPH_OBJ = 
 +STD_LDFLAGS = 
 +STD_LIBS = 
 +STRIP = 
 +TEST_FFPP = ../src/nw/FreeFem++
 +TEST_FFPPMPI = ../src/mpi/ff-mpirun
 +TEST_FFPP_MPI = ../src/mpi/FreeFem++-mpi
 +TOOL_COMPILE_NewSolver = NewSolver
 +TOOL_COMPILE_fflapack = fflapack
 +TOOL_COMPILE_gsl = gsl
 +TOOL_COMPILE_hips = hips
 +TOOL_COMPILE_iohdf5 = iohdf5
 +TOOL_COMPILE_ipopt = ipopt
 +TOOL_COMPILE_lapack = lapack
 +TOOL_COMPILE_metis = metis
 +TOOL_COMPILE_mmg3d = mmg3d
 +TOOL_COMPILE_mshmet = mshmet
 +TOOL_COMPILE_mumps = mumps
 +TOOL_COMPILE_mumps_seq = mumps-seq
 +TOOL_COMPILE_nlopt = nlopt
 +TOOL_COMPILE_pardiso = 
 +TOOL_COMPILE_parmetis = parmetis
 +TOOL_COMPILE_parms = parms
 +TOOL_COMPILE_pastix = pastix
 +TOOL_COMPILE_pipe = pipe
 +TOOL_COMPILE_schwarz = 
 +TOOL_COMPILE_scotch = scotch
 +TOOL_COMPILE_superlu = superlu
 +TOOL_COMPILE_superludist = superludist
 +TOOL_COMPILE_umfpack = umfpack
 +TOOL_COMPILE_yams = yams
 +TOOL_DYLIB_NewSolver = NewSolver.so
 +TOOL_DYLIB_fflapack = fflapack.so
 +TOOL_DYLIB_gsl = gsl.so
 +TOOL_DYLIB_hips = hips_FreeFem.so
 +TOOL_DYLIB_iohdf5 = iohdf5.so
 +TOOL_DYLIB_ipopt = ff-Ipopt.so
 +TOOL_DYLIB_lapack = lapack.so
 +TOOL_DYLIB_metis = metis.so
 +TOOL_DYLIB_mmg3d = mmg3d-v4.0.so
 +TOOL_DYLIB_mshmet = mshmet.so
 +TOOL_DYLIB_mumps = MUMPS_FreeFem.so MUMPS.so
 +TOOL_DYLIB_mumps_seq = MUMPS_seq.so MUMPS.so
 +TOOL_DYLIB_nlopt = ff-NLopt.so
 +TOOL_DYLIB_pardiso = 
 +TOOL_DYLIB_parmetis = 
 +TOOL_DYLIB_parms = parms_FreeFem.so
 +TOOL_DYLIB_pastix = interfacepastix.so complex_pastix_FreeFem.so real_pastix_FreeFem.so
 +TOOL_DYLIB_pipe = pipe.so
 +TOOL_DYLIB_schwarz = 
 +TOOL_DYLIB_scotch = scotch.so
 +TOOL_DYLIB_superlu = SuperLu.so
 +TOOL_DYLIB_superludist = complex_SuperLU_DIST_FreeFem.so real_SuperLU_DIST_FreeFem.so dSuperLU_DIST.so
 +TOOL_DYLIB_umfpack = UMFPACK64.so
 +TOOL_DYLIB_yams = freeyams.so
 +UMFPACKLIBS = -lumfpack  -lamd -lcholmod -lcolamd
 +VERSION = 3.35
 +WGET = wget --no-check-certificate
 +WIN32DLLTARGET = 
 +WINDRESOBJ = 
 +WITH_CXX11 = yes
 +YACC = bison -y
 +YFLAGS = 
 +abs_builddir = /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/download/fftw
 +abs_srcdir = /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/download/fftw
 +abs_top_builddir = /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++
 +abs_top_srcdir = /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++
 +ac_ct_CC = gcc -Wl,-z,relro
 +ac_ct_CXX = 
 +ac_ct_F77 = gfortran
 +ac_ct_FC = gfortran
 +am__include = include
 +am__leading_dot = .
 +am__quote = 
 +am__tar = $${TAR-tar} chof - "$$tardir"
 +am__untar = $${TAR-tar} xf -
 +bindir = ${exec_prefix}/bin
 +build = x86_64-pc-linux-gnu
 +build_alias = x86_64-linux-gnu
 +build_cpu = x86_64
 +build_os = linux-gnu
 +build_vendor = pc
 +builddir = .
 +datadir = ${datarootdir}
 +datarootdir = ${prefix}/share
 +docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 +dvidir = ${docdir}
 +exec_prefix = ${prefix}
 +ff_bison = yes
 +ff_convert = yes
 +ff_curl = 
 +ff_dvips = yes
 +ff_git = 
 +ff_gzip = yes
 +ff_history = 
 +ff_latex = yes
 +ff_libtool = yes
 +ff_m4 = yes
 +ff_makeindex = yes
 +ff_patch = yes
 +ff_pdf2ps = yes
 +ff_pdflatex = yes
 +ff_prefix_dir = /usr/lib/ff++/3.35
 +ff_unzip = 
 +ff_wget = yes
 +host = x86_64-pc-linux-gnu
 +host_alias = 
 +host_cpu = x86_64
 +host_os = linux-gnu
 +host_vendor = pc
 +htmldir = ${docdir}
 +includedir = ${prefix}/include
 +infodir = ${prefix}/share/info
 +install_sh = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/install-sh
 +libdir = ${prefix}/lib/x86_64-linux-gnu
 +libexecdir = ${prefix}/lib/x86_64-linux-gnu
 +localedir = ${datarootdir}/locale
 +localstatedir = /var
 +mandir = ${prefix}/share/man
 +mkdir_p = $(MKDIR_P)
 +oldincludedir = /usr/include
 +pdfdir = ${docdir}
 +prefix = /usr
 +program_transform_name = s,x,x,
 +psdir = ${docdir}
 +sbindir = ${exec_prefix}/sbin
 +sharedstatedir = ${prefix}/com
 +srcdir = .
 +sysconfdir = /etc
 +target_alias = 
 +top_build_prefix = ../../
 +top_builddir = ../..
 +top_srcdir = ../..
++=======
+ ACLOCAL = @ACLOCAL@
+ ADD_PACKAGE_NAME = @ADD_PACKAGE_NAME@
+ AMTAR = @AMTAR@
+ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ AR = @AR@
+ ARFLAGS = @ARFLAGS@
+ ARPACKLIB = @ARPACKLIB@
+ ARPACKLIBS = @ARPACKLIBS@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ BAMGPROG = @BAMGPROG@
+ BLASINC = @BLASINC@
+ BLASLIBS = @BLASLIBS@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CFLAGSF77 = @CFLAGSF77@
+ CNOFLAGS = @CNOFLAGS@
+ COMPILE_OPENBLAS = @COMPILE_OPENBLAS@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXX11FLAGS = @CXX11FLAGS@
+ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DOCPDF = @DOCPDF@
+ DOCPS = @DOCPS@
+ DOCPSGZ = @DOCPSGZ@
+ DOWNLOADCOMPILE = @DOWNLOADCOMPILE@
+ DOWNLOADED_BLAS = @DOWNLOADED_BLAS@
+ DOWNLOADED_BLAS_BUILT_SOURCES = @DOWNLOADED_BLAS_BUILT_SOURCES@
+ DOWNLOAD_ARPACK = @DOWNLOAD_ARPACK@
+ DOWNLOAD_FFTW = @DOWNLOAD_FFTW@
+ DOWNLOAD_UMFPACK = @DOWNLOAD_UMFPACK@
+ DYLIB_SUFFIX = @DYLIB_SUFFIX@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EIGENOBJ = @EIGENOBJ@
+ ENABLE_FFCS = @ENABLE_FFCS@
+ EPSTOPDF = @EPSTOPDF@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FC = @FC@
+ FCFLAGS = @FCFLAGS@
+ FFGLUTNAME = @FFGLUTNAME@
+ FFGLUTPROG = @FFGLUTPROG@
+ FFLAGS = @FFLAGS@
+ FF_HAVE_REGEX_H = @FF_HAVE_REGEX_H@
+ FF_LAPACKdir = @FF_LAPACKdir@
+ FF_MALLOC_H = @FF_MALLOC_H@
+ FF_SECOND = @FF_SECOND@
+ FF_UMFPACK_CONFIG = @FF_UMFPACK_CONFIG@
+ FLIBS = @FLIBS@
+ FNOFLAGS = @FNOFLAGS@
+ G2CLIB = @G2CLIB@
+ GCCNOCYGWIN = @GCCNOCYGWIN@
+ GREP = @GREP@
+ GSL_CFLAGS = @GSL_CFLAGS@
+ GSL_CONFIG = @GSL_CONFIG@
+ GSL_LIBS = @GSL_LIBS@
+ H5CC = @H5CC@
+ H5FC = @H5FC@
+ HDF5_CC = @HDF5_CC@
+ HDF5_CFLAGS = @HDF5_CFLAGS@
+ HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
+ HDF5_FC = @HDF5_FC@
+ HDF5_FFLAGS = @HDF5_FFLAGS@
+ HDF5_FLIBS = @HDF5_FLIBS@
+ HDF5_LDFLAGS = @HDF5_LDFLAGS@
+ HDF5_LIBS = @HDF5_LIBS@
+ HDF5_VERSION = @HDF5_VERSION@
+ HISTORY = @HISTORY@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ KERNEL_VERSION = @KERNEL_VERSION@
+ LAPACKLIBS = @LAPACKLIBS@
+ LAPACK_arpack_LIB = @LAPACK_arpack_LIB@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBC_VERSION = @LIBC_VERSION@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBSGLUT = @LIBSGLUT@
+ LIBSNOCONSOLE = @LIBSNOCONSOLE@
+ LIBSPTHREAD = @LIBSPTHREAD@
+ LOAD_COMPILE = @LOAD_COMPILE@
+ LOAD_TESTS = @LOAD_TESTS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MEDITPROG = @MEDITPROG@
+ MKDIR_P = @MKDIR_P@
+ MPICC = @MPICC@
+ MPICXX = @MPICXX@
+ MPIF77 = @MPIF77@
+ MPIFC = @MPIFC@
+ MPIPROG = @MPIPROG@
+ MPIRUN = @MPIRUN@
+ MPISCRIPT = @MPISCRIPT@
+ MPI_INCLUDE = @MPI_INCLUDE@
+ MPI_INC_DIR = @MPI_INC_DIR@
+ MPI_LIB = @MPI_LIB@
+ MPI_LIBC = @MPI_LIBC@
+ MPI_LIBFC = @MPI_LIBFC@
+ MPI_LIB_DIRS = @MPI_LIB_DIRS@
+ NO_RANGE_CHECK = @NO_RANGE_CHECK@
+ OBJEXT = @OBJEXT@
+ OPTIM_TYPE = @OPTIM_TYPE@
+ PACKAGE = fftw-$(FFTW_VERSION).tar.gz
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASTIX_HOSTARCH = @PASTIX_HOSTARCH@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ RANLIB = @RANLIB@
+ RANLIN = @RANLIN@
+ SCOTCH_INCLUDE = @SCOTCH_INCLUDE@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SIZEOF_INT = @SIZEOF_INT@
+ SIZEOF_LONG = @SIZEOF_LONG@
+ SIZEOF_PTR = @SIZEOF_PTR@
+ SIZEOF_PTRINBIT = @SIZEOF_PTRINBIT@
+ SKIP_TESTS_EIGEN = @SKIP_TESTS_EIGEN@
+ SKIP_TESTS_MPI = @SKIP_TESTS_MPI@
+ STATICTOOL = @STATICTOOL@
+ STDPROG = @STDPROG@
+ STD_GRAPH_OBJ = @STD_GRAPH_OBJ@
+ STD_LDFLAGS = @STD_LDFLAGS@
+ STD_LIBS = @STD_LIBS@
+ STRIP = @STRIP@
+ TEST_FFPP = @TEST_FFPP@
+ TEST_FFPPMPI = @TEST_FFPPMPI@
+ TEST_FFPP_MPI = @TEST_FFPP_MPI@
+ TOOL_COMPILE_NewSolver = @TOOL_COMPILE_NewSolver@
+ TOOL_COMPILE_fflapack = @TOOL_COMPILE_fflapack@
+ TOOL_COMPILE_gmm = @TOOL_COMPILE_gmm@
+ TOOL_COMPILE_gsl = @TOOL_COMPILE_gsl@
+ TOOL_COMPILE_hips = @TOOL_COMPILE_hips@
+ TOOL_COMPILE_iohdf5 = @TOOL_COMPILE_iohdf5@
+ TOOL_COMPILE_ipopt = @TOOL_COMPILE_ipopt@
+ TOOL_COMPILE_lapack = @TOOL_COMPILE_lapack@
+ TOOL_COMPILE_mmg3d = @TOOL_COMPILE_mmg3d@
+ TOOL_COMPILE_mshmet = @TOOL_COMPILE_mshmet@
+ TOOL_COMPILE_mumps = @TOOL_COMPILE_mumps@
+ TOOL_COMPILE_mumps_seq = @TOOL_COMPILE_mumps_seq@
+ TOOL_COMPILE_nlopt = @TOOL_COMPILE_nlopt@
+ TOOL_COMPILE_pardiso = @TOOL_COMPILE_pardiso@
+ TOOL_COMPILE_parmetis = @TOOL_COMPILE_parmetis@
+ TOOL_COMPILE_parms = @TOOL_COMPILE_parms@
+ TOOL_COMPILE_pastix = @TOOL_COMPILE_pastix@
+ TOOL_COMPILE_pipe = @TOOL_COMPILE_pipe@
+ TOOL_COMPILE_schwarz = @TOOL_COMPILE_schwarz@
+ TOOL_COMPILE_scotch = @TOOL_COMPILE_scotch@
+ TOOL_COMPILE_superlu = @TOOL_COMPILE_superlu@
+ TOOL_COMPILE_superludist = @TOOL_COMPILE_superludist@
+ TOOL_COMPILE_umfpack = @TOOL_COMPILE_umfpack@
+ TOOL_COMPILE_yams = @TOOL_COMPILE_yams@
+ TOOL_DYLIB_NewSolver = @TOOL_DYLIB_NewSolver@
+ TOOL_DYLIB_fflapack = @TOOL_DYLIB_fflapack@
+ TOOL_DYLIB_gmm = @TOOL_DYLIB_gmm@
+ TOOL_DYLIB_gsl = @TOOL_DYLIB_gsl@
+ TOOL_DYLIB_hips = @TOOL_DYLIB_hips@
+ TOOL_DYLIB_iohdf5 = @TOOL_DYLIB_iohdf5@
+ TOOL_DYLIB_ipopt = @TOOL_DYLIB_ipopt@
+ TOOL_DYLIB_lapack = @TOOL_DYLIB_lapack@
+ TOOL_DYLIB_mmg3d = @TOOL_DYLIB_mmg3d@
+ TOOL_DYLIB_mshmet = @TOOL_DYLIB_mshmet@
+ TOOL_DYLIB_mumps = @TOOL_DYLIB_mumps@
+ TOOL_DYLIB_mumps_seq = @TOOL_DYLIB_mumps_seq@
+ TOOL_DYLIB_nlopt = @TOOL_DYLIB_nlopt@
+ TOOL_DYLIB_pardiso = @TOOL_DYLIB_pardiso@
+ TOOL_DYLIB_parmetis = @TOOL_DYLIB_parmetis@
+ TOOL_DYLIB_parms = @TOOL_DYLIB_parms@
+ TOOL_DYLIB_pastix = @TOOL_DYLIB_pastix@
+ TOOL_DYLIB_pipe = @TOOL_DYLIB_pipe@
+ TOOL_DYLIB_schwarz = @TOOL_DYLIB_schwarz@
+ TOOL_DYLIB_scotch = @TOOL_DYLIB_scotch@
+ TOOL_DYLIB_superlu = @TOOL_DYLIB_superlu@
+ TOOL_DYLIB_superludist = @TOOL_DYLIB_superludist@
+ TOOL_DYLIB_umfpack = @TOOL_DYLIB_umfpack@
+ TOOL_DYLIB_yams = @TOOL_DYLIB_yams@
+ UMFPACKLIBS = @UMFPACKLIBS@
+ VERSION = @VERSION@
+ WGET = @WGET@
+ WIN32DLLTARGET = @WIN32DLLTARGET@
+ WINDRESOBJ = @WINDRESOBJ@
+ WITH_CXX11 = @WITH_CXX11@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_FC = @ac_ct_FC@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ ff_bison = @ff_bison@
+ ff_convert = @ff_convert@
+ ff_curl = @ff_curl@
+ ff_dvips = @ff_dvips@
+ ff_flex = @ff_flex@
+ ff_git = @ff_git@
+ ff_gzip = @ff_gzip@
+ ff_history = @ff_history@
+ ff_latex = @ff_latex@
+ ff_libtool = @ff_libtool@
+ ff_m4 = @ff_m4@
+ ff_makeindex = @ff_makeindex@
+ ff_patch = @ff_patch@
+ ff_pdf2ps = @ff_pdf2ps@
+ ff_pdflatex = @ff_pdflatex@
+ ff_prefix_dir = @ff_prefix_dir@
+ ff_unzip = @ff_unzip@
+ ff_wget = @ff_wget@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
++>>>>>>> upstream/3.36:download/fftw/Makefile.in
  
  # Downloading and compiling FFTW
  # ------------------------------
diff --cc download/umfpack/Makefile.orig
index 2a9929a,bbfbc56..85923ce
--- a/download/umfpack/Makefile.orig
+++ b/download/umfpack/Makefile.orig
@@@ -1,7 -1,7 +1,12 @@@
++<<<<<<< HEAD:download/umfpack/Makefile
 +# Makefile.in generated by automake 1.14.1 from Makefile.am.
 +# download/umfpack/Makefile.  Generated from Makefile.in by configure.
++=======
+ # Makefile.in generated by automake 1.15 from Makefile.am.
+ # @configure_input@
++>>>>>>> upstream/3.36:download/umfpack/Makefile.in
  
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+ # Copyright (C) 1994-2014 Free Software Foundation, Inc.
  
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
@@@ -36,8 -36,18 +41,23 @@@
  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  # ======================================================================
  # headeralh brief="Downloading and compiling extra libraries for Umfpack" default=0 freefem make multipleauthors start=04/06/04 upmc
++<<<<<<< HEAD:download/umfpack/Makefile
 +
 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++=======
+ VPATH = @srcdir@
+ am__is_gnu_make = { \
+   if test -z '$(MAKELEVEL)'; then \
+     false; \
+   elif test -n '$(MAKE_HOST)'; then \
+     true; \
+   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+     true; \
+   else \
+     false; \
+   fi; \
+ }
++>>>>>>> upstream/3.36:download/umfpack/Makefile.in
  am__make_running_with_option = \
    case $${target_option-} in \
        ?) ;; \
@@@ -98,10 -108,9 +118,13 @@@ POST_INSTALL = 
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
 -build_triplet = @build@
 -host_triplet = @host@
 +build_triplet = x86_64-pc-linux-gnu
 +host_triplet = x86_64-pc-linux-gnu
  subdir = download/umfpack
++<<<<<<< HEAD:download/umfpack/Makefile
 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
++=======
++>>>>>>> upstream/3.36:download/umfpack/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/acmacros.m4 \
  	$(top_srcdir)/acoptim.m4 $(top_srcdir)/ax_lib_hdf5.m4 \
@@@ -109,7 -118,8 +132,12 @@@
  	$(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
++<<<<<<< HEAD:download/umfpack/Makefile
 +mkinstalldirs = $(install_sh) -d
++=======
+ DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++>>>>>>> upstream/3.36:download/umfpack/Makefile.in
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
@@@ -133,283 -143,285 +161,564 @@@ am__can_run_installinfo = 
      *) (install-info --version) >/dev/null 2>&1;; \
    esac
  am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++<<<<<<< HEAD:download/umfpack/Makefile
 +ACLOCAL = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing aclocal-1.14
 +ADD_PACKAGE_NAME = 
 +AMTAR = $${TAR-tar}
 +AM_DEFAULT_VERBOSITY = 1
 +AR = ar
 +ARFLAGS = rv
 +ARPACKLIB = 
 +ARPACKLIBS = -larpack -llapack
 +AUTOCONF = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing autoconf
 +AUTOHEADER = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing autoheader
 +AUTOMAKE = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing automake-1.14
 +AWK = gawk
 +BAMGPROG = bamg cvmsh2
 +BLASINC = 
 +BLASLIBS = -lblas
 +CC = gcc -Wl,-z,relro
 +CCDEPMODE = depmode=none
 +CFLAGS = -g  -fstack-protector-strong -Wformat -Werror=format-security -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
 +CFLAGSF77 = -DAdd_
 +CNOFLAGS =  -fPIC
 +COMPILE_OPENBLAS = 
 +CPPFLAGS = -D_FORTIFY_SOURCE=2
 +CXX = g++ -Wl,-z,relro
 +CXX11FLAGS = -std=c++11
 +CXXCPP = g++ -Wl,-z,relro -E
 +CXXDEPMODE = depmode=none
 +CXXFLAGS =  -DBAMG_LONG_LONG  -DNCHECKPTR -fPIC
 +CYGPATH_W = echo
 +DEFS = -DHAVE_CONFIG_H
 +DEPDIR = .deps
 +DOCPDF = freefem++doc.pdf
 +DOCPS = freefem++doc.ps
 +DOCPSGZ = freefem++doc.ps.gz
 +DOWNLOADCOMPILE = 
 +DOWNLOADED_BLAS = 
 +DOWNLOADED_BLAS_BUILT_SOURCES = 
 +DOWNLOAD_ARPACK = 
 +DOWNLOAD_FFTW = 
 +DOWNLOAD_UMFPACK = 
 +DYLIB_SUFFIX = so
 +ECHO_C = 
 +ECHO_N = -n
 +ECHO_T = 
 +EGREP = /bin/grep -E
 +EIGENOBJ = eigenvalue.$(OBJEXT)
 +ENABLE_FFCS = no
 +EPSTOPDF = epstopdf
 +EXEEXT = 
 +F77 = gfortran
 +FC = gfortran
 +FCFLAGS = -g -O2 -fstack-protector-strong -fPIC
 +FFGLUTNAME = 
 +FFGLUTPROG = ffglut
 +FFLAGS = -g  -fstack-protector-strong -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
 +FFMETIS_CFLAGS = 
 +FF_LAPACKdir = 
 +FF_MALLOC_H = 1
 +FF_SECOND = second.o
 +FF_UMFPACK_CONFIG = 
 +FLIBS = /usr/lib/gcc/x86_64-linux-gnu/4.9/libgfortran.so
 +FNOFLAGS =  -fPIC
 +G2CLIB = /usr/lib/gcc/x86_64-linux-gnu/4.9/libgfortran.so
 +GCCNOCYGWIN = 
 +GREP = /bin/grep
 +GSL_CFLAGS = -I/usr/include
 +GSL_CONFIG = /usr/bin/gsl-config
 +GSL_LIBS = -L/usr/lib -lgsl -lgslcblas -lm
 +H5CC = /usr/bin/h5cc
 +H5FC = /usr/bin/h5fc
 +HDF5_CC = /usr/bin/cc
 +HDF5_CFLAGS = 
 +HDF5_CPPFLAGS = -I/usr/include/hdf5/serial -I/usr/include
 +HDF5_FC = 
 +HDF5_FFLAGS = -I/usr/lib/x86_64-linux-gnu/hdf5/serial -L/usr/lib/x86_64-linux-gnu/hdf5/serial -I/usr/include/hdf5/serial 
 +HDF5_FLIBS =  -lm -ldl -lz -lpthread -lhdf5_fortran -lhdf5 -lhdf5hl_fortran -lhdf5_hl
 +HDF5_LDFLAGS = -L/usr/lib/x86_64-linux-gnu/hdf5/serial 
 +HDF5_LIBS = -lm -ldl -lz -lpthread  -lhdf5 -lhdf5_hl
 +HDF5_VERSION = 1.8.13
 +HISTORY = 
 +INSTALL = /usr/bin/install -c
 +INSTALL_DATA = ${INSTALL} -m 644
 +INSTALL_PROGRAM = ${INSTALL}
 +INSTALL_SCRIPT = ${INSTALL}
 +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 +KERNEL_VERSION = 3.16.0
 +LAPACKLIBS = -llapack
 +LAPACK_arpack_LIB = 
 +LDFLAGS = -Wl,-z,relro -rdynamic
 +LEX = flex
 +LEXLIB = 
 +LEX_OUTPUT_ROOT = lex.yy
 +LIBC_VERSION = libc-2.19
 +LIBOBJS = 
 +LIBS = -ldl -lm  /usr/lib/gcc/x86_64-linux-gnu/4.9/libgfortran.so -L/usr/lib/x86_64-linux-gnu/hdf5/serial   -lm -ldl -lz -lpthread  -lhdf5 -lhdf5_hl
 +LIBSGLUT = -lglut -lGLU -lGL
 +LIBSNOCONSOLE = 
 +LIBSPTHREAD = -lpthread
 +LOAD_COMPILE = load_compile
 +LOAD_TESTS = ../regtests.sh
 +LTLIBOBJS = 
 +MAINT = #
 +MAKEINFO = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing makeinfo
 +MEDITPROG = ffmedit
 +MKDIR_P = /bin/mkdir -p
 +MPICC = /usr/bin/mpicc
 +MPICXX = mpic++ -Wl,-z,relro
 +MPIF77 = /usr/bin/mpif90
 +MPIFC = /usr/bin/mpif90
 +MPIPROG = FreeFem++-mpi
 +MPIRUN = /usr/bin/mpirun
 +MPISCRIPT = ff-mpirun
 +MPI_INCLUDE = 
 +MPI_INC_DIR = 
 +MPI_LIB = -Wl,-z,relro 
 +MPI_LIBC = 
 +MPI_LIBFC = -pthread -L/usr//lib -L/usr/lib/openmpi/lib -lmpi_f90 -lmpi_f77 -lmpi -ldl -lhwloc 
 +MPI_LIB_DIRS = 
 +NO_RANGE_CHECK = 
 +OBJEXT = o
 +OPTIM_TYPE = 
 +PACKAGE = freefem++
 +PACKAGE_BUGREPORT = hecht at ann.jussieu.fr
 +PACKAGE_NAME = FreeFem++
 +PACKAGE_STRING = FreeFem++ 3.35
 +PACKAGE_TARNAME = freefem++
 +PACKAGE_URL = 
 +PACKAGE_VERSION = 3.35
 +PASTIX_HOSTARCH = 
 +PATH_SEPARATOR = :
 +RANLIB = ranlib
 +RANLIN = ranlib
 +SCOTCH_INCLUDE = /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/download/include/scotch
 +SED = /bin/sed
 +SET_MAKE = 
 +SHELL = /bin/bash
 +SIZEOF_INT = 4
 +SIZEOF_LONG = 8
 +SIZEOF_PTR = 8
 +SIZEOF_PTRINBIT = 64
 +SKIP_TESTS_EIGEN = 
 +SKIP_TESTS_MPI = no
 +STATICTOOL = 
 +STDPROG = 
 +STD_GRAPH_OBJ = 
 +STD_LDFLAGS = 
 +STD_LIBS = 
 +STRIP = 
 +TEST_FFPP = ../src/nw/FreeFem++
 +TEST_FFPPMPI = ../src/mpi/ff-mpirun
 +TEST_FFPP_MPI = ../src/mpi/FreeFem++-mpi
 +TOOL_COMPILE_NewSolver = NewSolver
 +TOOL_COMPILE_fflapack = fflapack
 +TOOL_COMPILE_gsl = gsl
 +TOOL_COMPILE_hips = hips
 +TOOL_COMPILE_iohdf5 = iohdf5
 +TOOL_COMPILE_ipopt = ipopt
 +TOOL_COMPILE_lapack = lapack
 +TOOL_COMPILE_metis = metis
 +TOOL_COMPILE_mmg3d = mmg3d
 +TOOL_COMPILE_mshmet = mshmet
 +TOOL_COMPILE_mumps = mumps
 +TOOL_COMPILE_mumps_seq = mumps-seq
 +TOOL_COMPILE_nlopt = nlopt
 +TOOL_COMPILE_pardiso = 
 +TOOL_COMPILE_parmetis = parmetis
 +TOOL_COMPILE_parms = parms
 +TOOL_COMPILE_pastix = pastix
 +TOOL_COMPILE_pipe = pipe
 +TOOL_COMPILE_schwarz = 
 +TOOL_COMPILE_scotch = scotch
 +TOOL_COMPILE_superlu = superlu
 +TOOL_COMPILE_superludist = superludist
 +TOOL_COMPILE_umfpack = umfpack
 +TOOL_COMPILE_yams = yams
 +TOOL_DYLIB_NewSolver = NewSolver.so
 +TOOL_DYLIB_fflapack = fflapack.so
 +TOOL_DYLIB_gsl = gsl.so
 +TOOL_DYLIB_hips = hips_FreeFem.so
 +TOOL_DYLIB_iohdf5 = iohdf5.so
 +TOOL_DYLIB_ipopt = ff-Ipopt.so
 +TOOL_DYLIB_lapack = lapack.so
 +TOOL_DYLIB_metis = metis.so
 +TOOL_DYLIB_mmg3d = mmg3d-v4.0.so
 +TOOL_DYLIB_mshmet = mshmet.so
 +TOOL_DYLIB_mumps = MUMPS_FreeFem.so MUMPS.so
 +TOOL_DYLIB_mumps_seq = MUMPS_seq.so MUMPS.so
 +TOOL_DYLIB_nlopt = ff-NLopt.so
 +TOOL_DYLIB_pardiso = 
 +TOOL_DYLIB_parmetis = 
 +TOOL_DYLIB_parms = parms_FreeFem.so
 +TOOL_DYLIB_pastix = interfacepastix.so complex_pastix_FreeFem.so real_pastix_FreeFem.so
 +TOOL_DYLIB_pipe = pipe.so
 +TOOL_DYLIB_schwarz = 
 +TOOL_DYLIB_scotch = scotch.so
 +TOOL_DYLIB_superlu = SuperLu.so
 +TOOL_DYLIB_superludist = complex_SuperLU_DIST_FreeFem.so real_SuperLU_DIST_FreeFem.so dSuperLU_DIST.so
 +TOOL_DYLIB_umfpack = UMFPACK64.so
 +TOOL_DYLIB_yams = freeyams.so
 +UMFPACKLIBS = -lumfpack  -lamd -lcholmod -lcolamd
 +VERSION = 3.35
 +WGET = wget --no-check-certificate
 +WIN32DLLTARGET = 
 +WINDRESOBJ = 
 +WITH_CXX11 = yes
 +YACC = bison -y
 +YFLAGS = 
 +abs_builddir = /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/download/umfpack
 +abs_srcdir = /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/download/umfpack
 +abs_top_builddir = /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++
 +abs_top_srcdir = /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++
 +ac_ct_CC = gcc -Wl,-z,relro
 +ac_ct_CXX = 
 +ac_ct_F77 = gfortran
 +ac_ct_FC = gfortran
 +am__include = include
 +am__leading_dot = .
 +am__quote = 
 +am__tar = $${TAR-tar} chof - "$$tardir"
 +am__untar = $${TAR-tar} xf -
 +bindir = ${exec_prefix}/bin
 +build = x86_64-pc-linux-gnu
 +build_alias = x86_64-linux-gnu
 +build_cpu = x86_64
 +build_os = linux-gnu
 +build_vendor = pc
 +builddir = .
 +datadir = ${datarootdir}
 +datarootdir = ${prefix}/share
 +docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 +dvidir = ${docdir}
 +exec_prefix = ${prefix}
 +ff_bison = yes
 +ff_convert = yes
 +ff_curl = 
 +ff_dvips = yes
 +ff_git = 
 +ff_gzip = yes
 +ff_history = 
 +ff_latex = yes
 +ff_libtool = yes
 +ff_m4 = yes
 +ff_makeindex = yes
 +ff_patch = yes
 +ff_pdf2ps = yes
 +ff_pdflatex = yes
 +ff_prefix_dir = /usr/lib/ff++/3.35
 +ff_unzip = 
 +ff_wget = yes
 +host = x86_64-pc-linux-gnu
 +host_alias = 
 +host_cpu = x86_64
 +host_os = linux-gnu
 +host_vendor = pc
 +htmldir = ${docdir}
 +includedir = ${prefix}/include
 +infodir = ${prefix}/share/info
 +install_sh = ${SHELL} /home/eftaxiop/Arxeia/Genika/Logismiko/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/install-sh
 +libdir = ${prefix}/lib/x86_64-linux-gnu
 +libexecdir = ${prefix}/lib/x86_64-linux-gnu
 +localedir = ${datarootdir}/locale
 +localstatedir = /var
 +mandir = ${prefix}/share/man
 +mkdir_p = $(MKDIR_P)
 +oldincludedir = /usr/include
 +pdfdir = ${docdir}
 +prefix = /usr
 +program_transform_name = s,x,x,
 +psdir = ${docdir}
 +sbindir = ${exec_prefix}/sbin
 +sharedstatedir = ${prefix}/com
 +srcdir = .
 +sysconfdir = /etc
 +target_alias = 
 +top_build_prefix = ../../
 +top_builddir = ../..
 +top_srcdir = ../..
++=======
+ ACLOCAL = @ACLOCAL@
+ ADD_PACKAGE_NAME = @ADD_PACKAGE_NAME@
+ AMTAR = @AMTAR@
+ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ AR = @AR@
+ ARFLAGS = @ARFLAGS@
+ ARPACKLIB = @ARPACKLIB@
+ ARPACKLIBS = @ARPACKLIBS@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ BAMGPROG = @BAMGPROG@
+ BLASINC = @BLASINC@
+ BLASLIBS = @BLASLIBS@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CFLAGSF77 = @CFLAGSF77@
+ CNOFLAGS = @CNOFLAGS@
+ COMPILE_OPENBLAS = @COMPILE_OPENBLAS@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXX11FLAGS = @CXX11FLAGS@
+ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DOCPDF = @DOCPDF@
+ DOCPS = @DOCPS@
+ DOCPSGZ = @DOCPSGZ@
+ DOWNLOADCOMPILE = @DOWNLOADCOMPILE@
+ DOWNLOADED_BLAS = @DOWNLOADED_BLAS@
+ DOWNLOADED_BLAS_BUILT_SOURCES = @DOWNLOADED_BLAS_BUILT_SOURCES@
+ DOWNLOAD_ARPACK = @DOWNLOAD_ARPACK@
+ DOWNLOAD_FFTW = @DOWNLOAD_FFTW@
+ DOWNLOAD_UMFPACK = @DOWNLOAD_UMFPACK@
+ DYLIB_SUFFIX = @DYLIB_SUFFIX@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EIGENOBJ = @EIGENOBJ@
+ ENABLE_FFCS = @ENABLE_FFCS@
+ EPSTOPDF = @EPSTOPDF@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FC = @FC@
+ FCFLAGS = @FCFLAGS@
+ FFGLUTNAME = @FFGLUTNAME@
+ FFGLUTPROG = @FFGLUTPROG@
+ FFLAGS = @FFLAGS@
+ FF_HAVE_REGEX_H = @FF_HAVE_REGEX_H@
+ FF_LAPACKdir = @FF_LAPACKdir@
+ FF_MALLOC_H = @FF_MALLOC_H@
+ FF_SECOND = @FF_SECOND@
+ FF_UMFPACK_CONFIG = @FF_UMFPACK_CONFIG@
+ FLIBS = @FLIBS@
+ FNOFLAGS = @FNOFLAGS@
+ G2CLIB = @G2CLIB@
+ GCCNOCYGWIN = @GCCNOCYGWIN@
+ GREP = @GREP@
+ GSL_CFLAGS = @GSL_CFLAGS@
+ GSL_CONFIG = @GSL_CONFIG@
+ GSL_LIBS = @GSL_LIBS@
+ H5CC = @H5CC@
+ H5FC = @H5FC@
+ HDF5_CC = @HDF5_CC@
+ HDF5_CFLAGS = @HDF5_CFLAGS@
+ HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
+ HDF5_FC = @HDF5_FC@
+ HDF5_FFLAGS = @HDF5_FFLAGS@
+ HDF5_FLIBS = @HDF5_FLIBS@
+ HDF5_LDFLAGS = @HDF5_LDFLAGS@
+ HDF5_LIBS = @HDF5_LIBS@
+ HDF5_VERSION = @HDF5_VERSION@
+ HISTORY = @HISTORY@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ KERNEL_VERSION = @KERNEL_VERSION@
+ LAPACKLIBS = @LAPACKLIBS@
+ LAPACK_arpack_LIB = @LAPACK_arpack_LIB@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBC_VERSION = @LIBC_VERSION@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBSGLUT = @LIBSGLUT@
+ LIBSNOCONSOLE = @LIBSNOCONSOLE@
+ LIBSPTHREAD = @LIBSPTHREAD@
+ LOAD_COMPILE = @LOAD_COMPILE@
+ LOAD_TESTS = @LOAD_TESTS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MEDITPROG = @MEDITPROG@
+ MKDIR_P = @MKDIR_P@
+ MPICC = @MPICC@
+ MPICXX = @MPICXX@
+ MPIF77 = @MPIF77@
+ MPIFC = @MPIFC@
+ MPIPROG = @MPIPROG@
+ MPIRUN = @MPIRUN@
+ MPISCRIPT = @MPISCRIPT@
+ MPI_INCLUDE = @MPI_INCLUDE@
+ MPI_INC_DIR = @MPI_INC_DIR@
+ MPI_LIB = @MPI_LIB@
+ MPI_LIBC = @MPI_LIBC@
+ MPI_LIBFC = @MPI_LIBFC@
+ MPI_LIB_DIRS = @MPI_LIB_DIRS@
+ NO_RANGE_CHECK = @NO_RANGE_CHECK@
+ OBJEXT = @OBJEXT@
+ OPTIM_TYPE = @OPTIM_TYPE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASTIX_HOSTARCH = @PASTIX_HOSTARCH@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ RANLIB = @RANLIB@
+ RANLIN = @RANLIN@
+ SCOTCH_INCLUDE = @SCOTCH_INCLUDE@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SIZEOF_INT = @SIZEOF_INT@
+ SIZEOF_LONG = @SIZEOF_LONG@
+ SIZEOF_PTR = @SIZEOF_PTR@
+ SIZEOF_PTRINBIT = @SIZEOF_PTRINBIT@
+ SKIP_TESTS_EIGEN = @SKIP_TESTS_EIGEN@
+ SKIP_TESTS_MPI = @SKIP_TESTS_MPI@
+ STATICTOOL = @STATICTOOL@
+ STDPROG = @STDPROG@
+ STD_GRAPH_OBJ = @STD_GRAPH_OBJ@
+ STD_LDFLAGS = @STD_LDFLAGS@
+ STD_LIBS = @STD_LIBS@
+ STRIP = @STRIP@
+ TEST_FFPP = @TEST_FFPP@
+ TEST_FFPPMPI = @TEST_FFPPMPI@
+ TEST_FFPP_MPI = @TEST_FFPP_MPI@
+ TOOL_COMPILE_NewSolver = @TOOL_COMPILE_NewSolver@
+ TOOL_COMPILE_fflapack = @TOOL_COMPILE_fflapack@
+ TOOL_COMPILE_gmm = @TOOL_COMPILE_gmm@
+ TOOL_COMPILE_gsl = @TOOL_COMPILE_gsl@
+ TOOL_COMPILE_hips = @TOOL_COMPILE_hips@
+ TOOL_COMPILE_iohdf5 = @TOOL_COMPILE_iohdf5@
+ TOOL_COMPILE_ipopt = @TOOL_COMPILE_ipopt@
+ TOOL_COMPILE_lapack = @TOOL_COMPILE_lapack@
+ TOOL_COMPILE_mmg3d = @TOOL_COMPILE_mmg3d@
+ TOOL_COMPILE_mshmet = @TOOL_COMPILE_mshmet@
+ TOOL_COMPILE_mumps = @TOOL_COMPILE_mumps@
+ TOOL_COMPILE_mumps_seq = @TOOL_COMPILE_mumps_seq@
+ TOOL_COMPILE_nlopt = @TOOL_COMPILE_nlopt@
+ TOOL_COMPILE_pardiso = @TOOL_COMPILE_pardiso@
+ TOOL_COMPILE_parmetis = @TOOL_COMPILE_parmetis@
+ TOOL_COMPILE_parms = @TOOL_COMPILE_parms@
+ TOOL_COMPILE_pastix = @TOOL_COMPILE_pastix@
+ TOOL_COMPILE_pipe = @TOOL_COMPILE_pipe@
+ TOOL_COMPILE_schwarz = @TOOL_COMPILE_schwarz@
+ TOOL_COMPILE_scotch = @TOOL_COMPILE_scotch@
+ TOOL_COMPILE_superlu = @TOOL_COMPILE_superlu@
+ TOOL_COMPILE_superludist = @TOOL_COMPILE_superludist@
+ TOOL_COMPILE_umfpack = @TOOL_COMPILE_umfpack@
+ TOOL_COMPILE_yams = @TOOL_COMPILE_yams@
+ TOOL_DYLIB_NewSolver = @TOOL_DYLIB_NewSolver@
+ TOOL_DYLIB_fflapack = @TOOL_DYLIB_fflapack@
+ TOOL_DYLIB_gmm = @TOOL_DYLIB_gmm@
+ TOOL_DYLIB_gsl = @TOOL_DYLIB_gsl@
+ TOOL_DYLIB_hips = @TOOL_DYLIB_hips@
+ TOOL_DYLIB_iohdf5 = @TOOL_DYLIB_iohdf5@
+ TOOL_DYLIB_ipopt = @TOOL_DYLIB_ipopt@
+ TOOL_DYLIB_lapack = @TOOL_DYLIB_lapack@
+ TOOL_DYLIB_mmg3d = @TOOL_DYLIB_mmg3d@
+ TOOL_DYLIB_mshmet = @TOOL_DYLIB_mshmet@
+ TOOL_DYLIB_mumps = @TOOL_DYLIB_mumps@
+ TOOL_DYLIB_mumps_seq = @TOOL_DYLIB_mumps_seq@
+ TOOL_DYLIB_nlopt = @TOOL_DYLIB_nlopt@
+ TOOL_DYLIB_pardiso = @TOOL_DYLIB_pardiso@
+ TOOL_DYLIB_parmetis = @TOOL_DYLIB_parmetis@
+ TOOL_DYLIB_parms = @TOOL_DYLIB_parms@
+ TOOL_DYLIB_pastix = @TOOL_DYLIB_pastix@
+ TOOL_DYLIB_pipe = @TOOL_DYLIB_pipe@
+ TOOL_DYLIB_schwarz = @TOOL_DYLIB_schwarz@
+ TOOL_DYLIB_scotch = @TOOL_DYLIB_scotch@
+ TOOL_DYLIB_superlu = @TOOL_DYLIB_superlu@
+ TOOL_DYLIB_superludist = @TOOL_DYLIB_superludist@
+ TOOL_DYLIB_umfpack = @TOOL_DYLIB_umfpack@
+ TOOL_DYLIB_yams = @TOOL_DYLIB_yams@
+ UMFPACKLIBS = @UMFPACKLIBS@
+ VERSION = @VERSION@
+ WGET = @WGET@
+ WIN32DLLTARGET = @WIN32DLLTARGET@
+ WINDRESOBJ = @WINDRESOBJ@
+ WITH_CXX11 = @WITH_CXX11@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_FC = @ac_ct_FC@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ ff_bison = @ff_bison@
+ ff_convert = @ff_convert@
+ ff_curl = @ff_curl@
+ ff_dvips = @ff_dvips@
+ ff_flex = @ff_flex@
+ ff_git = @ff_git@
+ ff_gzip = @ff_gzip@
+ ff_history = @ff_history@
+ ff_latex = @ff_latex@
+ ff_libtool = @ff_libtool@
+ ff_m4 = @ff_m4@
+ ff_makeindex = @ff_makeindex@
+ ff_patch = @ff_patch@
+ ff_pdf2ps = @ff_pdf2ps@
+ ff_pdflatex = @ff_pdflatex@
+ ff_prefix_dir = @ff_prefix_dir@
+ ff_unzip = @ff_unzip@
+ ff_wget = @ff_wget@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
++>>>>>>> upstream/3.36:download/umfpack/Makefile.in
  EXTRA_DIST = SuiteSparse_config.mk.in 
  
  # Downloading and compiling UMFPACK

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freefempp.git



More information about the debian-science-commits mailing list