Changeset 2104


Ignore:
Timestamp:
Feb 19, 2011 9:33:40 AM (9 years ago)
Author:
stefan
Message:

sync with trunk rev2103

Location:
stable/0.7
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

  • stable/0.7/coin.m4

    r2098 r2104  
    26872687# is available.  If so, then the variable PKGCONFIG is set to its path.
    26882688# If not, PKGCONFIG is set to "".  The minimal version number can be given
    2689 # as first parameter, by default it is 0.9.0.  This macro is a modified
    2690 # version of PKG_PROG_PKG_CONFIG in pkg.m4.  Further, the AM_CONDITIONAL
    2691 # COIN_HAS_PKGCONFIG is set and PKGCONFIG is AC_SUBST'ed.  Finally, if this
    2692 # setup belongs to a project directory, then the search path for .pc files
    2693 # is assembled from the value of $PKG_CONFIG_PATH, the values of --prefix,
    2694 # --coin-instdir, and the directory named in a file ../coin_subdirs.txt
    2695 # or ../../coin_subdirs.txt in a variable COIN_PKG_CONFIG_PATH, which is
    2696 # also AC_SUBST'ed. For a path xxx given in the coin-subdirs.txt, also
    2697 # the directory xxx/pkgconfig is added, if existing.
     2689# as first parameter, by default it is 0.16.0, since COIN-OR .pc files now
     2690# include an URL field, which breaks pkg-config version <= 0.15.
     2691# This macro is a modified version of PKG_PROG_PKG_CONFIG in pkg.m4.
     2692# Further, the AM_CONDITIONAL COIN_HAS_PKGCONFIG is set and PKGCONFIG is
     2693# AC_SUBST'ed.  Finally, if this setup belongs to a project directory, then
     2694# the search path for .pc files is assembled from the value of
     2695# $PKG_CONFIG_PATH, the values of --prefix, --coin-instdir, and the directories
     2696# named in a file ../coin_subdirs.txt or ../../coin_subdirs.txt in a variable
     2697# COIN_PKG_CONFIG_PATH, which is also AC_SUBST'ed. For a path xxx given in the
     2698# coin-subdirs.txt, also the directory xxx/pkgconfig is added, if existing.
    26982699
    26992700AC_DEFUN([AC_COIN_HAS_PKGCONFIG],
     
    27102711  fi
    27112712  if test -n "$PKG_CONFIG"; then
    2712     _pkg_min_version=m4_default([$1], [0.9.0])
     2713    _pkg_min_version=m4_default([$1], [0.16.0])
    27132714    AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
    27142715    if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
     
    27872788fi
    27882789
     2790if test -n "$PKG_CONFIG" && test x$coin_cc_is_cl = xtrue; then
     2791  AC_MSG_WARN([Using pkg-config together with MS or Intel Compiler on Windows is not support by example Makefiles. Consider using --disable-pkg-config.])
     2792fi
     2793
    27892794])
    27902795
     
    29032908fi
    29042909
    2905 if test $m4_tolower(coin_has_$1) != skipping; then
     2910if test "$m4_tolower(coin_has_$1)" != skipping; then
    29062911  if test $PACKAGE_TARNAME = m4_tolower($1); then
    29072912    m4_tolower(coin_has_$1)=yes
     
    29202925fi
    29212926
    2922 if test $m4_tolower(coin_has_$1) != skipping; then
     2927if test "$m4_tolower(coin_has_$1)" != skipping; then
    29232928  AC_ARG_WITH([m4_tolower($1)-incdir],
    29242929    AC_HELP_STRING([--with-m4_tolower($1)-incdir],
     
    29322937fi
    29332938
    2934 if test $m4_tolower(coin_has_$1) != skipping; then
     2939if test "$m4_tolower(coin_has_$1)" != skipping; then
    29352940  AC_ARG_WITH([m4_tolower($1)-datadir],
    29362941    AC_HELP_STRING([--with-m4_tolower($1)-datadir],
     
    34173422    #   replace "Cflags:" by "echo projcflags="
    34183423    #   remove every line starting with <some word>:
    3419     [pcfilemod=`sed -e 's/Libs:\(.*\)$/echo projlibs=\\\\"\1\\\\"/g' -e 's/Cflags:\(.*\)/echo projcflags=\\\\"\1\\\\"/g' -e '/[a-zA-Z]:/d' $pcfile`]
     3424    [pcfilemod=`sed -e 's/Libs:\(.*\)$/echo projlibs=\\\\"\1\\\\"/g' -e 's/Cflags:\(.*\)/echo projcflags=\\\\"\1\\\\"/g' -e '/^[a-zA-Z]*:/d' $pcfile`]
    34203425
    34213426    # set projcflags and projlibs variables by running $pcfilemod
     
    34623467    #   replace "Cflags:" by "echo projcflags="
    34633468    #   remove every line starting with <some word>:
    3464     [pcfilemod=`sed -e 's/Libs:\(.*\)$/echo projlibs=\\\\"\1\\\\"/g' -e 's/Cflags:\(.*\)/echo projcflags=\\\\"\1\\\\"/g' -e '/[a-zA-Z]:/d' $pcfile`]
     3469    [pcfilemod=`sed -e 's/Libs:\(.*\)$/echo projlibs=\\\\"\1\\\\"/g' -e 's/Cflags:\(.*\)/echo projcflags=\\\\"\1\\\\"/g' -e '/^[a-zA-Z]*:/d' $pcfile`]
    34653470
    34663471    # set projcflags and projlibs variables by running $pcfilemod
  • stable/0.7/compile_f2c

  • stable/0.7/share/config.site

    r291 r2104  
    266266# --with-LIB-incdir and --with-LIB-lib configure flags, where "LIB" is
    267267# replaced by the lower-case short-form of the library.  A possibly
    268 # incomplete list of choices for LIB in the current COIN projects is:
    269 # cplex, glpk, gmpl, fortmp, mosek, mpi, osl, soplex, xpress.
     268# incomplete list of choices for LIB in the current COIN-OR projects is:
     269# cplex, gurobi, mosek, soplex, xpress.
    270270# For Cplex, one might set the following:
    271271#with_cplex_incdir='/usr/ilog/cplex90/include/ilcplex'
     
    307307# Specify that Lapack should not be used
    308308#with_lapack=no
    309 
    310 ### ASL
    311 # Flag indicating where to find the AMPL Solver Library.  If --with-asldir
    312 # is not used, the configure script will test for the source code for ASL
    313 # in ThirdParty/ASL.  If this is found there, the ASL will be automatically
    314 # compiled and used, otherwise, it is assumed that ASL is unavailable.
    315 # If the user already has a precompiled version of the ASL, (s)he can use
    316 # this flag to specify the directory will all headers and the library:
    317 #with_asldir=$HOME/ampl/solvers
    318 
Note: See TracChangeset for help on using the changeset viewer.