Changeset 1313


Ignore:
Timestamp:
Jul 7, 2009 6:07:09 PM (10 years ago)
Author:
andreasw
Message:

more incldir changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/BSPsplit/coin.m4

    r1312 r1313  
    2121[AC_ARG_VAR([COIN_SKIP_PROJECTS],[Set to the subdirectories of projects that should be skipped in the configuration])
    2222
    23 addthis=no
    24 case $1 in
    25   */* )
    26     # This must be Data/Simple or something else
    27     AC_MSG_CHECKING(whether directory $1 should be recursed into)
    28     coin_skip=no
    29     if test x"$COIN_SKIP_PROJECTS" != x; then
    30       for dir in $COIN_SKIP_PROJECTS; do
    31         if test $dir = $1; then
    32           coin_skip=yes
    33         fi
    34       done
    35     fi
    36     if test $coin_skip = yes; then
    37       AC_MSG_RESULT(skipping)
    38     elif test -r $srcdir/$1/configure; then
     23# This is a hack to find out if there is a "/" in the name, which would
     24# break the AC_COIN_HAS_PROJECT macro
     25m4_case($1,m4_bpatsubsts($1,[/],[_]),
     26[# We have no "/" in the $1 argument
     27  AC_COIN_HAS_PROJECT($1)
     28  AC_MSG_CHECKING(whether directory $1 should be recursed into)
     29  if test "$m4_tolower(coin_has_$1)" != skipped &&
     30     test "$m4_tolower(coin_has_$1)" != installed; then
     31    if test -r $srcdir/$1/configure; then
    3932      coin_subdirs="$coin_subdirs $1"
    4033      AC_MSG_RESULT(yes)
    41       addthis=yes
     34      AC_CONFIG_SUBDIRS($1)
    4235    else
    4336      AC_MSG_RESULT(no)
    4437    fi
    45     ;;
    46   * )
    47     AC_COIN_HAS_PROJECT($1)
    48     AC_MSG_CHECKING(whether directory $1 should be recursed into)
    49     if test "$m4_tolower(coin_has_$1)" != skipped &&
    50        test "$m4_tolower(coin_has_$1)" != installed; then
    51       if test -r $srcdir/$1/configure; then
    52         coin_subdirs="$coin_subdirs $1"
    53         AC_MSG_RESULT(yes)
    54         addthis=yes
    55       else
    56         AC_MSG_RESULT(no)
     38  else
     39    AC_MSG_RESULT(no)
     40  fi],
     41[# This must be Data/Simple or something else
     42  AC_MSG_CHECKING(whether directory $1 should be recursed into)
     43  coin_skip=no
     44  if test x"$COIN_SKIP_PROJECTS" != x; then
     45    for dir in $COIN_SKIP_PROJECTS; do
     46      if test $dir = $1; then
     47        coin_skip=yes
    5748      fi
    58     else
    59       AC_MSG_RESULT(no)
    60     fi
    61     ;;
    62 esac
    63 if test $addthis = yes; then
    64   AC_CONFIG_SUBDIRS($1)
    65 fi
     49    done
     50  fi
     51  if test $coin_skip = yes; then
     52    AC_MSG_RESULT(skipping)
     53  elif test -r $srcdir/$1/configure; then
     54    coin_subdirs="$coin_subdirs $1"
     55    AC_MSG_RESULT(yes)
     56    AC_CONFIG_SUBDIRS($1)
     57  else
     58    AC_MSG_RESULT(no)
     59  fi])
    6660])
    6761
     
    23622356AC_DEFUN([AC_COIN_HAS_PROJECT],
    23632357[AC_MSG_CHECKING([for COIN project $1])
    2364 
    23652358# First check, if the sub-project is actually available (ToDo: allow
    23662359# other locations)
     
    24832476  # Check for library (this is not qo reliable)
    24842477  m4_ifvaln([$3],[tmp=$m4_toupper($1INSTDIR)/lib
    2485                   AC_MSG_CHECKING(whether library $3.* is available in $tmp)
     2478                  AC_MSG_CHECKING([whether library $3.* is available in $tmp])
    24862479                  bla=`ls $tmp/$3.* 2>/dev/null | head -n 1`
    24872480                  if test x"$bla" = x; then
Note: See TracChangeset for help on using the changeset viewer.