From: Akim Demaille Date: Sat, 19 May 2001 17:33:19 +0000 (+0000) Subject: * acgeneral.m4 (AC_SEARCH_LIBS): Unobfuscate. X-Git-Tag: autoconf-2.50~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10f740b057a876ab7486f64ba9dfe60ee2bb2abd;p=thirdparty%2Fautoconf.git * acgeneral.m4 (AC_SEARCH_LIBS): Unobfuscate. --- diff --git a/ChangeLog b/ChangeLog index 55c754faf..344984492 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-05-19 Akim Demaille + + * acgeneral.m4 (AC_SEARCH_LIBS): Unobfuscate. + 2001-05-19 Akim Demaille * autoconf.sh: s/undefined macro/possibly undefined macro/. diff --git a/acgeneral.m4 b/acgeneral.m4 index 6c5396709..0d8c76009 100644 --- 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 6c5396709..0d8c76009 100644 --- 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"