* aclang.m4 (AC_F77_LIBRARY_LDFLAGS): Less adventurous use of

`test'.
Fixes Autoconf/108.

diff --git a/ChangeLog b/ChangeLog
index f40a0b0eecabc8edd3763fa6c1f1bb0338caaa37..ed8632c51507ae201af51237fa8bf4c623007844 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-11  Akim Demaille  <akim@epita.fr>
+
+       * aclang.m4 (AC_F77_LIBRARY_LDFLAGS): Less adventurous use of
+       `test'.
+       Fixes Autoconf/108.
+
 2000-05-11  Akim Demaille  <akim@epita.fr>
 
        * doc/autoconf.texi (Particular Headers): Some more sorting.

diff --git a/aclang.m4 b/aclang.m4
index 92e74c5a9356af76159735f014a721cee864c9ab..ae4c90af7f831a2b70768a28ab21c2c53bff6f3f 100644 (file)
--- a/aclang.m4
+++ b/aclang.m4
@@ -1241,7 +1241,7 @@ AC_LANG_RESTORE()dnl
 FLIBS=
 
 # If we are using xlf then replace all the commas with spaces.
-if test `echo $ac_link_output | grep xlfentry >/dev/null 2>&1`; then
+if echo $ac_link_output | grep xlfentry >/dev/null 2>&1; then
   ac_link_output=`echo $ac_link_output | sed 's/,/ /g'`
 fi
 
@@ -1266,7 +1266,7 @@ for ac_arg in $ac_link_output; do
   # reset AC_PREVIOUS_ARG so that we don't try and process AC_ARG as
   # an argument.
   ac_previous_arg=$ac_save_arg
-  test -n "`echo $ac_arg | sed -n -e '/^-/!p'`" && ac_previous_arg=
+  echo $ac_arg | grep '^[^-]' >/dev/null 2>&1 && ac_previous_arg=
   case "$ac_previous_arg" in
     '')
       case "$ac_arg" in
@@ -1324,7 +1324,7 @@ for ac_arg in $ac_link_output; do
   esac
 
   # If "ac_arg" has survived up until this point, then put it in FLIBS.
-  test -n "$ac_arg" && FLIBS="$FLIBS $ac_arg"
+  test "x$ac_arg" != x && FLIBS="$FLIBS $ac_arg"
 done
 
 # Assumption: We only see "LD_RUN_PATH" on Solaris systems.  If this
@@ -1332,7 +1332,7 @@ done
 # path (i.e. it must begin with a "/").
 ac_ld_run_path=`echo $ac_link_output |
                 sed -n -e 's%^.*LD_RUN_PATH *= *\(/[[^ ]]*\).*$%\1%p'`
-test -n "$ac_ld_run_path" && FLIBS="$ac_ld_run_path $FLIBS"
+test "x$ac_ld_run_path" != x && FLIBS="$ac_ld_run_path $FLIBS"
 
 ac_cv_flibs=$FLIBS
 ])

diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index 92e74c5a9356af76159735f014a721cee864c9ab..ae4c90af7f831a2b70768a28ab21c2c53bff6f3f 100644 (file)
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -1241,7 +1241,7 @@ AC_LANG_RESTORE()dnl
 FLIBS=
 
 # If we are using xlf then replace all the commas with spaces.
-if test `echo $ac_link_output | grep xlfentry >/dev/null 2>&1`; then
+if echo $ac_link_output | grep xlfentry >/dev/null 2>&1; then
   ac_link_output=`echo $ac_link_output | sed 's/,/ /g'`
 fi
 
@@ -1266,7 +1266,7 @@ for ac_arg in $ac_link_output; do
   # reset AC_PREVIOUS_ARG so that we don't try and process AC_ARG as
   # an argument.
   ac_previous_arg=$ac_save_arg
-  test -n "`echo $ac_arg | sed -n -e '/^-/!p'`" && ac_previous_arg=
+  echo $ac_arg | grep '^[^-]' >/dev/null 2>&1 && ac_previous_arg=
   case "$ac_previous_arg" in
     '')
       case "$ac_arg" in
@@ -1324,7 +1324,7 @@ for ac_arg in $ac_link_output; do
   esac
 
   # If "ac_arg" has survived up until this point, then put it in FLIBS.
-  test -n "$ac_arg" && FLIBS="$FLIBS $ac_arg"
+  test "x$ac_arg" != x && FLIBS="$FLIBS $ac_arg"
 done
 
 # Assumption: We only see "LD_RUN_PATH" on Solaris systems.  If this
@@ -1332,7 +1332,7 @@ done
 # path (i.e. it must begin with a "/").
 ac_ld_run_path=`echo $ac_link_output |
                 sed -n -e 's%^.*LD_RUN_PATH *= *\(/[[^ ]]*\).*$%\1%p'`
