Changeset 1485 for trunk/Cbc


Ignore:
Timestamp:
Jul 21, 2010 8:50:04 AM (9 years ago)
Author:
stefan
Message:

rerun autotools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/configure

    r1484 r1485  
    2067220672
    2067320673
    20674 # assemble search path for pkg-config, if we are in a project setup
    20675 if test x$coin_projectdir = xyes ; then
    20676   COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    20677 
    20678   # 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
    20679   # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
    20680   # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
    20681   if test -d "${prefix}"; then
    20682     COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    20683   fi
     20674# assemble search path for pkg-config
     20675COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     20676
     20677# 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
     20678# best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     20679# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     20680if test -d "${prefix}"; then
     20681  COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20682fi
    2068420683
    2068520684
     
    2068820687  withval="$with_coin_instdir"
    2068920688  if test -d "$withval"; then : ; else
    20690        { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
     20689     { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
    2069120690echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
    2069220691   { (exit 1); exit 1; }; }
    20693      fi
    20694      COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20692   fi
     20693   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    2069520694
    2069620695fi;
    2069720696
    20698   # in a classic setup, we want to find uninstalled projects
     20697if test x$coin_projectdir = xyes ; then
     20698  # if we are in a project setup, then in a classic setup, we want to find uninstalled projects
    2069920699  # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
    2070020700  # unfortunately, if the user set prefix, then we do not know where the project base directory is located
     
    2071620716  fi
    2071720717
    20718 
    20719 fi
     20718fi
     20719
    2072020720
    2072120721
     
    2444924449
    2445024450if test $coin_vpath_config = yes; then
    24451   coin_vpath_link_files="$coin_vpath_link_files examples/sudoku_sample.csv"
     24451  # echo converts newlines in parameter to spaces
     24452  coin_vpath_link_files="$coin_vpath_link_files `echo examples/sudoku_sample.csv`"
    2445224453fi
    2445324454
    2445424455
    2445524456if test $coin_vpath_config = yes; then
    24456   coin_vpath_link_files="$coin_vpath_link_files examples/quad.mps"
     24457  # echo converts newlines in parameter to spaces
     24458  coin_vpath_link_files="$coin_vpath_link_files `echo examples/quad.mps`"
    2445724459fi
    2445824460
    2445924461
    2446024462if test $coin_vpath_config = yes; then
    24461   coin_vpath_link_files="$coin_vpath_link_files examples/quad2.mps"
     24463  # echo converts newlines in parameter to spaces
     24464  coin_vpath_link_files="$coin_vpath_link_files `echo examples/quad2.mps`"
    2446224465fi
    2446324466
Note: See TracChangeset for help on using the changeset viewer.