Changeset 1679


Ignore:
Timestamp:
Sep 13, 2010 3:37:25 AM (10 years ago)
Author:
stefan
Message:

change from COIN_HAS_MODULE to COIN_HAS_PACKAGE

Location:
ThirdParty/Blas/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/Blas/trunk/Makefile.in

    r1647 r1679  
    127127AUX_DIR = @AUX_DIR@
    128128AWK = @AWK@
     129BLAS_PCLIBS = @BLAS_PCLIBS@
    129130BLAS_SVN_REV = @BLAS_SVN_REV@
    130131BUILDTOOLSDIR = @BUILDTOOLSDIR@

  • ThirdParty/Blas/trunk/coinblas-uninstalled.pc.in

    r1616 r1679  
    44Name: Blas
    55Description: Basic linear algebra package
    6 Version: @PACKAGE_VERSION@
    7 Libs: -L${libdir} -lcoinblas @PCADDLIBS@
     6Version: @PACKAGE_VERSION@ @BLAS_PCLIBS@
     7Libs: -L${libdir} -lcoinblas
    88Cflags:

  • ThirdParty/Blas/trunk/coinblas.pc.in

    r1616 r1679  
    55Name: Blas
    66Description: Basic linear algebra package
    7 Version: @PACKAGE_VERSION@
    8 Libs: -L${libdir} -lcoinblas @PCADDLIBS@
     7Version: @PACKAGE_VERSION@ @BLAS_PCLIBS@
     8Libs: -L${libdir} -lcoinblas
    99Cflags:

  • ThirdParty/Blas/trunk/configure

    r1665 r1679  
    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 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 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 ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion BLAS_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 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
    … …  
    16441644fi
    16451645
    1646 # Set the project's SVN revision number
     1646# Set the project's SVN revision number. The complicated sed expression
     1647# (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
     1648# as a single number.
    16471649# Extract the first word of "svnversion", so it can be a program name with args.
    16481650set dummy svnversion; ac_word=$2
    … …  
    16831685if test "x$have_svnversion" = xyes && test "xBlas" != x; then
    16841686
    1685   BLAS_SVN_REV=`cd $srcdir/$coin_has_blas ; svnversion`
     1687  svn_rev_tmp=`cd $srcdir/$coin_has_blas ; svnversion`
     1688  BLAS_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
    16861689  if test $BLAS_SVN_REV != exported; then
    16871690
    16881691cat >>confdefs.h <<_ACEOF
    1689 #define BLAS_SVN_REV "$BLAS_SVN_REV"
     1692#define BLAS_SVN_REV $BLAS_SVN_REV
    16901693_ACEOF
    16911694
    … …  
    33633366
    33643367# Provide some information about the compiler.
    3365 echo "$as_me:3365:" \
     3368echo "$as_me:3368:" \
    33663369     "checking for Fortran 77 compiler version" >&5
    33673370ac_compiler=`set X $ac_compile; echo $2`
    … …  
    39313934ac_save_FFLAGS=$FFLAGS
    39323935FFLAGS="$FFLAGS $ac_verb"
    3933 (eval echo $as_me:3933: \"$ac_link\") >&5
     3936(eval echo $as_me:3936: \"$ac_link\") >&5
    39343937ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    39353938echo "$ac_f77_v_output" >&5
    … …  
    40094012ac_save_FFLAGS=$FFLAGS
    40104013FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    4011 (eval echo $as_me:4011: \"$ac_link\") >&5
     4014(eval echo $as_me:4014: \"$ac_link\") >&5
    40124015ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    40134016echo "$ac_f77_v_output" >&5
    … …  
    47604763
    47614764
    4762 # Tell FINALIZE to add FLIBS to ADDLIBS, so that they get into the .pc files
    4763 coin_need_flibs=yes
     4765# Add FLIBS to BLAS_PCLIBS, so that they get into the .pc files
     4766BLAS_PCLIBS="$FLIBS"
     4767
    47644768
    47654769# Check if pkg-config is available (to setup addlibs file)
    … …  
    65836587*-*-irix6*)
    65846588  # Find out which ABI we are using.
    6585   echo '#line 6585 "configure"' > conftest.$ac_ext
     6589  echo '#line 6589 "configure"' > conftest.$ac_ext
    65866590  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    65876591  (eval $ac_compile) 2>&5
    … …  
    90609064   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    90619065   -e 's:$: $lt_compiler_flag:'`
    9062    (eval echo "\"\$as_me:9062: $lt_compile\"" >&5)
     9066   (eval echo "\"\$as_me:9066: $lt_compile\"" >&5)
    90639067   (eval "$lt_compile" 2>conftest.err)
    90649068   ac_status=$?
    90659069   cat conftest.err >&5
    9066    echo "$as_me:9066: \$? = $ac_status" >&5
     9070   echo "$as_me:9070: \$? = $ac_status" >&5
    90679071   if (exit $ac_status) && test -s "$ac_outfile"; then
    90689072     # The compiler can only warn and ignore the option if not recognized
    … …  
    93289332   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    93299333   -e 's:$: $lt_compiler_flag:'`
    9330    (eval echo "\"\$as_me:9330: $lt_compile\"" >&5)
     9334   (eval echo "\"\$as_me:9334: $lt_compile\"" >&5)
    93319335   (eval "$lt_compile" 2>conftest.err)
    93329336   ac_status=$?
    93339337   cat conftest.err >&5
    9334    echo "$as_me:9334: \$? = $ac_status" >&5
     9338   echo "$as_me:9338: \$? = $ac_status" >&5
    93359339   if (exit $ac_status) && test -s "$ac_outfile"; then
    93369340     # The compiler can only warn and ignore the option if not recognized
    … …  
    94329436   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    94339437   -e 's:$: $lt_compiler_flag:'`
    9434    (eval echo "\"\$as_me:9434: $lt_compile\"" >&5)
     9438   (eval echo "\"\$as_me:9438: $lt_compile\"" >&5)
    94359439   (eval "$lt_compile" 2>out/conftest.err)
    94369440   ac_status=$?
    94379441   cat out/conftest.err >&5
    9438    echo "$as_me:9438: \$? = $ac_status" >&5
     9442   echo "$as_me:9442: \$? = $ac_status" >&5
    94399443   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    94409444   then
    … …  
    1184911853  lt_status=$lt_dlunknown
    1185011854  cat > conftest.$ac_ext <<EOF
    11851 #line 11851 "configure"
     11855#line 11855 "configure"
    1185211856#include "confdefs.h"
    1185311857
    … …  
    1194911953  lt_status=$lt_dlunknown
    1195011954  cat > conftest.$ac_ext <<EOF
    11951 #line 11951 "configure"
     11955#line 11955 "configure"
    1195211956#include "confdefs.h"
    1195311957
    … …  
    1430914313   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1431014314   -e 's:$: $lt_compiler_flag:'`
    14311    (eval echo "\"\$as_me:14311: $lt_compile\"" >&5)
     14315   (eval echo "\"\$as_me:14315: $lt_compile\"" >&5)
    1431214316   (eval "$lt_compile" 2>conftest.err)
    1431314317   ac_status=$?
    1431414318   cat conftest.err >&5
    14315    echo "$as_me:14315: \$? = $ac_status" >&5
     14319   echo "$as_me:14319: \$? = $ac_status" >&5
    1431614320   if (exit $ac_status) && test -s "$ac_outfile"; then
    1431714321     # The compiler can only warn and ignore the option if not recognized
    … …  
    1441314417   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1441414418   -e 's:$: $lt_compiler_flag:'`
    14415    (eval echo "\"\$as_me:14415: $lt_compile\"" >&5)
     14419   (eval echo "\"\$as_me:14419: $lt_compile\"" >&5)
    1441614420   (eval "$lt_compile" 2>out/conftest.err)
    1441714421   ac_status=$?
    1441814422   cat out/conftest.err >&5
    14419    echo "$as_me:14419: \$? = $ac_status" >&5
     14423   echo "$as_me:14423: \$? = $ac_status" >&5
    1442014424   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1442114425   then
    … …  
    1598315987   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1598415988   -e 's:$: $lt_compiler_flag:'`
    15985    (eval echo "\"\$as_me:15985: $lt_compile\"" >&5)
     15989   (eval echo "\"\$as_me:15989: $lt_compile\"" >&5)
    1598615990   (eval "$lt_compile" 2>conftest.err)
    1598715991   ac_status=$?
    1598815992   cat conftest.err >&5
    15989    echo "$as_me:15989: \$? = $ac_status" >&5
     15993   echo "$as_me:15993: \$? = $ac_status" >&5
    1599015994   if (exit $ac_status) && test -s "$ac_outfile"; then
    1599115995     # The compiler can only warn and ignore the option if not recognized
    … …  
    1608716091   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1608816092   -e 's:$: $lt_compiler_flag:'`
    16089    (eval echo "\"\$as_me:16089: $lt_compile\"" >&5)
     16093   (eval echo "\"\$as_me:16093: $lt_compile\"" >&5)
    1609016094   (eval "$lt_compile" 2>out/conftest.err)
    1609116095   ac_status=$?
    1609216096   cat out/conftest.err >&5
    16093    echo "$as_me:16093: \$? = $ac_status" >&5
     16097   echo "$as_me:16097: \$? = $ac_status" >&5
    1609416098   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1609516099   then
    … …  
    1829418298   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1829518299   -e 's:$: $lt_compiler_flag:'`
    18296    (eval echo "\"\$as_me:18296: $lt_compile\"" >&5)
     18300   (eval echo "\"\$as_me:18300: $lt_compile\"" >&5)
    1829718301   (eval "$lt_compile" 2>conftest.err)
    1829818302   ac_status=$?
    1829918303   cat conftest.err >&5
    18300    echo "$as_me:18300: \$? = $ac_status" >&5
     18304   echo "$as_me:18304: \$? = $ac_status" >&5
    1830118305   if (exit $ac_status) && test -s "$ac_outfile"; then
    1830218306     # The compiler can only warn and ignore the option if not recognized
    … …  
    1856218566   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1856318567   -e 's:$: $lt_compiler_flag:'`
    18564    (eval echo "\"\$as_me:18564: $lt_compile\"" >&5)
     18568   (eval echo "\"\$as_me:18568: $lt_compile\"" >&5)
    1856518569   (eval "$lt_compile" 2>conftest.err)
    1856618570   ac_status=$?
    1856718571   cat conftest.err >&5
    18568    echo "$as_me:18568: \$? = $ac_status" >&5
     18572   echo "$as_me:18572: \$? = $ac_status" >&5
    1856918573   if (exit $ac_status) && test -s "$ac_outfile"; then
    1857018574     # The compiler can only warn and ignore the option if not recognized
    … …  
    1866618670   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1866718671   -e 's:$: $lt_compiler_flag:'`
    18668    (eval echo "\"\$as_me:18668: $lt_compile\"" >&5)
     18672   (eval echo "\"\$as_me:18672: $lt_compile\"" >&5)
    1866918673   (eval "$lt_compile" 2>out/conftest.err)
    1867018674   ac_status=$?
    1867118675   cat out/conftest.err >&5
    18672    echo "$as_me:18672: \$? = $ac_status" >&5
     18676   echo "$as_me:18676: \$? = $ac_status" >&5
    1867318677   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1867418678   then
    … …  
    2238522389s,@MPIF77@,$MPIF77,;t t
    2238622390s,@FLIBS@,$FLIBS,;t t
     22391s,@BLAS_PCLIBS@,$BLAS_PCLIBS,;t t
    2238722392s,@PKG_CONFIG@,$PKG_CONFIG,;t t
    2238822393s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t

  • ThirdParty/Blas/trunk/configure.ac

    r1583 r1679  
    5353AC_COIN_F77_WRAPPERS
    5454
    55 # Tell FINALIZE to add FLIBS to ADDLIBS, so that they get into the .pc files
    56 coin_need_flibs=yes
     55# Add FLIBS to BLAS_PCLIBS, so that they get into the .pc files
     56BLAS_PCLIBS="$FLIBS"
     57AC_SUBST(BLAS_PCLIBS)
    5758
    5859# Check if pkg-config is available (to setup addlibs file)
Note: See TracChangeset for help on using the changeset viewer.