Changeset 1706


Ignore:
Timestamp:
Nov 2, 2010 4:22:28 PM (9 years ago)
Author:
tkr
Message:

Making name changes to comply with recent changes in build tools and re-running the autotools

Location:
ThirdParty/Mumps/trunk
Files:
2 edited

Legend:

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

    r1684 r1706  
    215215MUMPSOBJDIR = @MUMPSOBJDIR@
    216216MUMPSSRCDIR = @MUMPSSRCDIR@
     217MUMPS_CFLAGS = @MUMPS_CFLAGS@
    217218MUMPS_LIBS = @MUMPS_LIBS@
    218219MUMPS_PCLIBS = @MUMPS_PCLIBS@
  • ThirdParty/Mumps/trunk/configure

    r1684 r1706  
    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 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 MUMPS_LIBS MUMPS_PCLIBS MUMPS_PCREQUIRES COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA 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 ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion MUMPS_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 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 MUMPS_CFLAGS MUMPS_LIBS MUMPS_PCLIBS MUMPS_PCREQUIRES COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE MUMPSDIR MUMPSOBJDIR MUMPSSRCDIR MY_FDEFS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    64986498full_prefix=`cd $full_prefix ; pwd`
    64996499
    6500 abs_lib_dir=$full_prefix/lib
     6500abs_lib_dir=$full_prefix/lib/coin
    65016501
    65026502abs_include_dir=$full_prefix/include
     
    2149921499      if test "$GXX" = "yes"; then
    2150021500        RPATH_FLAGS=
    21501         for dir in $abs_lib_dir/coin $abs_lib_dir/coin/ThirdParty; do
     21501        for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
    2150221502          RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    2150321503        done
     
    2151621516    *-*-solaris*)
    2151721517        RPATH_FLAGS=
    21518         for dir in $abs_lib_dir/coin $abs_lib_dir/coin/ThirdParty; do
     21518        for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
    2151921519          RPATH_FLAGS="$RPATH_FLAGS -R$dir"
    2152021520        done
     
    2374823748
    2374923749
     23750
    2375023751#check if user provided LIBS, CFLAGS, or DATA for module
    2375123752if test $coin_has_blas != skipping; then
     
    2379823799if test -n "$PKG_CONFIG" ; then
    2379923800  if $PKG_CONFIG --exists "coinblas"; then
    23800     BLAS_VERSIONS="`$PKG_CONFIG --modversion coinblas 2>/dev/null`"
     23801    BLAS_VERSIONS="`$PKG_CONFIG --modversion "coinblas" 2>/dev/null`"
    2380123802     cflags=`$PKG_CONFIG --cflags "coinblas" 2>/dev/null`
    2380223803    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2411224113
    2411324114
     24115
    2411424116#check if user provided LIBS, CFLAGS, or DATA for module
    2411524117if test $coin_has_metis != skipping; then
     
    2416224164if test -n "$PKG_CONFIG" ; then
    2416324165  if $PKG_CONFIG --exists "coinmetis >= 4.0"; then
    24164     METIS_VERSIONS="`$PKG_CONFIG --modversion coinmetis >= 4.0 2>/dev/null`"
     24166    METIS_VERSIONS="`$PKG_CONFIG --modversion "coinmetis >= 4.0" 2>/dev/null`"
    2416524167     cflags=`$PKG_CONFIG --cflags "coinmetis >= 4.0" 2>/dev/null`
    2416624168    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2549325495s,@BLAS_CFLAGS@,$BLAS_CFLAGS,;t t
    2549425496s,@BLAS_DATA@,$BLAS_DATA,;t t
     25497s,@MUMPS_CFLAGS@,$MUMPS_CFLAGS,;t t
    2549525498s,@MUMPS_LIBS@,$MUMPS_LIBS,;t t
    2549625499s,@MUMPS_PCLIBS@,$MUMPS_PCLIBS,;t t
Note: See TracChangeset for help on using the changeset viewer.