From 773e9ed0a3e9a13f2dbc93f276138a18c515613b Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Sat, 25 Mar 2000 09:07:37 +0000
Subject: [PATCH] * acgeneral.m4 (AC_CHECK_LIB): Ah ah!  I recognized you, even
 masked: you are AC_TRY_LINK_FUNC. Fix quotation. (AC_SEARCH_LIBS): Use
 AC_SHELL_IFELSE.

---
 ChangeLog               |  7 +++++++
 acgeneral.m4            | 31 ++++++++++---------------------
 lib/autoconf/general.m4 | 31 ++++++++++---------------------
 3 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5d9ed3f2..4ce07627 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-03-25  Akim Demaille  <akim@epita.fr>
+
+	* acgeneral.m4 (AC_CHECK_LIB): Ah ah!  I recognized you, even
+	masked: you are AC_TRY_LINK_FUNC.
+	Fix quotation.
+	(AC_SEARCH_LIBS): Use AC_SHELL_IFELSE.
+
 2000-03-25  Akim Demaille  <akim@epita.fr>
 
 	* tests/semantics.m4 (AC_TRY_LINK_FUNC, AC_CHECK_LIB): New tests.
diff --git a/acgeneral.m4 b/acgeneral.m4
index e67928d3..595a37e6 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2770,12 +2770,11 @@ AC_TRY_LINK_FUNC([$1],
 break])
 done
 LIBS="$ac_func_search_save_LIBS"])
-if test "$ac_cv_search_$1" != "no"; then
-  test "$ac_cv_search_$1" = "none required" || LIBS="$ac_cv_search_$1 $LIBS"
-  $3
-else :
-  $4
-fi])
+AC_SHELL_IFELSE([test "$ac_cv_search_$1" != "no"],
+  [test "$ac_cv_search_$1" = "none required" || LIBS="$ac_cv_search_$1 $LIBS"
+  $3],
+                [$4])[]dnl
+])
 
 
 
@@ -2797,25 +2796,15 @@ AC_DEFUN(AC_CHECK_LIB,
 AC_CACHE_CHECK([for $2 in -l$1], ac_Lib,
 [ac_save_LIBS="$LIBS"
 LIBS="-l$1 $5 $LIBS"
-AC_TRY_LINK(dnl
-AC_LANG_CASE([FORTRAN77], ,
-[ifelse([$2], [main], , dnl Avoid conflicting decl of main.
-[/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $2();
-])]),
-[$2()],
-AC_VAR_SET(ac_Lib, yes), AC_VAR_SET(ac_Lib, no))
+AC_TRY_LINK_FUNC([$2],
+                 [AC_VAR_SET(ac_Lib, yes)],
+                 [AC_VAR_SET(ac_Lib, no)])
 LIBS="$ac_save_LIBS"])
 AC_SHELL_IFELSE([test AC_VAR_GET(ac_Lib) = yes],
-                m4_default([$3],
+                [m4_default([$3],
                            [AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_LIB$1))
   LIBS="-l$1 $LIBS"
-]),
+])],
                 [$4])dnl
 AC_VAR_POPDEF([ac_Lib])dnl
 ])# AC_CHECK_LIB
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index e67928d3..595a37e6 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2770,12 +2770,11 @@ AC_TRY_LINK_FUNC([$1],
 break])
 done
 LIBS="$ac_func_search_save_LIBS"])
-if test "$ac_cv_search_$1" != "no"; then
-  test "$ac_cv_search_$1" = "none required" || LIBS="$ac_cv_search_$1 $LIBS"
-  $3
-else :
-  $4
-fi])
+AC_SHELL_IFELSE([test "$ac_cv_search_$1" != "no"],
+  [test "$ac_cv_search_$1" = "none required" || LIBS="$ac_cv_search_$1 $LIBS"
+  $3],
+                [$4])[]dnl
+])
 
 
 
@@ -2797,25 +2796,15 @@ AC_DEFUN(AC_CHECK_LIB,
 AC_CACHE_CHECK([for $2 in -l$1], ac_Lib,
 [ac_save_LIBS="$LIBS"
 LIBS="-l$1 $5 $LIBS"
-AC_TRY_LINK(dnl
-AC_LANG_CASE([FORTRAN77], ,
-[ifelse([$2], [main], , dnl Avoid conflicting decl of main.
-[/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $2();
-])]),
-[$2()],
-AC_VAR_SET(ac_Lib, yes), AC_VAR_SET(ac_Lib, no))
+AC_TRY_LINK_FUNC([$2],
+                 [AC_VAR_SET(ac_Lib, yes)],
+                 [AC_VAR_SET(ac_Lib, no)])
 LIBS="$ac_save_LIBS"])
 AC_SHELL_IFELSE([test AC_VAR_GET(ac_Lib) = yes],
-                m4_default([$3],
+                [m4_default([$3],
                            [AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_LIB$1))
   LIBS="-l$1 $LIBS"
-]),
+])],
                 [$4])dnl
 AC_VAR_POPDEF([ac_Lib])dnl
 ])# AC_CHECK_LIB