Changeset 1576 for trunk/Clp


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

rerun autotools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/configure

    r1573 r1576  
    2063520635
    2063620636
    20637 # assemble search path for pkg-config, if we are in a project setup
    20638 if test x$coin_projectdir = xyes ; then
    20639   COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    20640 
    20641   # 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
    20642   # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
    20643   # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
    20644   if test -d "${prefix}"; then
    20645     COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    20646   fi
     20637# assemble search path for pkg-config
     20638COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     20639
     20640# 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
     20641# best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     20642# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     20643if test -d "${prefix}"; then
     20644  COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20645fi
    2064720646
    2064820647
     
    2065120650  withval="$with_coin_instdir"
    2065220651  if test -d "$withval"; then : ; else
    20653        { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
     20652     { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
    2065420653echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
    2065520654   { (exit 1); exit 1; }; }
    20656      fi
    20657      COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20655   fi
     20656   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    2065820657
    2065920658fi;
    2066020659
    20661   # in a classic setup, we want to find uninstalled projects
     20660if test x$coin_projectdir = xyes ; then
     20661  # if we are in a project setup, then in a classic setup, we want to find uninstalled projects
    2066220662  # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
    2066320663  # unfortunately, if the user set prefix, then we do not know where the project base directory is located
     
    2067920679  fi
    2068020680
    20681 
    20682 fi
     20681fi
     20682
    2068320683
    2068420684
     
    2242522425
    2242622426if test $coin_vpath_config = yes; then
    22427   coin_vpath_link_files="$coin_vpath_link_files examples/hello.mps"
     22427  # echo converts newlines in parameter to spaces
     22428  coin_vpath_link_files="$coin_vpath_link_files `echo examples/hello.mps`"
    2242822429fi
    2242922430
    2243022431
    2243122432if test $coin_vpath_config = yes; then
    22432   coin_vpath_link_files="$coin_vpath_link_files examples/input.130"
     22433  # echo converts newlines in parameter to spaces
     22434  coin_vpath_link_files="$coin_vpath_link_files `echo examples/input.130`"
    2243322435fi
    2243422436
Note: See TracChangeset for help on using the changeset viewer.