Wed Mar 6 14:38:31 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>

	* acgeneral.m4 (AC_CHECK_LIB): Use a cache variable name containing
	both the library and function name.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 96393e10d60698f04a6178a14dfc287601d7d711..59fa4cdb2b67ea85ea8ba0f1147ed4cee88c985e 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1404,9 +1404,11 @@ dnl AC_CHECK_LIB(LIBRARY, FUNCTION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
 dnl              [, OTHER-LIBRARIES]]])
 AC_DEFUN(AC_CHECK_LIB,
 [AC_MSG_CHECKING([for -l$1])
-changequote(, )dnl
-ac_lib_var=`echo $1 | tr '.-/+' '___p'`
-changequote([, ])dnl
+dnl Use a cache variable name containing both the library and function name,
+dnl because the test really is for library $1 defining function $2, not
+dnl just for library $1.  Separate tests with the same $1 and different $2s
+dnl may have different results.
+ac_lib_var=`echo $1[_]$2 | tr '.-/+' '___p'`
 AC_CACHE_VAL(ac_cv_lib_$ac_lib_var,
 [ac_save_LIBS="$LIBS"
 LIBS="-l$1 $5 $LIBS"

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 96393e10d60698f04a6178a14dfc287601d7d711..59fa4cdb2b67ea85ea8ba0f1147ed4cee88c985e 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1404,9 +1404,11 @@ dnl AC_CHECK_LIB(LIBRARY, FUNCTION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
 dnl              [, OTHER-LIBRARIES]]])
 AC_DEFUN(AC_CHECK_LIB,
 [AC_MSG_CHECKING([for -l$1])
-changequote(, )dnl
-ac_lib_var=`echo $1 | tr '.-/+' '___p'`
-changequote([, ])dnl
+dnl Use a cache variable name containing both the library and function name,
+dnl because the test really is for library $1 defining function $2, not
+dnl just for library $1.  Separate tests with the same $1 and different $2s
+dnl may have different results.
+ac_lib_var=`echo $1[_]$2 | tr '.-/+' '___p'`
 AC_CACHE_VAL(ac_cv_lib_$ac_lib_var,
 [ac_save_LIBS="$LIBS"
 LIBS="-l$1 $5 $LIBS"