Changeset 1529


Ignore:
Timestamp:
Apr 28, 2010 2:33:20 PM (10 years ago)
Author:
andreasw
Message:

updated dependencies of MUMPS source files

Location:
ThirdParty/Mumps/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/trunk/Makefile.am

    r1412 r1529  
    8181dmumps_part2.lo dmumps_part5.lo dmumps_part8.lo: tools_common_mod.lo
    8282
     83dmumps_part5.lo: dmumps_part2.lo
     84
    8385# Module files that need to be deleted
    8486MODEXT = mod
  • ThirdParty/Mumps/trunk/Makefile.in

    r1492 r1529  
    216216VERSION = @VERSION@
    217217VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
     218_SVN_REV = @_SVN_REV@
    218219abs_bin_dir = @abs_bin_dir@
    219220abs_include_dir = @abs_include_dir@
     
    248249have_automake = @have_automake@
    249250have_svn = @have_svn@
     251have_svnversion = @have_svnversion@
    250252host = @host@
    251253host_alias = @host_alias@
     
    433435dmumps_part4.lo: $(MUMPSDIR)/src/dmumps_part4.F
    434436        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -c -o dmumps_part4.lo `test -f '$(MUMPSDIR)/src/dmumps_part4.F' || echo '$(srcdir)/'`$(MUMPSDIR)/src/dmumps_part4.F
    435 
    436 dmumps_part5.lo: $(MUMPSDIR)/src/dmumps_part5.F
    437         $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FFLAGS) $(FFLAGS) -c -o dmumps_part5.lo `test -f '$(MUMPSDIR)/src/dmumps_part5.F' || echo '$(srcdir)/'`$(MUMPSDIR)/src/dmumps_part5.F
    438437
    439438dmumps_part6.lo: $(MUMPSDIR)/src/dmumps_part6.F
     
    861860dmumps_part2.lo dmumps_part5.lo dmumps_part8.lo: tools_common_mod.lo
    862861
     862dmumps_part5.lo: dmumps_part2.lo
     863
    863864install-doc: $(DocFiles)
    864865        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
  • ThirdParty/Mumps/trunk/configure

    r1492 r1529  
    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 FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE build build_cpu build_vendor build_os 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 COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE COIN_BUILD_BLAS_TRUE COIN_BUILD_BLAS_FALSE COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE MUMPSINCDIR MUMPSLIB COIN_HAS_MUMPS_TRUE COIN_HAS_MUMPS_FALSE MUMPS_INCFLAGS COIN_BUILD_MUMPS_TRUE COIN_BUILD_MUMPS_FALSE MAKEOKFILE SKIPMAKE_TRUE SKIPMAKE_FALSE MUMPSDIR MY_FDEFS LIBEXT VPATH_DISTCLEANFILES 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 ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion _SVN_REV build build_cpu build_vendor build_os 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 COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE COIN_BUILD_BLAS_TRUE COIN_BUILD_BLAS_FALSE COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE MUMPSINCDIR MUMPSLIB COIN_HAS_MUMPS_TRUE COIN_HAS_MUMPS_FALSE MUMPS_INCFLAGS COIN_BUILD_MUMPS_TRUE COIN_BUILD_MUMPS_FALSE MAKEOKFILE SKIPMAKE_TRUE SKIPMAKE_FALSE MUMPSDIR MY_FDEFS LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    16231623
    16241624
     1625#Set the project's version number
     1626if test "x" != x; then
     1627
     1628cat >>confdefs.h <<_ACEOF
     1629#define _VERSION "$PACKAGE_VERSION"
     1630_ACEOF
     1631
     1632fi
     1633
     1634#Set the project's SVN revision number
     1635# Extract the first word of "svnversion", so it can be a program name with args.
     1636set dummy svnversion; ac_word=$2
     1637echo "$as_me:$LINENO: checking for $ac_word" >&5
     1638echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     1639if test "${ac_cv_prog_have_svnversion+set}" = set; then
     1640  echo $ECHO_N "(cached) $ECHO_C" >&6
     1641else
     1642  if test -n "$have_svnversion"; then
     1643  ac_cv_prog_have_svnversion="$have_svnversion" # Let the user override the test.
     1644else
     1645as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     1646for as_dir in $PATH
     1647do
     1648  IFS=$as_save_IFS
     1649  test -z "$as_dir" && as_dir=.
     1650  for ac_exec_ext in '' $ac_executable_extensions; do
     1651  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     1652    ac_cv_prog_have_svnversion="yes"
     1653    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     1654    break 2
     1655  fi
     1656done
     1657done
     1658
     1659  test -z "$ac_cv_prog_have_svnversion" && ac_cv_prog_have_svnversion="no"
     1660fi
     1661fi
     1662have_svnversion=$ac_cv_prog_have_svnversion
     1663if test -n "$have_svnversion"; then
     1664  echo "$as_me:$LINENO: result: $have_svnversion" >&5
     1665echo "${ECHO_T}$have_svnversion" >&6
     1666else
     1667  echo "$as_me:$LINENO: result: no" >&5
     1668echo "${ECHO_T}no" >&6
     1669fi
     1670
     1671if test "x$have_svnversion" = xyes && test "x" != x; then
     1672
     1673  _SVN_REV=`cd $srcdir/$coin_has_ ; svnversion`
     1674  if test $_SVN_REV != exported; then
     1675
     1676cat >>confdefs.h <<_ACEOF
     1677#define _SVN_REV "$_SVN_REV"
     1678_ACEOF
     1679
     1680  fi
     1681fi
     1682
    16251683# We set the following variable so that we know later in AC_COIN_FINALIZE
    16261684# that we are in a project main directory
    16271685coin_projectdir=yes
     1686
     1687# Check if a library version is set for libtool
     1688
    16281689
    16291690
     
    32973358
    32983359# Provide some information about the compiler.
    3299 echo "$as_me:3299:" \
     3360echo "$as_me:3360:" \
    33003361     "checking for Fortran 77 compiler version" >&5
    33013362ac_compiler=`set X $ac_compile; echo $2`
     
    38653926ac_save_FFLAGS=$FFLAGS
    38663927FFLAGS="$FFLAGS $ac_verb"
    3867 (eval echo $as_me:3867: \"$ac_link\") >&5
     3928(eval echo $as_me:3928: \"$ac_link\") >&5
    38683929ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    38693930echo "$ac_f77_v_output" >&5
     
    39434004ac_save_FFLAGS=$FFLAGS
    39444005FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    3945 (eval echo $as_me:3945: \"$ac_link\") >&5
     4006(eval echo $as_me:4006: \"$ac_link\") >&5
    39464007ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    39474008echo "$ac_f77_v_output" >&5
     
    69977058*-*-irix6*)
    69987059  # Find out which ABI we are using.
    6999   echo '#line 6999 "configure"' > conftest.$ac_ext
     7060  echo '#line 7060 "configure"' > conftest.$ac_ext
    70007061  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    70017062  (eval $ac_compile) 2>&5
     
    89939054   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    89949055   -e 's:$: $lt_compiler_flag:'`
    8995    (eval echo "\"\$as_me:8995: $lt_compile\"" >&5)
     9056   (eval echo "\"\$as_me:9056: $lt_compile\"" >&5)
    89969057   (eval "$lt_compile" 2>conftest.err)
    89979058   ac_status=$?
    89989059   cat conftest.err >&5
    8999    echo "$as_me:8999: \$? = $ac_status" >&5
     9060   echo "$as_me:9060: \$? = $ac_status" >&5
    90009061   if (exit $ac_status) && test -s "$ac_outfile"; then
    90019062     # The compiler can only warn and ignore the option if not recognized
     
    92619322   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    92629323   -e 's:$: $lt_compiler_flag:'`
    9263    (eval echo "\"\$as_me:9263: $lt_compile\"" >&5)
     9324   (eval echo "\"\$as_me:9324: $lt_compile\"" >&5)
    92649325   (eval "$lt_compile" 2>conftest.err)
    92659326   ac_status=$?
    92669327   cat conftest.err >&5
    9267    echo "$as_me:9267: \$? = $ac_status" >&5
     9328   echo "$as_me:9328: \$? = $ac_status" >&5
    92689329   if (exit $ac_status) && test -s "$ac_outfile"; then
    92699330     # The compiler can only warn and ignore the option if not recognized
     
    93659426   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    93669427   -e 's:$: $lt_compiler_flag:'`
    9367    (eval echo "\"\$as_me:9367: $lt_compile\"" >&5)
     9428   (eval echo "\"\$as_me:9428: $lt_compile\"" >&5)
    93689429   (eval "$lt_compile" 2>out/conftest.err)
    93699430   ac_status=$?
    93709431   cat out/conftest.err >&5
    9371    echo "$as_me:9371: \$? = $ac_status" >&5
     9432   echo "$as_me:9432: \$? = $ac_status" >&5
    93729433   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    93739434   then
     
    1178211843  lt_status=$lt_dlunknown
    1178311844  cat > conftest.$ac_ext <<EOF
    11784 #line 11784 "configure"
     11845#line 11845 "configure"
    1178511846#include "confdefs.h"
    1178611847
     
    1188211943  lt_status=$lt_dlunknown
    1188311944  cat > conftest.$ac_ext <<EOF
    11884 #line 11884 "configure"
     11945#line 11945 "configure"
    1188511946#include "confdefs.h"
    1188611947
     
    1424214303   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1424314304   -e 's:$: $lt_compiler_flag:'`
    14244    (eval echo "\"\$as_me:14244: $lt_compile\"" >&5)
     14305   (eval echo "\"\$as_me:14305: $lt_compile\"" >&5)
    1424514306   (eval "$lt_compile" 2>conftest.err)
    1424614307   ac_status=$?
    1424714308   cat conftest.err >&5
    14248    echo "$as_me:14248: \$? = $ac_status" >&5
     14309   echo "$as_me:14309: \$? = $ac_status" >&5
    1424914310   if (exit $ac_status) && test -s "$ac_outfile"; then
    1425014311     # The compiler can only warn and ignore the option if not recognized
     
    1434614407   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1434714408   -e 's:$: $lt_compiler_flag:'`
    14348    (eval echo "\"\$as_me:14348: $lt_compile\"" >&5)
     14409   (eval echo "\"\$as_me:14409: $lt_compile\"" >&5)
    1434914410   (eval "$lt_compile" 2>out/conftest.err)
    1435014411   ac_status=$?
    1435114412   cat out/conftest.err >&5
    14352    echo "$as_me:14352: \$? = $ac_status" >&5
     14413   echo "$as_me:14413: \$? = $ac_status" >&5
    1435314414   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1435414415   then
     
    1591615977   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1591715978   -e 's:$: $lt_compiler_flag:'`
    15918    (eval echo "\"\$as_me:15918: $lt_compile\"" >&5)
     15979   (eval echo "\"\$as_me:15979: $lt_compile\"" >&5)
    1591915980   (eval "$lt_compile" 2>conftest.err)
    1592015981   ac_status=$?
    1592115982   cat conftest.err >&5
    15922    echo "$as_me:15922: \$? = $ac_status" >&5
     15983   echo "$as_me:15983: \$? = $ac_status" >&5
    1592315984   if (exit $ac_status) && test -s "$ac_outfile"; then
    1592415985     # The compiler can only warn and ignore the option if not recognized
     
    1602016081   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1602116082   -e 's:$: $lt_compiler_flag:'`
    16022    (eval echo "\"\$as_me:16022: $lt_compile\"" >&5)
     16083   (eval echo "\"\$as_me:16083: $lt_compile\"" >&5)
    1602316084   (eval "$lt_compile" 2>out/conftest.err)
    1602416085   ac_status=$?
    1602516086   cat out/conftest.err >&5
    16026    echo "$as_me:16026: \$? = $ac_status" >&5
     16087   echo "$as_me:16087: \$? = $ac_status" >&5
    1602716088   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1602816089   then
     
    1822718288   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1822818289   -e 's:$: $lt_compiler_flag:'`
    18229    (eval echo "\"\$as_me:18229: $lt_compile\"" >&5)
     18290   (eval echo "\"\$as_me:18290: $lt_compile\"" >&5)
    1823018291   (eval "$lt_compile" 2>conftest.err)
    1823118292   ac_status=$?
    1823218293   cat conftest.err >&5
    18233    echo "$as_me:18233: \$? = $ac_status" >&5
     18294   echo "$as_me:18294: \$? = $ac_status" >&5
    1823418295   if (exit $ac_status) && test -s "$ac_outfile"; then
    1823518296     # The compiler can only warn and ignore the option if not recognized
     
    1849518556   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1849618557   -e 's:$: $lt_compiler_flag:'`
    18497    (eval echo "\"\$as_me:18497: $lt_compile\"" >&5)
     18558   (eval echo "\"\$as_me:18558: $lt_compile\"" >&5)
    1849818559   (eval "$lt_compile" 2>conftest.err)
    1849918560   ac_status=$?
    1850018561   cat conftest.err >&5
    18501    echo "$as_me:18501: \$? = $ac_status" >&5
     18562   echo "$as_me:18562: \$? = $ac_status" >&5
    1850218563   if (exit $ac_status) && test -s "$ac_outfile"; then
    1850318564     # The compiler can only warn and ignore the option if not recognized
     
    1859918660   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1860018661   -e 's:$: $lt_compiler_flag:'`
    18601    (eval echo "\"\$as_me:18601: $lt_compile\"" >&5)
     18662   (eval echo "\"\$as_me:18662: $lt_compile\"" >&5)
    1860218663   (eval "$lt_compile" 2>out/conftest.err)
    1860318664   ac_status=$?
    1860418665   cat out/conftest.err >&5
    18605    echo "$as_me:18605: \$? = $ac_status" >&5
     18666   echo "$as_me:18666: \$? = $ac_status" >&5
    1860618667   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1860718668   then
     
    2150021561LT_LDFLAGS=
    2150121562
     21563# Check if we want to set the library version
     21564echo "$as_me:$LINENO: checking if library version is set" >&5
     21565echo $ECHO_N "checking if library version is set... $ECHO_C" >&6
     21566if test x"$coin_libversion" != x; then
     21567  LT_LDFLAGS="$LT_LDFLAGS -version-info $coin_libversion"
     21568  echo "$as_me:$LINENO: result: $coin_libversion" >&5
     21569echo "${ECHO_T}$coin_libversion" >&6
     21570else
     21571  echo "$as_me:$LINENO: result: no" >&5
     21572echo "${ECHO_T}no" >&6
     21573fi
     21574
     21575
    2150221576
    2150321577#END
     
    2503925113s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t
    2504025114s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
     25115s,@have_svnversion@,$have_svnversion,;t t
     25116s,@_SVN_REV@,$_SVN_REV,;t t
    2504125117s,@build@,$build,;t t
    2504225118s,@build_cpu@,$build_cpu,;t t
Note: See TracChangeset for help on using the changeset viewer.