Changeset 1622 for trunk/build_support

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:

• yat.m4 (modified) (6 diffs)
• yat_add_flag.m4 (modified) (1 diff)

trunk/build_support/yat.m4

@@ -110 +110 @@
 # ACTION
 if test "$ac_yat_check_yat_res" != "no" ; then
-  ifelse([$2], , :, [$2])
+  m4_default([$2], [:])
 else
-  ifelse([$3], , :, [$3])
+  m4_default([$3], [:])
 fi  
 
@@ -153 +153 @@
   # ACTION
   if test "$yat_config" != "no" ; then
-    ifelse([$2], , :, [$2])
+    m4_default([$2], [:])
   else
-    ifelse([$3], , :, [$3])
+    m4_default([$3], [:])
   fi  
 
@@ -166 +166 @@
   AC_REQUIRE([YAT_FIND_YAT])  dnl
   if test "$yat_config" != "no"; then
-    ac_yat_min_version=ifelse([$1], , [0.5], [$1])
+    ac_yat_min_version=m4_default([$1], [0.5])
     AC_MSG_CHECKING(if version of yat is at least $ac_yat_min_version)
 
@@ -183 +183 @@
   # ACTION
   if test "$ac_yat_version_ok" = "yes" ; then
-    ifelse([$2], , :, [$2])
+    m4_default([$2], [:])
   else
-    ifelse([$3], , :, [$3])
+    m4_default([$3], [:])
   fi  
 
@@ -244 +244 @@
   # ACTION
   if test "$ac_yat_ok" = "yes" ; then
-    ifelse([$1], , :, [$1])
+    m4_default([$1], [:])
   else
-    ifelse([$2], , :, [$2])
+    m4_default([$2], [:])
   fi  
 
@@ -293 +293 @@
   # ACTION
   if test "$ac_yat_ok" = "yes" ; then
-    ifelse([$1], , :, [$1])
+    m4_default([$1], [:])
   else
-    ifelse([$2], , :, [$2])
+    m4_default([$2], [:])
   fi  
 ]) # YAT_CHECK_LIB

trunk/build_support/yat_add_flag.m4

@@ -68 +68 @@
   found=no;       
   for a in $1; do 
-    if test "$f" = "$2"; then
+    if test "x$a" = "x$2"; then
       found=yes;
     fi
   done
 
-
-
   # ACTION
   if test "$found" = "yes" ; then
-    ifelse([$3], , :, [$3])
+    m4_default([$3], [:])
   else
-    ifelse([$4], , :, [$4])
+    m4_default([$4], [:])
   fi