* acgeneral.m4 (AC_CHECK_LIB): only call AH_CHECK_LIB if

ACTION-IF-TRUE is not given.
(AH_CHECK_LIB): related comment changes.

diff --git a/ChangeLog b/ChangeLog
index 1f9090b8c694c318a4a14dbf7bced96a0b3a5fb2..fba49b2cb39a4f81c44df237bf471c96dffd51ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-27  Pavel Roskin  <proski@gnu.org>
+
+       * acgeneral.m4 (AC_CHECK_LIB): only call AH_CHECK_LIB if
+       ACTION-IF-TRUE is not given.
+       (AH_CHECK_LIB): related comment changes.
+
 2000-09-27  Pavel Roskin  <proski@gnu.org>
 
        * aclang.m4 (_AC_LANG_COMPILER_WORKS): Remove []dnl because it

diff --git a/acgeneral.m4 b/acgeneral.m4
index 532b3423170254535030c28804189c0ffe3ac0d6..01a85da660edf403eb6d109521e2d549ab7653b4 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -3237,7 +3237,7 @@ AC_SHELL_IFELSE([test "$ac_cv_search_$1" != no],
 # And ``ac_save_LIBS' is too tempting a name, so let's leave them some
 # freedom.
 AC_DEFUN([AC_CHECK_LIB],
-[AH_CHECK_LIB([$1])dnl
+[ifval([$3], , [AH_CHECK_LIB([$1])])dnl
 AC_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$2])dnl
 AC_ARG_VAR([LDFLAGS], [linker flags, e.g. -L<lib dir> if you have libraries in a nonstandard directory <lib dir>])
 AC_CACHE_CHECK([for $2 in -l$1], ac_Lib,
@@ -3259,8 +3259,6 @@ AC_VAR_POPDEF([ac_Lib])dnl
 
 # AH_CHECK_LIB(LIBNAME)
 # ---------------------
-# FIXME: To be rigorous, this should not be systematic: depending
-# upon the arguments of AC_CHECK_LIB, we might not AC_DEFINE.
 define([AH_CHECK_LIB],
 [AH_TEMPLATE(AC_TR_CPP(HAVE_LIB$1),
              [Define if you have the `]$1[' library (-l]$1[).])])

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 532b3423170254535030c28804189c0ffe3ac0d6..01a85da660edf403eb6d109521e2d549ab7653b4 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -3237,7 +3237,7 @@ AC_SHELL_IFELSE([test "$ac_cv_search_$1" != no],
 # And ``ac_save_LIBS' is too tempting a name, so let's leave them some
 # freedom.
 AC_DEFUN([AC_CHECK_LIB],
-[AH_CHECK_LIB([$1])dnl
+[ifval([$3], , [AH_CHECK_LIB([$1])])dnl
 AC_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$2])dnl
 AC_ARG_VAR([LDFLAGS], [linker flags, e.g. -L<lib dir> if you have libraries in a nonstandard directory <lib dir>])
 AC_CACHE_CHECK([for $2 in -l$1], ac_Lib,
@@ -3259,8 +3259,6 @@ AC_VAR_POPDEF([ac_Lib])dnl
 
 # AH_CHECK_LIB(LIBNAME)
 # ---------------------
-# FIXME: To be rigorous, this should not be systematic: depending
-# upon the arguments of AC_CHECK_LIB, we might not AC_DEFINE.
 define([AH_CHECK_LIB],
 [AH_TEMPLATE(AC_TR_CPP(HAVE_LIB$1),
              [Define if you have the `]$1[' library (-l]$1[).])])