Changeset 2062


Ignore:
Timestamp:
Jan 1, 2011 1:10:13 PM (10 years ago)
Author:
stefan
Message:

sync with trunk rev2060

Location:
ThirdParty/Blas/stable/1.2
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/Blas/stable/1.2

  • ThirdParty/Blas/stable/1.2/Makefile.in

    r2002 r2062  
    112112ABSBUILDDIR = @ABSBUILDDIR@
    113113ACLOCAL = @ACLOCAL@
    114 ADDLIBS = @ADDLIBS@
    115114ADD_CFLAGS = @ADD_CFLAGS@
    116115ADD_FFLAGS = @ADD_FFLAGS@
    … …  
    157156EXEEXT = @EXEEXT@
    158157F77 = @F77@
    159 FADDLIBS = @FADDLIBS@
    160158FFLAGS = @FFLAGS@
    161159FLIBS = @FLIBS@
    … …  
    191189PACKAGE_VERSION = @PACKAGE_VERSION@
    192190PATH_SEPARATOR = @PATH_SEPARATOR@
    193 PCADDLIBS = @PCADDLIBS@
    194191PKG_CONFIG = @PKG_CONFIG@
    195192RANLIB = @RANLIB@

  • ThirdParty/Blas/stable/1.2/coinblas-uninstalled.pc.in

    r1901 r2062  
    44Name: Blas
    55Description: Basic linear algebra package
     6URL: https://projects.coin-or.org/BuildTools
    67Version: @PACKAGE_VERSION@
    78Libs: ${libdir}/libcoinblas.la @BLAS_PCLIBS@

  • ThirdParty/Blas/stable/1.2/coinblas.pc.in

    r2002 r2062  
    55Name: Blas
    66Description: Basic linear algebra package
     7URL: https://projects.coin-or.org/BuildTools
    78Version: @PACKAGE_VERSION@
    89Libs: -L${libdir} -lcoinblas @BLAS_PCLIBS@

  • ThirdParty/Blas/stable/1.2/configure

    r2043 r2062  
    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 BLAS_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 BLAS_PCLIBS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED EGREP 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 CPP 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 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 BLAS_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 BLAS_PCLIBS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED EGREP 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 CPP 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 LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
    … …  
    16001600
    16011601
    1602 # Initialize the ADDLIBS variable
    1603 ADDLIBS="-lm $LIBS"
    1604 
    1605 
    1606 # Initialize the PCADDLIBS variable.
    1607 # This variable is used to setup library flags for the "Libs:" section in a .pc file.
    1608 # In certain cases, it may contain more flags than the ADDLIBS variable.
    1609 PCADDLIBS=""
    1610 
    16111602
    16121603# As backup, we make sure we don't loose an FLIBS if it has been set
    16131604# by the user
    16141605save_FLIBS="$FLIBS"
    1615 
    1616 # Initialize the FADDLIBS variable (which is to be used with a fortran
    1617 # compiler and will not include FLIBS)
    1618 FADDLIBS="$LIBS"
    1619 
    16201606
    16211607# A useful makefile conditional that is always false
    … …  
    31783164fi
    31793165
    3180 # Correct ADDLIBS initialization if we are using the MS compiler
     3166# Correct the LD variable if we are using the MS or Intel-windows compiler
    31813167case "$CC" in
    31823168  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    3183     ADDLIBS=
    31843169    case $build in
    31853170  *-mingw*)
    … …  
    33893374
    33903375# Provide some information about the compiler.
    3391 echo "$as_me:3391:" \
     3376echo "$as_me:3376:" \
    33923377     "checking for Fortran 77 compiler version" >&5
    33933378ac_compiler=`set X $ac_compile; echo $2`
    … …  
    38773862fi
    38783863
     3864# correct the LD variable if we use the intel fortran compiler in windows
    38793865case "$F77" in
    38803866  ifort* | */ifort* | IFORT* | */IFORT*)
    … …  
    39573943ac_save_FFLAGS=$FFLAGS
    39583944FFLAGS="$FFLAGS $ac_verb"
    3959 (eval echo $as_me:3959: \"$ac_link\") >&5
     3945(eval echo $as_me:3945: \"$ac_link\") >&5
    39603946ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    39613947echo "$ac_f77_v_output" >&5
    … …  
    40354021ac_save_FFLAGS=$FFLAGS
    40364022FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    4037 (eval echo $as_me:4037: \"$ac_link\") >&5
     4023(eval echo $as_me:4023: \"$ac_link\") >&5
    40384024ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    40394025echo "$ac_f77_v_output" >&5
    … …  
    49654951        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    49664952      fi
     4953      if test -d ../$i/pkgconfig ; then
     4954        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
     4955      fi
    49674956    done
    49684957  fi
    … …  
    49724961      if test -d ../../$i ; then
    49734962        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
     4963      fi
     4964      if test -d ../../$i/pkgconfig ; then
     4965        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    49744966      fi
    49754967    done
    … …  
    66146606*-*-irix6*)
    66156607  # Find out which ABI we are using.
    6616   echo '#line 6616 "configure"' > conftest.$ac_ext
     6608  echo '#line 6608 "configure"' > conftest.$ac_ext
    66176609  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    66186610  (eval $ac_compile) 2>&5
    … …  
    90919083   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    90929084   -e 's:$: $lt_compiler_flag:'`
    9093    (eval echo "\"\$as_me:9093: $lt_compile\"" >&5)
     9085   (eval echo "\"\$as_me:9085: $lt_compile\"" >&5)
    90949086   (eval "$lt_compile" 2>conftest.err)
    90959087   ac_status=$?
    90969088   cat conftest.err >&5
    9097    echo "$as_me:9097: \$? = $ac_status" >&5
     9089   echo "$as_me:9089: \$? = $ac_status" >&5
    90989090   if (exit $ac_status) && test -s "$ac_outfile"; then
    90999091     # The compiler can only warn and ignore the option if not recognized
    … …  
    93599351   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    93609352   -e 's:$: $lt_compiler_flag:'`
    9361    (eval echo "\"\$as_me:9361: $lt_compile\"" >&5)
     9353   (eval echo "\"\$as_me:9353: $lt_compile\"" >&5)
    93629354   (eval "$lt_compile" 2>conftest.err)
    93639355   ac_status=$?
    93649356   cat conftest.err >&5
    9365    echo "$as_me:9365: \$? = $ac_status" >&5
     9357   echo "$as_me:9357: \$? = $ac_status" >&5
    93669358   if (exit $ac_status) && test -s "$ac_outfile"; then
    93679359     # The compiler can only warn and ignore the option if not recognized
    … …  
    94639455   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    94649456   -e 's:$: $lt_compiler_flag:'`
    9465    (eval echo "\"\$as_me:9465: $lt_compile\"" >&5)
     9457   (eval echo "\"\$as_me:9457: $lt_compile\"" >&5)
    94669458   (eval "$lt_compile" 2>out/conftest.err)
    94679459   ac_status=$?
    94689460   cat out/conftest.err >&5
    9469    echo "$as_me:9469: \$? = $ac_status" >&5
     9461   echo "$as_me:9461: \$? = $ac_status" >&5
    94709462   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    94719463   then
    … …  
    1188011872  lt_status=$lt_dlunknown
    1188111873  cat > conftest.$ac_ext <<EOF
    11882 #line 11882 "configure"
     11874#line 11874 "configure"
    1188311875#include "confdefs.h"
    1188411876
    … …  
    1198011972  lt_status=$lt_dlunknown
    1198111973  cat > conftest.$ac_ext <<EOF
    11982 #line 11982 "configure"
     11974#line 11974 "configure"
    1198311975#include "confdefs.h"
    1198411976
    … …  
    1434014332   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1434114333   -e 's:$: $lt_compiler_flag:'`
    14342    (eval echo "\"\$as_me:14342: $lt_compile\"" >&5)
     14334   (eval echo "\"\$as_me:14334: $lt_compile\"" >&5)
    1434314335   (eval "$lt_compile" 2>conftest.err)
    1434414336   ac_status=$?
    1434514337   cat conftest.err >&5
    14346    echo "$as_me:14346: \$? = $ac_status" >&5
     14338   echo "$as_me:14338: \$? = $ac_status" >&5
    1434714339   if (exit $ac_status) && test -s "$ac_outfile"; then
    1434814340     # The compiler can only warn and ignore the option if not recognized
    … …  
    1444414436   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1444514437   -e 's:$: $lt_compiler_flag:'`
    14446    (eval echo "\"\$as_me:14446: $lt_compile\"" >&5)
     14438   (eval echo "\"\$as_me:14438: $lt_compile\"" >&5)
    1444714439   (eval "$lt_compile" 2>out/conftest.err)
    1444814440   ac_status=$?
    1444914441   cat out/conftest.err >&5
    14450    echo "$as_me:14450: \$? = $ac_status" >&5
     14442   echo "$as_me:14442: \$? = $ac_status" >&5
    1445114443   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1445214444   then
    … …  
    1601416006   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1601516007   -e 's:$: $lt_compiler_flag:'`
    16016    (eval echo "\"\$as_me:16016: $lt_compile\"" >&5)
     16008   (eval echo "\"\$as_me:16008: $lt_compile\"" >&5)
    1601716009   (eval "$lt_compile" 2>conftest.err)
    1601816010   ac_status=$?
    1601916011   cat conftest.err >&5
    16020    echo "$as_me:16020: \$? = $ac_status" >&5
     16012   echo "$as_me:16012: \$? = $ac_status" >&5
    1602116013   if (exit $ac_status) && test -s "$ac_outfile"; then
    1602216014     # The compiler can only warn and ignore the option if not recognized
    … …  
    1611816110   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1611916111   -e 's:$: $lt_compiler_flag:'`
    16120    (eval echo "\"\$as_me:16120: $lt_compile\"" >&5)
     16112   (eval echo "\"\$as_me:16112: $lt_compile\"" >&5)
    1612116113   (eval "$lt_compile" 2>out/conftest.err)
    1612216114   ac_status=$?
    1612316115   cat out/conftest.err >&5
    16124    echo "$as_me:16124: \$? = $ac_status" >&5
     16116   echo "$as_me:16116: \$? = $ac_status" >&5
    1612516117   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1612616118   then
    … …  
    1832518317   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1832618318   -e 's:$: $lt_compiler_flag:'`
    18327    (eval echo "\"\$as_me:18327: $lt_compile\"" >&5)
     18319   (eval echo "\"\$as_me:18319: $lt_compile\"" >&5)
    1832818320   (eval "$lt_compile" 2>conftest.err)
    1832918321   ac_status=$?
    1833018322   cat conftest.err >&5
    18331    echo "$as_me:18331: \$? = $ac_status" >&5
     18323   echo "$as_me:18323: \$? = $ac_status" >&5
    1833218324   if (exit $ac_status) && test -s "$ac_outfile"; then
    1833318325     # The compiler can only warn and ignore the option if not recognized
    … …  
    1859318585   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1859418586   -e 's:$: $lt_compiler_flag:'`
    18595    (eval echo "\"\$as_me:18595: $lt_compile\"" >&5)
     18587   (eval echo "\"\$as_me:18587: $lt_compile\"" >&5)
    1859618588   (eval "$lt_compile" 2>conftest.err)
    1859718589   ac_status=$?
    1859818590   cat conftest.err >&5
    18599    echo "$as_me:18599: \$? = $ac_status" >&5
     18591   echo "$as_me:18591: \$? = $ac_status" >&5
    1860018592   if (exit $ac_status) && test -s "$ac_outfile"; then
    1860118593     # The compiler can only warn and ignore the option if not recognized
    … …  
    1869718689   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1869818690   -e 's:$: $lt_compiler_flag:'`
    18699    (eval echo "\"\$as_me:18699: $lt_compile\"" >&5)
     18691   (eval echo "\"\$as_me:18691: $lt_compile\"" >&5)
    1870018692   (eval "$lt_compile" 2>out/conftest.err)
    1870118693   ac_status=$?
    1870218694   cat out/conftest.err >&5
    18703    echo "$as_me:18703: \$? = $ac_status" >&5
     18695   echo "$as_me:18695: \$? = $ac_status" >&5
    1870418696   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1870518697   then
    … …  
    2163921631if test x$coin_skip_ac_output != xyes; then
    2164021632
    21641   FADDLIBS="$ADDLIBS"
    21642   if test x"$coin_need_flibs" = xyes; then
    21643     ADDLIBS="$ADDLIBS $FLIBS"
    21644   fi
    21645   PCADDLIBS="$PCADDLIBS $ADDLIBS"
    21646 
    2164721633  # library extension
    2164821634
    … …  
    2239122377s,@ECHO_T@,$ECHO_T,;t t
    2239222378s,@LIBS@,$LIBS,;t t
    22393 s,@ADDLIBS@,$ADDLIBS,;t t
    22394 s,@PCADDLIBS@,$PCADDLIBS,;t t
    22395 s,@FADDLIBS@,$FADDLIBS,;t t
    2239622379s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t
    2239722380s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
Note: See TracChangeset for help on using the changeset viewer.