Changeset 2066


Ignore:
Timestamp:
Jan 1, 2011 1:11:29 PM (9 years ago)
Author:
stefan
Message:

sync with trunk rev2060

Location:
ThirdParty/Mumps/stable/1.4
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/stable/1.4

  • ThirdParty/Mumps/stable/1.4/Makefile.in

    r2008 r2066  
    134134ABSBUILDDIR = @ABSBUILDDIR@
    135135ACLOCAL = @ACLOCAL@
    136 ADDLIBS = @ADDLIBS@
    137136ADD_CFLAGS = @ADD_CFLAGS@
    138137ADD_FFLAGS = @ADD_FFLAGS@
     
    190189EXEEXT = @EXEEXT@
    191190F77 = @F77@
    192 FADDLIBS = @FADDLIBS@
    193191FFLAGS = @FFLAGS@ $(MY_FDEFS)
    194192FLIBS = @FLIBS@
     
    244242PACKAGE_VERSION = @PACKAGE_VERSION@
    245243PATH_SEPARATOR = @PATH_SEPARATOR@
    246 PCADDLIBS = @PCADDLIBS@
    247244PKG_CONFIG = @PKG_CONFIG@
    248245RANLIB = @RANLIB@
  • ThirdParty/Mumps/stable/1.4/coinmumps-uninstalled.pc.in

    r1908 r2066  
    44Name: Mumps
    55Description: Multifrontal Massively Parallel sparse direct Solver
    6 Version: 4.9
     6URL: https://projects.coin-or.org/BuildTools
     7Version: 4.9.2
    78Libs: ${libdir}/libcoinmumps.la @MUMPS_PCLIBS@
    89Cflags: -I@abs_source_dir@/MUMPS/libseq -I@abs_source_dir@/MUMPS/include
  • ThirdParty/Mumps/stable/1.4/coinmumps.pc.in

    r2008 r2066  
    66Name: Mumps
    77Description: Multifrontal Massively Parallel sparse direct Solver
    8 Version: 4.9
     8URL: https://projects.coin-or.org/BuildTools
     9Version: 4.9.2
    910Libs: -L${libdir} -lcoinmumps @MUMPS_PCLIBS@
    1011Cflags: -I${includedir}
  • ThirdParty/Mumps/stable/1.4/configure

    r2047 r2066  
    473473#endif"
    474474
    475 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion MUMPS_SVN_REV build build_cpu build_vendor build_os COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 FLIBS CPP EGREP MY_DEFS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED BLAS_LIBS BLAS_CFLAGS BLAS_DATA BLAS_DEPENDENCIES BLAS_LIBS_INSTALLED BLAS_CFLAGS_INSTALLED BLAS_DATA_INSTALLED MUMPS_CFLAGS MUMPS_LIBS MUMPS_PCLIBS MUMPS_PCREQUIRES MUMPS_DEPENDENCIES MUMPS_CFLAGS_INSTALLED MUMPS_LIBS_INSTALLED COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA METIS_DEPENDENCIES METIS_LIBS_INSTALLED METIS_CFLAGS_INSTALLED METIS_DATA_INSTALLED COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE MUMPSDIR MUMPSOBJDIR MUMPSSRCDIR MY_FDEFS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
     475ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion MUMPS_SVN_REV build build_cpu build_vendor build_os COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 FLIBS CPP EGREP MY_DEFS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED BLAS_LIBS BLAS_CFLAGS BLAS_DATA BLAS_DEPENDENCIES BLAS_LIBS_INSTALLED BLAS_CFLAGS_INSTALLED BLAS_DATA_INSTALLED MUMPS_CFLAGS MUMPS_LIBS MUMPS_PCLIBS MUMPS_PCREQUIRES MUMPS_DEPENDENCIES MUMPS_CFLAGS_INSTALLED MUMPS_LIBS_INSTALLED COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA METIS_DEPENDENCIES METIS_LIBS_INSTALLED METIS_CFLAGS_INSTALLED METIS_DATA_INSTALLED COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE MUMPSDIR MUMPSOBJDIR MUMPSSRCDIR MY_FDEFS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    16081608
    16091609
    1610 # Initialize the ADDLIBS variable
    1611 ADDLIBS="-lm $LIBS"
    1612 
    1613 
    1614 # Initialize the PCADDLIBS variable.
    1615 # This variable is used to setup library flags for the "Libs:" section in a .pc file.
    1616 # In certain cases, it may contain more flags than the ADDLIBS variable.
    1617 PCADDLIBS=""
    1618 
    16191610
    16201611# As backup, we make sure we don't loose an FLIBS if it has been set
    16211612# by the user
    16221613save_FLIBS="$FLIBS"
    1623 
    1624 # Initialize the FADDLIBS variable (which is to be used with a fortran
    1625 # compiler and will not include FLIBS)
    1626 FADDLIBS="$LIBS"
    1627 
    16281614
    16291615# A useful makefile conditional that is always false
     
    31873173fi
    31883174
    3189 # Correct ADDLIBS initialization if we are using the MS compiler
     3175# Correct the LD variable if we are using the MS or Intel-windows compiler
    31903176case "$CC" in
    31913177  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    3192     ADDLIBS=
    31933178    case $build in
    31943179  *-mingw*)
     
    34003385
    34013386# Provide some information about the compiler.
    3402 echo "$as_me:3402:" \
     3387echo "$as_me:3387:" \
    34033388     "checking for Fortran 77 compiler version" >&5
    34043389ac_compiler=`set X $ac_compile; echo $2`
     
    38883873fi
    38893874
     3875# correct the LD variable if we use the intel fortran compiler in windows
    38903876case "$F77" in
    38913877  ifort* | */ifort* | IFORT* | */IFORT*)
     
    39683954ac_save_FFLAGS=$FFLAGS
    39693955FFLAGS="$FFLAGS $ac_verb"
    3970 (eval echo $as_me:3970: \"$ac_link\") >&5
     3956(eval echo $as_me:3956: \"$ac_link\") >&5
    39713957ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    39723958echo "$ac_f77_v_output" >&5
     
    40464032ac_save_FFLAGS=$FFLAGS
    40474033FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    4048 (eval echo $as_me:4048: \"$ac_link\") >&5
     4034(eval echo $as_me:4034: \"$ac_link\") >&5
    40494035ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    40504036echo "$ac_f77_v_output" >&5
     
    71057091*-*-irix6*)
    71067092  # Find out which ABI we are using.
    7107   echo '#line 7107 "configure"' > conftest.$ac_ext
     7093  echo '#line 7093 "configure"' > conftest.$ac_ext
    71087094  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    71097095  (eval $ac_compile) 2>&5
     
    91019087   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    91029088   -e 's:$: $lt_compiler_flag:'`
    9103    (eval echo "\"\$as_me:9103: $lt_compile\"" >&5)
     9089   (eval echo "\"\$as_me:9089: $lt_compile\"" >&5)
    91049090   (eval "$lt_compile" 2>conftest.err)
    91059091   ac_status=$?
    91069092   cat conftest.err >&5
    9107    echo "$as_me:9107: \$? = $ac_status" >&5
     9093   echo "$as_me:9093: \$? = $ac_status" >&5
    91089094   if (exit $ac_status) && test -s "$ac_outfile"; then
    91099095     # The compiler can only warn and ignore the option if not recognized
     
    93699355   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    93709356   -e 's:$: $lt_compiler_flag:'`
    9371    (eval echo "\"\$as_me:9371: $lt_compile\"" >&5)
     9357   (eval echo "\"\$as_me:9357: $lt_compile\"" >&5)
    93729358   (eval "$lt_compile" 2>conftest.err)
    93739359   ac_status=$?
    93749360   cat conftest.err >&5
    9375    echo "$as_me:9375: \$? = $ac_status" >&5
     9361   echo "$as_me:9361: \$? = $ac_status" >&5
    93769362   if (exit $ac_status) && test -s "$ac_outfile"; then
    93779363     # The compiler can only warn and ignore the option if not recognized
     
    94739459   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    94749460   -e 's:$: $lt_compiler_flag:'`
    9475    (eval echo "\"\$as_me:9475: $lt_compile\"" >&5)
     9461   (eval echo "\"\$as_me:9461: $lt_compile\"" >&5)
    94769462   (eval "$lt_compile" 2>out/conftest.err)
    94779463   ac_status=$?
    94789464   cat out/conftest.err >&5
    9479    echo "$as_me:9479: \$? = $ac_status" >&5
     9465   echo "$as_me:9465: \$? = $ac_status" >&5
    94809466   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    94819467   then
     
    1189011876  lt_status=$lt_dlunknown
    1189111877  cat > conftest.$ac_ext <<EOF
    11892 #line 11892 "configure"
     11878#line 11878 "configure"
    1189311879#include "confdefs.h"
    1189411880
     
    1199011976  lt_status=$lt_dlunknown
    1199111977  cat > conftest.$ac_ext <<EOF
    11992 #line 11992 "configure"
     11978#line 11978 "configure"
    1199311979#include "confdefs.h"
    1199411980
     
    1435014336   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1435114337   -e 's:$: $lt_compiler_flag:'`
    14352    (eval echo "\"\$as_me:14352: $lt_compile\"" >&5)
     14338   (eval echo "\"\$as_me:14338: $lt_compile\"" >&5)
    1435314339   (eval "$lt_compile" 2>conftest.err)
    1435414340   ac_status=$?
    1435514341   cat conftest.err >&5
    14356    echo "$as_me:14356: \$? = $ac_status" >&5
     14342   echo "$as_me:14342: \$? = $ac_status" >&5
    1435714343   if (exit $ac_status) && test -s "$ac_outfile"; then
    1435814344     # The compiler can only warn and ignore the option if not recognized
     
    1445414440   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1445514441   -e 's:$: $lt_compiler_flag:'`
    14456    (eval echo "\"\$as_me:14456: $lt_compile\"" >&5)
     14442   (eval echo "\"\$as_me:14442: $lt_compile\"" >&5)
    1445714443   (eval "$lt_compile" 2>out/conftest.err)
    1445814444   ac_status=$?
    1445914445   cat out/conftest.err >&5
    14460    echo "$as_me:14460: \$? = $ac_status" >&5
     14446   echo "$as_me:14446: \$? = $ac_status" >&5
    1446114447   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1446214448   then
     
    1602416010   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1602516011   -e 's:$: $lt_compiler_flag:'`
    16026    (eval echo "\"\$as_me:16026: $lt_compile\"" >&5)
     16012   (eval echo "\"\$as_me:16012: $lt_compile\"" >&5)
    1602716013   (eval "$lt_compile" 2>conftest.err)
    1602816014   ac_status=$?
    1602916015   cat conftest.err >&5
    16030    echo "$as_me:16030: \$? = $ac_status" >&5
     16016   echo "$as_me:16016: \$? = $ac_status" >&5
    1603116017   if (exit $ac_status) && test -s "$ac_outfile"; then
    1603216018     # The compiler can only warn and ignore the option if not recognized
     
    1612816114   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1612916115   -e 's:$: $lt_compiler_flag:'`
    16130    (eval echo "\"\$as_me:16130: $lt_compile\"" >&5)
     16116   (eval echo "\"\$as_me:16116: $lt_compile\"" >&5)
    1613116117   (eval "$lt_compile" 2>out/conftest.err)
    1613216118   ac_status=$?
    1613316119   cat out/conftest.err >&5
    16134    echo "$as_me:16134: \$? = $ac_status" >&5
     16120   echo "$as_me:16120: \$? = $ac_status" >&5
    1613516121   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1613616122   then
     
    1833518321   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1833618322   -e 's:$: $lt_compiler_flag:'`
    18337    (eval echo "\"\$as_me:18337: $lt_compile\"" >&5)
     18323   (eval echo "\"\$as_me:18323: $lt_compile\"" >&5)
    1833818324   (eval "$lt_compile" 2>conftest.err)
    1833918325   ac_status=$?
    1834018326   cat conftest.err >&5
    18341    echo "$as_me:18341: \$? = $ac_status" >&5
     18327   echo "$as_me:18327: \$? = $ac_status" >&5
    1834218328   if (exit $ac_status) && test -s "$ac_outfile"; then
    1834318329     # The compiler can only warn and ignore the option if not recognized
     
    1860318589   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1860418590   -e 's:$: $lt_compiler_flag:'`
    18605    (eval echo "\"\$as_me:18605: $lt_compile\"" >&5)
     18591   (eval echo "\"\$as_me:18591: $lt_compile\"" >&5)
    1860618592   (eval "$lt_compile" 2>conftest.err)
    1860718593   ac_status=$?
    1860818594   cat conftest.err >&5
    18609    echo "$as_me:18609: \$? = $ac_status" >&5
     18595   echo "$as_me:18595: \$? = $ac_status" >&5
    1861018596   if (exit $ac_status) && test -s "$ac_outfile"; then
    1861118597     # The compiler can only warn and ignore the option if not recognized
     
    1870718693   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1870818694   -e 's:$: $lt_compiler_flag:'`
    18709    (eval echo "\"\$as_me:18709: $lt_compile\"" >&5)
     18695   (eval echo "\"\$as_me:18695: $lt_compile\"" >&5)
    1871018696   (eval "$lt_compile" 2>out/conftest.err)
    1871118697   ac_status=$?
    1871218698   cat out/conftest.err >&5
    18713    echo "$as_me:18713: \$? = $ac_status" >&5
     18699   echo "$as_me:18699: \$? = $ac_status" >&5
    1871418700   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1871518701   then
     
    2179921785        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    2180021786      fi
     21787      if test -d ../$i/pkgconfig ; then
     21788        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
     21789      fi
    2180121790    done
    2180221791  fi
     
    2180621795      if test -d ../../$i ; then
    2180721796        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
     21797      fi
     21798      if test -d ../../$i/pkgconfig ; then
     21799        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    2180821800      fi
    2180921801    done
     
    2432124313if test -n "$PKG_CONFIG" ; then
    2432224314  if $PKG_CONFIG --exists "coinblas"; then
    24323     BLAS_VERSIONS="`$PKG_CONFIG --modversion "coinblas" 2>/dev/null`"
     24315    BLAS_VERSIONS="`$PKG_CONFIG --modversion "coinblas" 2>/dev/null | tr '\n' ' '`"
    2432424316     cflags=`$PKG_CONFIG --cflags "coinblas" 2>/dev/null`
    2432524317    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2481224804if test -n "$PKG_CONFIG" ; then
    2481324805  if $PKG_CONFIG --exists "coinmetis >= 4.0"; then
    24814     METIS_VERSIONS="`$PKG_CONFIG --modversion "coinmetis >= 4.0" 2>/dev/null`"
     24806    METIS_VERSIONS="`$PKG_CONFIG --modversion "coinmetis >= 4.0" 2>/dev/null | tr '\n' ' '`"
    2481524807     cflags=`$PKG_CONFIG --cflags "coinmetis >= 4.0" 2>/dev/null`
    2481624808    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2536025352
    2536125353if test x$coin_skip_ac_output != xyes; then
    25362 
    25363   FADDLIBS="$ADDLIBS"
    25364   if test x"$coin_need_flibs" = xyes; then
    25365     ADDLIBS="$ADDLIBS $FLIBS"
    25366   fi
    25367   PCADDLIBS="$PCADDLIBS $ADDLIBS"
    2536825354
    2536925355  # library extension
     
    2615526141s,@ECHO_T@,$ECHO_T,;t t
    2615626142s,@LIBS@,$LIBS,;t t
    26157 s,@ADDLIBS@,$ADDLIBS,;t t
    26158 s,@PCADDLIBS@,$PCADDLIBS,;t t
    26159 s,@FADDLIBS@,$FADDLIBS,;t t
    2616026143s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t
    2616126144s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
Note: See TracChangeset for help on using the changeset viewer.