Changeset 1611


Ignore:
Timestamp:
Jul 18, 2010 9:00:29 AM (9 years ago)
Author:
stefan
Message:

be more careful about what will happen if arugment 2 is empty in AC_COIN_MAIN_PACKAGEDIR (thanks to Lou for finding this)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r1608 r1611  
    37103710if test "$m4_tolower(coin_has_$1)" = notGiven; then
    37113711  if test -d $srcdir/$2/$1; then
     3712    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     3713    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     3714    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
    37123715    m4_ifvaln([$3],
    3713       [for i in $srcdir/$2/$1/$3; do
     3716      [for i in $srcdir/m4_ifval($2,[$2/],)$1/$3; do
    37143717         if test -r $i; then
    37153718           coin_have_project_dir=yes
     
    37183721      [ coin_have_project_dir=yes ])
    37193722    if test $coin_have_project_dir = yes; then
    3720       m4_tolower(coin_has_$1)=$2/$1
     3723      m4_tolower(coin_has_$1)=m4_ifval($2,[$2/],)$1
    37213724    fi
    37223725  fi
     
    37283731if test "$coin_have_project_dir" = yes ; then
    37293732
    3730   if test -r $srcdir/$2/$1/configure; then
     3733  if test -r $srcdir/m4_ifval($2,[$2/],)$1/configure; then
    37313734    coin_subdirs="$coin_subdirs m4_ifval($2,[$2/],)$1"
    37323735    AC_MSG_RESULT(yes)
Note: See TracChangeset for help on using the changeset viewer.