Changeset 1466


Ignore:
Timestamp:
Feb 6, 2010 2:33:55 PM (10 years ago)
Author:
stefan
Message:

make sure projects are only configured+build if not installed yet

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/BSPsplit/coin.m4

    r1465 r1466  
    34933493
    34943494m4_tolower(coin_has_$1)=notGiven
     3495coin_have_project_dir=no
    34953496
    34963497# check if user wants to skip project in any case
     
    35103511  if test $PACKAGE_TARNAME = m4_tolower($1); then
    35113512    m4_tolower(coin_has_$1)=.
     3513    coin_have_project_dir=yes
    35123514  fi
    35133515
     
    35393541    # 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
    35403542    if test -d "$prefix"; then
    3541       PKG_CONFIG_PATH="$prefix/lib/$2/pkgconfig:$PKG_CONFIG_PATH"
     3543      PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
    35423544    fi
    35433545   
     
    35483550         AC_MSG_ERROR([argument for --with-coin-instdir not a directory])
    35493551       fi
    3550        PKG_CONFIG_PATH="$withval/lib/$2/pkgconfig:$PKG_CONFIG_PATH"
     3552       PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
    35513553      ],[])
    35523554
     
    35633565if test "$m4_tolower(coin_has_$1)" = notGiven; then
    35643566  if test -d $srcdir/$2/$1; then
    3565     coin_pkg_is_here=no
    35663567    m4_ifvaln([$3],
    35673568      [for i in $srcdir/$2/$1/$3; do
    35683569         if test -r $i; then
    3569            coin_pkg_is_here=yes
     3570           coin_have_project_dir=yes
    35703571         fi
    35713572       done],
    3572       [ coin_pkg_is_here=yes ])
    3573     if test $coin_pkg_is_here = yes; then
     3573      [ coin_have_project_dir=yes ])
     3574    if test $coin_have_project_dir = yes; then
    35743575      m4_tolower(coin_has_$1)=$2/$1
    35753576    fi
     
    35803581
    35813582AC_MSG_CHECKING(whether project $1 need to be configured)
    3582 if test "$m4_tolower(coin_has_$1)" != skipping &&
    3583    test "$m4_tolower(coin_has_$1)" != notGiven &&
    3584    test "$m4_tolower(coin_has_$1)" != installed; then
     3583if test "$coin_have_project_dir" = yes ; then
    35853584
    35863585  if test -r $srcdir/$2/$1/configure; then
Note: See TracChangeset for help on using the changeset viewer.