Fixes from upstream.

diff --git a/aclocal.glob b/aclocal.glob
index 311768e..8cacec8 100644 (file)
--- a/aclocal.glob
+++ b/aclocal.glob
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-                                    *@--GLOB-HEADER--@*
 dnl
-dnl $Id: aclocal.glob,v 1.9 2000/08/15 21:37:49 mdw Exp $
+dnl $Id: aclocal.glob,v 1.10 2000/10/14 16:32:15 mdw Exp $
 dnl
 dnl Common library of autoconf macros
 dnl
@@ -28,6 +28,9 @@ dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 dnl----- Revision history ---------------------------------------------------
 dnl
 dnl $Log: aclocal.glob,v $
+dnl Revision 1.10  2000/10/14 16:32:15  mdw
+dnl Fixes from upstream.
+dnl
 dnl Revision 1.9  2000/08/15 21:37:49  mdw
 dnl New initialization macro for libraries, and a new base client macro for
 dnl finding libraries with an appropriate version.
@@ -59,7 +62,7 @@ dnl
 
 dnl----- Common files distribution --------------------------- *@--NOTICE--@*
 dnl
-dnl $Id: aclocal.glob,v 1.9 2000/08/15 21:37:49 mdw Exp $
+dnl $Id: aclocal.glob,v 1.10 2000/10/14 16:32:15 mdw Exp $
 
 dnl --- *@-AC_PROG_CC_STDC-@* ---
 dnl
@@ -310,7 +313,7 @@ dnl         certain things.  But this isn't really a big deal.
 # serial 1
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AM_PROG_INSTALL])
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -322,8 +325,8 @@ fi
 ifelse([$3],,
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
-AM_SANITY_CHECK
-AC_ARG_PROGRAM
+AC_REQUIRE([AM_SANITY_CHECK])
+AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
 AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
@@ -331,7 +334,7 @@ AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
 AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_PROG_MAKE_SET])
+AC_REQUIRE([AC_PROG_MAKE_SET])])
 
 dnl --- *@-AM_PROG_INSTALL-@* ---
 dnl
@@ -1174,12 +1177,15 @@ dnl --- *@-mdw_CHECK_MANYLIBS-@* ---
 dnl
 dnl Author:    Mark Wooding
 dnl
-dnl Synopsis:  mdw_CHECK_MANYLIBS(FUNC, LIBS, [IF-FOUND], [IF-NOT-FOUND])
+dnl Synopsis:  mdw_CHECK_MANYLIBS(FUNC, LIBS, [IF-FOUND], [IF-NOT-FOUND],
+dnl                    [INCLUDES], [ARGS])
 dnl
 dnl Arguments: FUNC = a function to try to find
 dnl            LIBS = a whitespace-separated list of libraries to search
 dnl            IF-FOUND = what to do when the function is found
 dnl            IF-NOT-FOUND = what to do when the function isn't found
+dnl            INCLUDES = other include files to add
+dnl            ARGS = arguments to pass the function
 dnl
 dnl Use:       Searches for a library which defines FUNC.  It first tries
 dnl            without any libraries; then it tries each library specified
@@ -1194,10 +1200,10 @@ AC_DEFUN(mdw_CHECK_MANYLIBS,
 [AC_CACHE_CHECK([for library containing $1], [mdw_cv_lib_$1],
 [mdw_save_LIBS="$LIBS"
 mdw_cv_lib_$1="no"
-AC_TRY_LINK(,[$1()], [mdw_cv_lib_$1="none required"])
+AC_TRY_LINK([$5], [$1($6)], [mdw_cv_lib_$1="none required"])
 test "$mdw_cv_lib_$1" = "no" && for i in $2; do
 LIBS="-l$i $mdw_save_LIBS"
-AC_TRY_LINK(,[$1()],
+AC_TRY_LINK([$5], [$1($6)],
 [mdw_cv_lib_$1="-l$i"
 break])
 done