Changeset 2095


Ignore:
Timestamp:
Jan 19, 2011 5:57:49 AM (9 years ago)
Author:
stefan
Message:

sync with trunk rev2094

Location:
stable/0.7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

  • stable/0.7/coin.m4

    r2086 r2095  
    27392739# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
    27402740if test "x${prefix}" = xNONE ; then
    2741   COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     2741  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    27422742else
    2743   COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     2743  COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    27442744fi
    27452745
     
    27502750     AC_MSG_ERROR([argument for --with-coin-instdir not a directory])
    27512751   fi
    2752    COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     2752   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    27532753  ],[])
    27542754
     
    37073707#    LAPACK_LIBS to its value
    37083708# 4. tries standard libraries
    3709 # 5. calls COIN_CHECK_PACKAGE(Lapack, [lapack], [$1]) to check for
     3709# 5. calls COIN_CHECK_PACKAGE(Lapack, [coinlapack], [$1]) to check for
    37103710#    ThirdParty/Lapack
    37113711# The makefile conditional and preprocessor macro COIN_HAS_LAPACK is defined.
     
    37143714# In case 3 and 4, the flags to link to Lapack are added to X_PCLIBS too.
    37153715# In case 5, Lapack is added to X_PCREQUIRES.
     3716#
     3717# TODO: Lapack usually depends on Blas, so if we check for a system lapack library,
     3718#   shouldn't we include AC_COIN_CHECK_PACKAGE_BLAS first?
     3719#   However, if we look for coinlapack via AC_COIN_CHECK_PACKAGE(Lapack, [coinlapack], [$1]),
     3720#   then we will get Blas as dependency of coinlapack.
    37163721
    37173722AC_DEFUN([AC_COIN_CHECK_PACKAGE_LAPACK],
  • stable/0.7/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.