Changeset 1627


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

rerun autotools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/configure

    r1618 r1627  
    33033303
    33043304
    3305 # assemble search path for pkg-config, if we are in a project setup
    3306 if test x$coin_projectdir = xyes ; then
    3307   COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
    3308 
    3309   # 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
    3310   # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
    3311   # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
    3312   if test -d "${prefix}"; then
    3313     COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    3314   fi
     3305# assemble search path for pkg-config
     3306COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     3307
     3308# 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
     3309# best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     3310# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     3311if test -d "${prefix}"; then
     3312  COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     3313fi
    33153314
    33163315
     
    33193318  withval="$with_coin_instdir"
    33203319  if test -d "$withval"; then : ; else
    3321        { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
     3320     { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
    33223321echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
    33233322   { (exit 1); exit 1; }; }
    3324      fi
    3325      COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     3323   fi
     3324   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    33263325
    33273326fi;
    33283327
    3329   # in a classic setup, we want to find uninstalled projects
     3328if test x$coin_projectdir = xyes ; then
     3329  # if we are in a project setup, then in a classic setup, we want to find uninstalled projects
    33303330  # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
    33313331  # unfortunately, if the user set prefix, then we do not know where the project base directory is located
     
    33473347  fi
    33483348
    3349 
    3350 fi
     3349fi
     3350
    33513351
    33523352
Note: See TracChangeset for help on using the changeset viewer.