* acgeneral.m4 (AC_SEARCH_LIBS): Unobfuscate.

diff --git a/ChangeLog b/ChangeLog
index 55c754faf514300687b8d95db1fafab7d4b09e41..344984492c098140e9e3b333f5c37b09d63dded3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-19  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (AC_SEARCH_LIBS): Unobfuscate.
+
 2001-05-19  Akim Demaille  <akim@epita.fr>
 
        * autoconf.sh: s/undefined macro/possibly undefined macro/.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 6c5396709c33065bf44714aa25a7d0a7cc7f9a20..0d8c76009e2b1cf96cb325bddeaa0e3a7755ee9e 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2623,12 +2623,14 @@ AC_DEFUN([AC_SEARCH_LIBS],
 [ac_func_search_save_LIBS=$LIBS
 ac_cv_search_$1=no
 AC_TRY_LINK_FUNC([$1], [ac_cv_search_$1="none required"])
-test "$ac_cv_search_$1" = no && for ac_lib in $2; do
-LIBS="-l$ac_lib $5 $ac_func_search_save_LIBS"
-AC_TRY_LINK_FUNC([$1],
-[ac_cv_search_$1="-l$ac_lib"
+if test "$ac_cv_search_$1" = no; then
+  for ac_lib in $2; do
+    LIBS="-l$ac_lib $5 $ac_func_search_save_LIBS"
+    AC_TRY_LINK_FUNC([$1],
+                     [ac_cv_search_$1="-l$ac_lib"
 break])
-done
+  done
+fi
 LIBS=$ac_func_search_save_LIBS])
 AS_IF([test "$ac_cv_search_$1" != no],
   [test "$ac_cv_search_$1" = "none required" || LIBS="$ac_cv_search_$1 $LIBS"

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 6c5396709c33065bf44714aa25a7d0a7cc7f9a20..0d8c76009e2b1cf96cb325bddeaa0e3a7755ee9e 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2623,12 +2623,14 @@ AC_DEFUN([AC_SEARCH_LIBS],
 [ac_func_search_save_LIBS=$LIBS
 ac_cv_search_$1=no
 AC_TRY_LINK_FUNC([$1], [ac_cv_search_$1="none required"])
-test "$ac_cv_search_$1" = no && for ac_lib in $2; do
-LIBS="-l$ac_lib $5 $ac_func_search_save_LIBS"
-AC_TRY_LINK_FUNC([$1],
-[ac_cv_search_$1="-l$ac_lib"
+if test "$ac_cv_search_$1" = no; then
+  for ac_lib in $2; do
+    LIBS="-l$ac_lib $5 $ac_func_search_save_LIBS"
+    AC_TRY_LINK_FUNC([$1],
+                     [ac_cv_search_$1="-l$ac_lib"
 break])
-done
+  done
+fi
 LIBS=$ac_func_search_save_LIBS])
 AS_IF([test "$ac_cv_search_$1" != no],
   [test "$ac_cv_search_$1" = "none required" || LIBS="$ac_cv_search_$1 $LIBS"