-test -n "$ac_ld_run_path" && FLIBS="$ac_ld_run_path $FLIBS"
+test "x$ac_ld_run_path" != x && FLIBS="$ac_ld_run_path $FLIBS"
 
 ac_cv_flibs=$FLIBS
 ])

diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index 92e74c5a9356af76159735f014a721cee864c9ab..ae4c90af7f831a2b70768a28ab21c2c53bff6f3f 100644 (file)
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -1241,7 +1241,7 @@ AC_LANG_RESTORE()dnl
 FLIBS=
 
 # If we are using xlf then replace all the commas with spaces.
-if test `echo $ac_link_output | grep xlfentry >/dev/null 2>&1`; then
+if echo $ac_link_output | grep xlfentry >/dev/null 2>&1; then
   ac_link_output=`echo $ac_link_output | sed 's/,/ /g'`
 fi
 
@@ -1266,7 +1266,7 @@ for ac_arg in $ac_link_output; do
   # reset AC_PREVIOUS_ARG so that we don't try and process AC_ARG as
   # an argument.
   ac_previous_arg=$ac_save_arg
-  test -n "`echo $ac_arg | sed -n -e '/^-/!p'`" && ac_previous_arg=
+  echo $ac_arg | grep '^[^-]' >/dev/null 2>&1 && ac_previous_arg=
   case "$ac_previous_arg" in
     '')
       case "$ac_arg" in
@@ -1324,7 +1324,7 @@ for ac_arg in $ac_link_output; do
   esac
 
   # If "ac_arg" has survived up until this point, then put it in FLIBS.
-  test -n "$ac_arg" && FLIBS="$FLIBS $ac_arg"
+  test "x$ac_arg" != x && FLIBS="$FLIBS $ac_arg"
 done
 
 # Assumption: We only see "LD_RUN_PATH" on Solaris systems.  If this
@@ -1332,7 +1332,7 @@ done
 # path (i.e. it must begin with a "/").
 ac_ld_run_path=`echo $ac_link_output |
                 sed -n -e 's%^.*LD_RUN_PATH *= *\(/[[^ ]]*\).*$%\1%p'`
-test -n "$ac_ld_run_path" && FLIBS="$ac_ld_run_path $FLIBS"
+test "x$ac_ld_run_path" != x && FLIBS="$ac_ld_run_path $FLIBS"
 
 ac_cv_flibs=$FLIBS
 ])

diff --git a/lib/autoconf/lang.m4 b/lib/autoconf/lang.m4
index 92e74c5a9356af76159735f014a721cee864c9ab..ae4c90af7f831a2b70768a28ab21c2c53bff6f3f 100644 (file)
--- a/lib/autoconf/lang.m4
+++ b/lib/autoconf/lang.m4
@@ -1241,7 +1241,7 @@ AC_LANG_RESTORE()dnl
 FLIBS=
 
 # If we are using xlf then replace all the commas with spaces.
-if test `echo $ac_link_output | grep xlfentry >/dev/null 2>&1`; then
+if echo $ac_link_output | grep xlfentry >/dev/null 2>&1; then
   ac_link_output=`echo $ac_link_output | sed 's/,/ /g'`
 fi
 
@@ -1266,7 +1266,7 @@ for ac_arg in $ac_link_output; do
   # reset AC_PREVIOUS_ARG so that we don't try and process AC_ARG as
   # an argument.
   ac_previous_arg=$ac_save_arg
-  test -n "`echo $ac_arg | sed -n -e '/^-/!p'`" && ac_previous_arg=
+  echo $ac_arg | grep '^[^-]' >/dev/null 2>&1 && ac_previous_arg=
   case "$ac_previous_arg" in
     '')
       case "$ac_arg" in
@@ -1324,7 +1324,7 @@ for ac_arg in $ac_link_output; do
   esac
 
   # If "ac_arg" has survived up until this point, then put it in FLIBS.
-  test -n "$ac_arg" && FLIBS="$FLIBS $ac_arg"
+  test "x$ac_arg" != x && FLIBS="$FLIBS $ac_arg"
 done
 
 # Assumption: We only see "LD_RUN_PATH" on Solaris systems.  If this
@@ -1332,7 +1332,7 @@ done
 # path (i.e. it must begin with a "/").
 ac_ld_run_path=`echo $ac_link_output |
                 sed -n -e 's%^.*LD_RUN_PATH *= *\(/[[^ ]]*\).*$%\1%p'`
-test -n "$ac_ld_run_path" && FLIBS="$ac_ld_run_path $FLIBS"
+test "x$ac_ld_run_path" != x && FLIBS="$ac_ld_run_path $FLIBS"
 
 ac_cv_flibs=$FLIBS
 ])