Changeset 117731 for trunk/base

Timestamp:

Mar 9, 2014, 11:06:51 PM (10 years ago)

Author:

jmr@…

Message:

avoid non-portable test operand as per autoconf manual

Location:

trunk/base

Files:

• aclocal.m4 (modified) (1 diff)
• configure (modified) (3 diffs)

trunk/base/aclocal.m4

@@ -127 +127 @@
         cd "$ac_dir"
 
-        if test "$no_recursion" != yes -o ! -f "$ac_srcdir/config.status"; then
+        if test "$no_recursion" != yes || test ! -f "$ac_srcdir/config.status"; then
                 AC_MSG_NOTICE([=== configuring in $ac_dir ($mp_popdir/$ac_dir)])
                 if test -f "$ac_srcdir/configure"; then

trunk/base/configure

@@ -9537 +9537 @@
         cd "$ac_dir"
 
-        if test "$no_recursion" != yes -o ! -f "$ac_srcdir/config.status"; then
+        if test "$no_recursion" != yes || test ! -f "$ac_srcdir/config.status"; then
                 { $as_echo "$as_me:${as_lineno-$LINENO}: === configuring in $ac_dir ($mp_popdir/$ac_dir)" >&5
 $as_echo "$as_me: === configuring in $ac_dir ($mp_popdir/$ac_dir)" >&6;}
@@ -9855 +9855 @@
         cd "$ac_dir"
 
-        if test "$no_recursion" != yes -o ! -f "$ac_srcdir/config.status"; then
+        if test "$no_recursion" != yes || test ! -f "$ac_srcdir/config.status"; then
                 { $as_echo "$as_me:${as_lineno-$LINENO}: === configuring in $ac_dir ($mp_popdir/$ac_dir)" >&5
 $as_echo "$as_me: === configuring in $ac_dir ($mp_popdir/$ac_dir)" >&6;}
@@ -10170 +10170 @@
         cd "$ac_dir"
 
-        if test "$no_recursion" != yes -o ! -f "$ac_srcdir/config.status"; then
+        if test "$no_recursion" != yes || test ! -f "$ac_srcdir/config.status"; then
                 { $as_echo "$as_me:${as_lineno-$LINENO}: === configuring in $ac_dir ($mp_popdir/$ac_dir)" >&5
 $as_echo "$as_me: === configuring in $ac_dir ($mp_popdir/$ac_dir)" >&6;}