Changeset 1680


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

change from COIN_HAS_MODULE to COIN_HAS_PACKAGE

Location:
ThirdParty/Lapack/trunk
Files:
5 edited

Legend:

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

    r1648 r1680  
    171171INSTALL_SCRIPT = @INSTALL_SCRIPT@
    172172INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
     173LAPACK_PCLIBS = @LAPACK_PCLIBS@
    173174LAPACK_SVN_REV = @LAPACK_SVN_REV@
    174175LDFLAGS = @LDFLAGS@
  • ThirdParty/Lapack/trunk/coinlapack-uninstalled.pc.in

    r1617 r1680  
    55Description: Linear algebra package
    66Version: @PACKAGE_VERSION@
    7 Libs: -L${libdir} -lcoinlapack @PCADDLIBS@
     7Libs: -L${libdir} -lcoinlapack @LAPACK_PCLIBS@
    88Cflags:
  • ThirdParty/Lapack/trunk/coinlapack.pc.in

    r1617 r1680  
    66Description: Linear algebra package
    77Version: @PACKAGE_VERSION@
    8 Libs: -L${libdir} -lcoinlapack @PCADDLIBS@
     8Libs: -L${libdir} -lcoinlapack @LAPACK_PCLIBS@
    99Cflags:
  • ThirdParty/Lapack/trunk/configure

    r1666 r1680  
    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 LAPACK_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 DLAMCH_FFLAGS 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 LAPACK_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 LAPACK_PCLIBS DLAMCH_FFLAGS 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
     
    16511651fi
    16521652
    1653 # Set the project's SVN revision number
     1653# Set the project's SVN revision number. The complicated sed expression
     1654# (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
     1655# as a single number.
    16541656# Extract the first word of "svnversion", so it can be a program name with args.
    16551657set dummy svnversion; ac_word=$2
     
    16901692if test "x$have_svnversion" = xyes && test "xLapack" != x; then
    16911693
    1692   LAPACK_SVN_REV=`cd $srcdir/$coin_has_lapack ; svnversion`
     1694  svn_rev_tmp=`cd $srcdir/$coin_has_lapack ; svnversion`
     1695  LAPACK_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
    16931696  if test $LAPACK_SVN_REV != exported; then
    16941697
    16951698cat >>confdefs.h <<_ACEOF
    1696 #define LAPACK_SVN_REV "$LAPACK_SVN_REV"
     1699#define LAPACK_SVN_REV $LAPACK_SVN_REV
    16971700_ACEOF
    16981701
     
    33703373
    33713374# Provide some information about the compiler.
    3372 echo "$as_me:3372:" \
     3375echo "$as_me:3375:" \
    33733376     "checking for Fortran 77 compiler version" >&5
    33743377ac_compiler=`set X $ac_compile; echo $2`
     
    39383941ac_save_FFLAGS=$FFLAGS
    39393942FFLAGS="$FFLAGS $ac_verb"
    3940 (eval echo $as_me:3940: \"$ac_link\") >&5
     3943(eval echo $as_me:3943: \"$ac_link\") >&5
    39413944ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    39423945echo "$ac_f77_v_output" >&5
     
    40164019ac_save_FFLAGS=$FFLAGS
    40174020FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    4018 (eval echo $as_me:4018: \"$ac_link\") >&5
     4021(eval echo $as_me:4021: \"$ac_link\") >&5
    40194022ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    40204023echo "$ac_f77_v_output" >&5
     
    49544957
    49554958
    4956 # Tell FINALIZE to add FLIBS to ADDLIBS, so that they get into the .pc files
    4957 coin_need_flibs=yes
     4959# Add FLIBS to LAPACK_PCLIBS, so that they get into the .pc files
     4960LAPACK_PCLIBS="$FLIBS"
     4961
    49584962
    49594963# Take care that optimization is disbled for DLAMCH.F
     
    66226626*-*-irix6*)
    66236627  # Find out which ABI we are using.
    6624   echo '#line 6624 "configure"' > conftest.$ac_ext
     6628  echo '#line 6628 "configure"' > conftest.$ac_ext
    66256629  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    66266630  (eval $ac_compile) 2>&5
     
    90999103   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    91009104   -e 's:$: $lt_compiler_flag:'`
    9101    (eval echo "\"\$as_me:9101: $lt_compile\"" >&5)
     9105   (eval echo "\"\$as_me:9105: $lt_compile\"" >&5)
    91029106   (eval "$lt_compile" 2>conftest.err)
    91039107   ac_status=$?
    91049108   cat conftest.err >&5
    9105    echo "$as_me:9105: \$? = $ac_status" >&5
     9109   echo "$as_me:9109: \$? = $ac_status" >&5
    91069110   if (exit $ac_status) && test -s "$ac_outfile"; then
    91079111     # The compiler can only warn and ignore the option if not recognized
     
    93679371   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    93689372   -e 's:$: $lt_compiler_flag:'`
    9369    (eval echo "\"\$as_me:9369: $lt_compile\"" >&5)
     9373   (eval echo "\"\$as_me:9373: $lt_compile\"" >&5)
    93709374   (eval "$lt_compile" 2>conftest.err)
    93719375   ac_status=$?
    93729376   cat conftest.err >&5
    9373    echo "$as_me:9373: \$? = $ac_status" >&5
     9377   echo "$as_me:9377: \$? = $ac_status" >&5
    93749378   if (exit $ac_status) && test -s "$ac_outfile"; then
    93759379     # The compiler can only warn and ignore the option if not recognized
     
    94719475   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    94729476   -e 's:$: $lt_compiler_flag:'`
    9473    (eval echo "\"\$as_me:9473: $lt_compile\"" >&5)
     9477   (eval echo "\"\$as_me:9477: $lt_compile\"" >&5)
    94749478   (eval "$lt_compile" 2>out/conftest.err)
    94759479   ac_status=$?
    94769480   cat out/conftest.err >&5
    9477    echo "$as_me:9477: \$? = $ac_status" >&5
     9481   echo "$as_me:9481: \$? = $ac_status" >&5
    94789482   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    94799483   then
     
    1188811892  lt_status=$lt_dlunknown
    1188911893  cat > conftest.$ac_ext <<EOF
    11890 #line 11890 "configure"
     11894#line 11894 "configure"
    1189111895#include "confdefs.h"
    1189211896
     
    1198811992  lt_status=$lt_dlunknown
    1198911993  cat > conftest.$ac_ext <<EOF
    11990 #line 11990 "configure"
     11994#line 11994 "configure"
    1199111995#include "confdefs.h"
    1199211996
     
    1434814352   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1434914353   -e 's:$: $lt_compiler_flag:'`
    14350    (eval echo "\"\$as_me:14350: $lt_compile\"" >&5)
     14354   (eval echo "\"\$as_me:14354: $lt_compile\"" >&5)
    1435114355   (eval "$lt_compile" 2>conftest.err)
    1435214356   ac_status=$?
    1435314357   cat conftest.err >&5
    14354    echo "$as_me:14354: \$? = $ac_status" >&5
     14358   echo "$as_me:14358: \$? = $ac_status" >&5
    1435514359   if (exit $ac_status) && test -s "$ac_outfile"; then
    1435614360     # The compiler can only warn and ignore the option if not recognized
     
    1445214456   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1445314457   -e 's:$: $lt_compiler_flag:'`
    14454    (eval echo "\"\$as_me:14454: $lt_compile\"" >&5)
     14458   (eval echo "\"\$as_me:14458: $lt_compile\"" >&5)
    1445514459   (eval "$lt_compile" 2>out/conftest.err)
    1445614460   ac_status=$?
    1445714461   cat out/conftest.err >&5
    14458    echo "$as_me:14458: \$? = $ac_status" >&5
     14462   echo "$as_me:14462: \$? = $ac_status" >&5
    1445914463   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1446014464   then
     
    1602216026   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1602316027   -e 's:$: $lt_compiler_flag:'`
    16024    (eval echo "\"\$as_me:16024: $lt_compile\"" >&5)
     16028   (eval echo "\"\$as_me:16028: $lt_compile\"" >&5)
    1602516029   (eval "$lt_compile" 2>conftest.err)
    1602616030   ac_status=$?
    1602716031   cat conftest.err >&5
    16028    echo "$as_me:16028: \$? = $ac_status" >&5
     16032   echo "$as_me:16032: \$? = $ac_status" >&5
    1602916033   if (exit $ac_status) && test -s "$ac_outfile"; then
    1603016034     # The compiler can only warn and ignore the option if not recognized
     
    1612616130   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1612716131   -e 's:$: $lt_compiler_flag:'`
    16128    (eval echo "\"\$as_me:16128: $lt_compile\"" >&5)
     16132   (eval echo "\"\$as_me:16132: $lt_compile\"" >&5)
    1612916133   (eval "$lt_compile" 2>out/conftest.err)
    1613016134   ac_status=$?
    1613116135   cat out/conftest.err >&5
    16132    echo "$as_me:16132: \$? = $ac_status" >&5
     16136   echo "$as_me:16136: \$? = $ac_status" >&5
    1613316137   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1613416138   then
     
    1833318337   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1833418338   -e 's:$: $lt_compiler_flag:'`
    18335    (eval echo "\"\$as_me:18335: $lt_compile\"" >&5)
     18339   (eval echo "\"\$as_me:18339: $lt_compile\"" >&5)
    1833618340   (eval "$lt_compile" 2>conftest.err)
    1833718341   ac_status=$?
    1833818342   cat conftest.err >&5
    18339    echo "$as_me:18339: \$? = $ac_status" >&5
     18343   echo "$as_me:18343: \$? = $ac_status" >&5
    1834018344   if (exit $ac_status) && test -s "$ac_outfile"; then
    1834118345     # The compiler can only warn and ignore the option if not recognized
     
    1860118605   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1860218606   -e 's:$: $lt_compiler_flag:'`
    18603    (eval echo "\"\$as_me:18603: $lt_compile\"" >&5)
     18607   (eval echo "\"\$as_me:18607: $lt_compile\"" >&5)
    1860418608   (eval "$lt_compile" 2>conftest.err)
    1860518609   ac_status=$?
    1860618610   cat conftest.err >&5
    18607    echo "$as_me:18607: \$? = $ac_status" >&5
     18611   echo "$as_me:18611: \$? = $ac_status" >&5
    1860818612   if (exit $ac_status) && test -s "$ac_outfile"; then
    1860918613     # The compiler can only warn and ignore the option if not recognized
     
    1870518709   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1870618710   -e 's:$: $lt_compiler_flag:'`
    18707    (eval echo "\"\$as_me:18707: $lt_compile\"" >&5)
     18711   (eval echo "\"\$as_me:18711: $lt_compile\"" >&5)
    1870818712   (eval "$lt_compile" 2>out/conftest.err)
    1870918713   ac_status=$?
    1871018714   cat out/conftest.err >&5
    18711    echo "$as_me:18711: \$? = $ac_status" >&5
     18715   echo "$as_me:18715: \$? = $ac_status" >&5
    1871218716   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1871318717   then
     
    2245122455s,@COIN_PKG_CONFIG_PATH@,$COIN_PKG_CONFIG_PATH,;t t
    2245222456s,@COIN_PKG_CONFIG_PATH_UNINSTALLED@,$COIN_PKG_CONFIG_PATH_UNINSTALLED,;t t
     22457s,@LAPACK_PCLIBS@,$LAPACK_PCLIBS,;t t
    2245322458s,@DLAMCH_FFLAGS@,$DLAMCH_FFLAGS,;t t
    2245422459s,@EGREP@,$EGREP,;t t
  • ThirdParty/Lapack/trunk/configure.ac

    r1587 r1680  
    5757AC_COIN_HAS_PKGCONFIG
    5858
    59 # Tell FINALIZE to add FLIBS to ADDLIBS, so that they get into the .pc files
    60 coin_need_flibs=yes
     59# Add FLIBS to LAPACK_PCLIBS, so that they get into the .pc files
     60LAPACK_PCLIBS="$FLIBS"
     61AC_SUBST(LAPACK_PCLIBS)
    6162
    6263# Take care that optimization is disbled for DLAMCH.F
Note: See TracChangeset for help on using the changeset viewer.