Changeset 1622


Ignore:
Timestamp:
Nov 11, 2008, 3:56:23 AM (13 years ago)
Author:
Peter
Message:

prefer m4_default rather than raw m4 macro (ifelse).

Location:
trunk/build_support
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/build_support/yat.m4

    r1487 r1622  
    110110# ACTION
    111111if test "$ac_yat_check_yat_res" != "no" ; then
    112   ifelse([$2], , :, [$2])
     112  m4_default([$2], [:])
    113113else
    114   ifelse([$3], , :, [$3])
     114  m4_default([$3], [:])
    115115fi 
    116116
     
    153153  # ACTION
    154154  if test "$yat_config" != "no" ; then
    155     ifelse([$2], , :, [$2])
     155    m4_default([$2], [:])
    156156  else
    157     ifelse([$3], , :, [$3])
     157    m4_default([$3], [:])
    158158  fi 
    159159
     
    166166  AC_REQUIRE([YAT_FIND_YAT])  dnl
    167167  if test "$yat_config" != "no"; then
    168     ac_yat_min_version=ifelse([$1], , [0.5], [$1])
     168    ac_yat_min_version=m4_default([$1], [0.5])
    169169    AC_MSG_CHECKING(if version of yat is at least $ac_yat_min_version)
    170170
     
    183183  # ACTION
    184184  if test "$ac_yat_version_ok" = "yes" ; then
    185     ifelse([$2], , :, [$2])
     185    m4_default([$2], [:])
    186186  else
    187     ifelse([$3], , :, [$3])
     187    m4_default([$3], [:])
    188188  fi 
    189189
     
    244244  # ACTION
    245245  if test "$ac_yat_ok" = "yes" ; then
    246     ifelse([$1], , :, [$1])
     246    m4_default([$1], [:])
    247247  else
    248     ifelse([$2], , :, [$2])
     248    m4_default([$2], [:])
    249249  fi 
    250250
     
    293293  # ACTION
    294294  if test "$ac_yat_ok" = "yes" ; then
    295     ifelse([$1], , :, [$1])
     295    m4_default([$1], [:])
    296296  else
    297     ifelse([$2], , :, [$2])
     297    m4_default([$2], [:])
    298298  fi 
    299299]) # YAT_CHECK_LIB
  • trunk/build_support/yat_add_flag.m4

    r1560 r1622  
    6868  found=no;       
    6969  for a in $1; do
    70     if test "$f" = "$2"; then
     70    if test "x$a" = "x$2"; then
    7171      found=yes;
    7272    fi
    7373  done
    7474
    75 
    76 
    7775  # ACTION
    7876  if test "$found" = "yes" ; then
    79     ifelse([$3], , :, [$3])
     77    m4_default([$3], [:])
    8078  else
    81     ifelse([$4], , :, [$4])
     79    m4_default([$4], [:])
    8280  fi 
    8381
Note: See TracChangeset for help on using the changeset viewer.