Changeset 1542 for ThirdParty/Blas


Ignore:
Timestamp:
May 1, 2010 6:25:18 AM (10 years ago)
Author:
stefan
Message:

rerun autotools; improve setup of addlibs file

Location:
ThirdParty/Blas/branches/split
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Blas/branches/split/Makefile.am

    r1539 r1542  
    5858
    5959blas_addlibs.txt : coinblas.pc
    60         PKG_CONFIG_PATH=.:$(libdir)/pkgconfig:${PKG_CONFIG_PATH} $(PKG_CONFIG) --libs coinblas > blas_addlibs.txt
     60        PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs coinblas > blas_addlibs.txt
    6161endif
    6262
  • ThirdParty/Blas/branches/split/Makefile.in

    r1539 r1542  
    137137COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
    138138COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
     139COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    139140CPP = @CPP@
    140141CPPFLAGS = @CPPFLAGS@
     
    720721
    721722@COIN_HAS_PKGCONFIG_TRUE@blas_addlibs.txt : coinblas.pc
    722 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:$(libdir)/pkgconfig:${PKG_CONFIG_PATH} $(PKG_CONFIG) --libs coinblas > blas_addlibs.txt
     723@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs coinblas > blas_addlibs.txt
    723724
    724725install-doc: $(DocFiles)
  • ThirdParty/Blas/branches/split/configure

    r1539 r1542  
    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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE 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 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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH 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
     
    11001100  --with-blas-verbosity specify the debug verbosity level for project Blas
    11011101  --with-blas-checklevel specify the sanity check level for project Blas
     1102  --with-coin-instdir     prefix of installation directory for precompiled
     1103                          COIN packages
    11021104  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
    11031105  --with-pic              try to use only PIC/non-PIC objects [default=use
     
    32973299
    32983300# Provide some information about the compiler.
    3299 echo "$as_me:3299:" \
     3301echo "$as_me:3301:" \
    33003302     "checking for Fortran 77 compiler version" >&5
    33013303ac_compiler=`set X $ac_compile; echo $2`
     
    38653867ac_save_FFLAGS=$FFLAGS
    38663868FFLAGS="$FFLAGS $ac_verb"
    3867 (eval echo $as_me:3867: \"$ac_link\") >&5
     3869(eval echo $as_me:3869: \"$ac_link\") >&5
    38683870ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    38693871echo "$ac_f77_v_output" >&5
     
    39433945ac_save_FFLAGS=$FFLAGS
    39443946FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    3945 (eval echo $as_me:3945: \"$ac_link\") >&5
     3947(eval echo $as_me:3947: \"$ac_link\") >&5
    39463948ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    39473949echo "$ac_f77_v_output" >&5
     
    48304832
    48314833
     4834
     4835# assemble search path for pkg-config, if we are in a project setup
     4836if test x$coin_projectdir = xyes ; then
     4837  COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     4838
     4839  # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
     4840  # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     4841  # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     4842  if test -d "${prefix}"; then
     4843    COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     4844  fi
     4845
     4846
     4847# Check whether --with-coin-instdir or --without-coin-instdir was given.
     4848if test "${with_coin_instdir+set}" = set; then
     4849  withval="$with_coin_instdir"
     4850  if test -d "$withval"; then : ; else
     4851       { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
     4852echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
     4853   { (exit 1); exit 1; }; }
     4854     fi
     4855     COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     4856
     4857fi;
     4858
     4859  # in a classic setup, we want to find uninstalled projects
     4860  # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
     4861  # unfortunately, if the user set prefix, then we do not know where the project base directory is located
     4862  # but it is likely to be either .. (if we are a usual coin project) or ../.. (if we are a unusual coin project like ThirdParty or Data)
     4863  if test -e ../coin_subdirs.txt ; then
     4864    for i in `cat ../coin_subdirs.txt` ; do
     4865      COIN_PKG_CONFIG_PATH="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     4866    done
     4867  fi
     4868
     4869  if test -e ../../coin_subdirs.txt ; then
     4870    for i in `cat ../../coin_subdirs.txt` ; do
     4871      COIN_PKG_CONFIG_PATH="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     4872    done
     4873  fi
     4874
     4875
     4876fi
    48324877
    48334878
     
    64666511*-*-irix6*)
    64676512  # Find out which ABI we are using.
    6468   echo '#line 6468 "configure"' > conftest.$ac_ext
     6513  echo '#line 6513 "configure"' > conftest.$ac_ext
    64696514  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    64706515  (eval $ac_compile) 2>&5
     
    89438988   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    89448989   -e 's:$: $lt_compiler_flag:'`
    8945    (eval echo "\"\$as_me:8945: $lt_compile\"" >&5)
     8990   (eval echo "\"\$as_me:8990: $lt_compile\"" >&5)
    89468991   (eval "$lt_compile" 2>conftest.err)
    89478992   ac_status=$?
    89488993   cat conftest.err >&5
    8949    echo "$as_me:8949: \$? = $ac_status" >&5
     8994   echo "$as_me:8994: \$? = $ac_status" >&5
    89508995   if (exit $ac_status) && test -s "$ac_outfile"; then
    89518996     # The compiler can only warn and ignore the option if not recognized
     
    92119256   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    92129257   -e 's:$: $lt_compiler_flag:'`
    9213    (eval echo "\"\$as_me:9213: $lt_compile\"" >&5)
     9258   (eval echo "\"\$as_me:9258: $lt_compile\"" >&5)
    92149259   (eval "$lt_compile" 2>conftest.err)
    92159260   ac_status=$?
    92169261   cat conftest.err >&5
    9217    echo "$as_me:9217: \$? = $ac_status" >&5
     9262   echo "$as_me:9262: \$? = $ac_status" >&5
    92189263   if (exit $ac_status) && test -s "$ac_outfile"; then
    92199264     # The compiler can only warn and ignore the option if not recognized
     
    93159360   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    93169361   -e 's:$: $lt_compiler_flag:'`
    9317    (eval echo "\"\$as_me:9317: $lt_compile\"" >&5)
     9362   (eval echo "\"\$as_me:9362: $lt_compile\"" >&5)
    93189363   (eval "$lt_compile" 2>out/conftest.err)
    93199364   ac_status=$?
    93209365   cat out/conftest.err >&5
    9321    echo "$as_me:9321: \$? = $ac_status" >&5
     9366   echo "$as_me:9366: \$? = $ac_status" >&5
    93229367   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    93239368   then
     
    1173211777  lt_status=$lt_dlunknown
    1173311778  cat > conftest.$ac_ext <<EOF
    11734 #line 11734 "configure"
     11779#line 11779 "configure"
    1173511780#include "confdefs.h"
    1173611781
     
    1183211877  lt_status=$lt_dlunknown
    1183311878  cat > conftest.$ac_ext <<EOF
    11834 #line 11834 "configure"
     11879#line 11879 "configure"
    1183511880#include "confdefs.h"
    1183611881
     
    1419214237   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1419314238   -e 's:$: $lt_compiler_flag:'`
    14194    (eval echo "\"\$as_me:14194: $lt_compile\"" >&5)
     14239   (eval echo "\"\$as_me:14239: $lt_compile\"" >&5)
    1419514240   (eval "$lt_compile" 2>conftest.err)
    1419614241   ac_status=$?
    1419714242   cat conftest.err >&5
    14198    echo "$as_me:14198: \$? = $ac_status" >&5
     14243   echo "$as_me:14243: \$? = $ac_status" >&5
    1419914244   if (exit $ac_status) && test -s "$ac_outfile"; then
    1420014245     # The compiler can only warn and ignore the option if not recognized
     
    1429614341   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1429714342   -e 's:$: $lt_compiler_flag:'`
    14298    (eval echo "\"\$as_me:14298: $lt_compile\"" >&5)
     14343   (eval echo "\"\$as_me:14343: $lt_compile\"" >&5)
    1429914344   (eval "$lt_compile" 2>out/conftest.err)
    1430014345   ac_status=$?
    1430114346   cat out/conftest.err >&5
    14302    echo "$as_me:14302: \$? = $ac_status" >&5
     14347   echo "$as_me:14347: \$? = $ac_status" >&5
    1430314348   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1430414349   then
     
    1586615911   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1586715912   -e 's:$: $lt_compiler_flag:'`
    15868    (eval echo "\"\$as_me:15868: $lt_compile\"" >&5)
     15913   (eval echo "\"\$as_me:15913: $lt_compile\"" >&5)
    1586915914   (eval "$lt_compile" 2>conftest.err)
    1587015915   ac_status=$?
    1587115916   cat conftest.err >&5
    15872    echo "$as_me:15872: \$? = $ac_status" >&5
     15917   echo "$as_me:15917: \$? = $ac_status" >&5
    1587315918   if (exit $ac_status) && test -s "$ac_outfile"; then
    1587415919     # The compiler can only warn and ignore the option if not recognized
     
    1597016015   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1597116016   -e 's:$: $lt_compiler_flag:'`
    15972    (eval echo "\"\$as_me:15972: $lt_compile\"" >&5)
     16017   (eval echo "\"\$as_me:16017: $lt_compile\"" >&5)
    1597316018   (eval "$lt_compile" 2>out/conftest.err)
    1597416019   ac_status=$?
    1597516020   cat out/conftest.err >&5
    15976    echo "$as_me:15976: \$? = $ac_status" >&5
     16021   echo "$as_me:16021: \$? = $ac_status" >&5
    1597716022   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1597816023   then
     
    1817718222   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1817818223   -e 's:$: $lt_compiler_flag:'`
    18179    (eval echo "\"\$as_me:18179: $lt_compile\"" >&5)
     18224   (eval echo "\"\$as_me:18224: $lt_compile\"" >&5)
    1818018225   (eval "$lt_compile" 2>conftest.err)
    1818118226   ac_status=$?
    1818218227   cat conftest.err >&5
    18183    echo "$as_me:18183: \$? = $ac_status" >&5
     18228   echo "$as_me:18228: \$? = $ac_status" >&5
    1818418229   if (exit $ac_status) && test -s "$ac_outfile"; then
    1818518230     # The compiler can only warn and ignore the option if not recognized
     
    1844518490   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1844618491   -e 's:$: $lt_compiler_flag:'`
    18447    (eval echo "\"\$as_me:18447: $lt_compile\"" >&5)
     18492   (eval echo "\"\$as_me:18492: $lt_compile\"" >&5)
    1844818493   (eval "$lt_compile" 2>conftest.err)
    1844918494   ac_status=$?
    1845018495   cat conftest.err >&5
    18451    echo "$as_me:18451: \$? = $ac_status" >&5
     18496   echo "$as_me:18496: \$? = $ac_status" >&5
    1845218497   if (exit $ac_status) && test -s "$ac_outfile"; then
    1845318498     # The compiler can only warn and ignore the option if not recognized
     
    1854918594   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1855018595   -e 's:$: $lt_compiler_flag:'`
    18551    (eval echo "\"\$as_me:18551: $lt_compile\"" >&5)
     18596   (eval echo "\"\$as_me:18596: $lt_compile\"" >&5)
    1855218597   (eval "$lt_compile" 2>out/conftest.err)
    1855318598   ac_status=$?
    1855418599   cat out/conftest.err >&5
    18555    echo "$as_me:18555: \$? = $ac_status" >&5
     18600   echo "$as_me:18600: \$? = $ac_status" >&5
    1855618601   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1855718602   then
     
    2226822313s,@COIN_HAS_PKGCONFIG_TRUE@,$COIN_HAS_PKGCONFIG_TRUE,;t t
    2226922314s,@COIN_HAS_PKGCONFIG_FALSE@,$COIN_HAS_PKGCONFIG_FALSE,;t t
     22315s,@COIN_PKG_CONFIG_PATH@,$COIN_PKG_CONFIG_PATH,;t t
    2227022316s,@EGREP@,$EGREP,;t t
    2227122317s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
Note: See TracChangeset for help on using the changeset viewer.