1998-10-08 Ben Elliston <bje@cygnus.com>

	* acgeneral.m4 (AC_TRY_LINK_FUNC): Fix macro ordering.

diff --git a/ChangeLog b/ChangeLog
index d22494fcdee360f6be9904c20c0f2a37bc514a64..32911549c332d978ec83ee7fc588810cb5432188 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1998-10-08  Ben Elliston  <bje@cygnus.com>
+
+       * acgeneral.m4 (AC_TRY_LINK_FUNC): Fix macro ordering.
+
 1998-10-03  Ben Elliston  <bje@cygnus.com>
 
        * acconfig.h (FC_NO_MINUS_C_MINUS_O): Add to complete the Fortran

diff --git a/acgeneral.m4 b/acgeneral.m4
index 61ad88cbc23d318a231964b871cb6f54f00ca66e..e3319b5b2de6f5fe443fdfcacf196e071977590b 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1527,6 +1527,28 @@ rm -fr conftest*])
 dnl ### Checking for libraries
 
 
+dnl AC_TRY_LINK_FUNC(func, action-if-found, action-if-not-found)
+dnl Try to link a program that calls FUNC, handling GCC builtins.  If
+dnl the link succeeds, execute ACTION-IF-FOUND; otherwise, execute
+dnl ACTION-IF-NOT-FOUND.
+
+AC_DEFUN(AC_TRY_LINK_FUNC,
+AC_TRY_LINK(dnl
+ifelse([$2], [main], , dnl Avoid conflicting decl of main.
+[/* Override any gcc2 internal prototype to avoid an error.  */
+]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
+extern "C"
+#endif
+])dnl
+[/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $1();
+]),
+[$1()],
+[$2],
+[$3]))
+
+
 dnl AC_SEARCH_LIBS(func, searchlibs, [action-if-found], [action-if-not-found])
 dnl Search for a library defining FUNC, if it's not already available.
 
@@ -1770,27 +1792,6 @@ ifelse([$4], , , [  rm -rf conftest*
 fi
 rm -f conftest*])
 
-dnl AC_TRY_LINK_FUNC(func, action-if-found, action-if-not-found)
-dnl Try to link a program that calls FUNC, handling GCC builtins.  If
-dnl the link succeeds, execute ACTION-IF-FOUND; otherwise, execute
-dnl ACTION-IF-NOT-FOUND.
-
-AC_DEFUN(AC_TRY_LINK_FUNC,
-AC_TRY_LINK(dnl
-ifelse([$2], [main], , dnl Avoid conflicting decl of main.
-[/* Override any gcc2 internal prototype to avoid an error.  */
-]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
-extern "C"
-#endif
-])dnl
-[/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $1();
-]),
-[$1()],
-[$2],
-[$3]))
-
 
 dnl ### Checking for run-time features
 

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 61ad88cbc23d318a231964b871cb6f54f00ca66e..e3319b5b2de6f5fe443fdfcacf196e071977590b 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1527,6 +1527,28 @@ rm -fr conftest*])
 dnl ### Checking for libraries
 
 
+dnl AC_TRY_LINK_FUNC(func, action-if-found, action-if-not-found)
+dnl Try to link a program that calls FUNC, handling GCC builtins.  If
+dnl the link succeeds, execute ACTION-IF-FOUND; otherwise, execute
+dnl ACTION-IF-NOT-FOUND.
+
+AC_DEFUN(AC_TRY_LINK_FUNC,
+AC_TRY_LINK(dnl
+ifelse([$2], [main], , dnl Avoid conflicting decl of main.
+[/* Override any gcc2 internal prototype to avoid an error.  */
+]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
+extern "C"
+#endif
+])dnl
+[/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $1();
+]),
+[$1()],
+[$2],
+[$3]))
+
+
 dnl AC_SEARCH_LIBS(func, searchlibs, [action-if-found], [action-if-not-found])
 dnl Search for a library defining FUNC, if it's not already available.
 
@@ -1770,27 +1792,6 @@ ifelse([$4], , , [  rm -rf conftest*
 fi
 rm -f conftest*])
 
-dnl AC_TRY_LINK_FUNC(func, action-if-found, action-if-not-found)
-dnl Try to link a program that calls FUNC, handling GCC builtins.  If
-dnl the link succeeds, execute ACTION-IF-FOUND; otherwise, execute
-dnl ACTION-IF-NOT-FOUND.
-
-AC_DEFUN(AC_TRY_LINK_FUNC,
-AC_TRY_LINK(dnl
-ifelse([$2], [main], , dnl Avoid conflicting decl of main.
-[/* Override any gcc2 internal prototype to avoid an error.  */
-]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
-extern "C"
-#endif
-])dnl
-[/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $1();
-]),
-[$1()],
-[$2],
-[$3]))
-
 
 dnl ### Checking for run-time features