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.11 2001/01/20 12:03:08 mdw Exp $
dnl
dnl Common library of autoconf macros
dnl
dnl----- Revision history ---------------------------------------------------
dnl
dnl $Log: aclocal.glob,v $
+dnl Revision 1.11 2001/01/20 12:03:08 mdw
+dnl Remove redundant stuff.
+dnl
+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.
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.11 2001/01/20 12:03:08 mdw Exp $
-dnl --- *@-AC_PROG_CC_STDC-@* ---
+dnl --- *@-AM_PROG_CC_STDC-@* ---
dnl
dnl Author: Franc,ois Pinard
dnl
-dnl Synopsis: AC_PROG_CC_STDC
+dnl Synopsis: AM_PROG_CC_STDC
dnl
dnl Arguments: ---
dnl
# serial 1
AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AM_PROG_INSTALL])
+[AC_REQUIRE([AC_PROG_INSTALL])
PACKAGE=[$1]
AC_SUBST(PACKAGE)
VERSION=[$2]
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)
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])
-
-dnl --- *@-AM_PROG_INSTALL-@* ---
-dnl
-dnl Author: Franc,ois Pinard
-dnl
-dnl Synopsis: AM_PROG_INSTALL
-dnl
-dnl Arguments: ---
-dnl
-dnl Use: Calls `AC_PROG_INSTALL' to find an installer. Then it sets
-dnl `INSTALL_SCRIPT' to a suitable value if necessary.
-
-# serial 1
-
-AC_DEFUN(AM_PROG_INSTALL,
-[AC_PROG_INSTALL
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 755'
-AC_SUBST(INSTALL_SCRIPT)dnl
-])
+AC_REQUIRE([AC_PROG_MAKE_SET])])
dnl --- *@-AM_PROG_LEX-@* ---
dnl
# serial 1
AC_DEFUN(fp_C_PROTOTYPES,
-[AC_REQUIRE([fp_PROG_CC_STDC])
+[AC_REQUIRE([AM_PROG_CC_STDC])
AC_MSG_CHECKING([for function prototypes])
if test "$ac_cv_prog_cc_stdc" != no; then
AC_MSG_RESULT(yes)
{
/* Under Solaris 2.4, strtod returns the wrong value for the
terminating character under some conditions. */
-
-## @defmac AC_FUNC_STRTOD
-## @maindex FUNC_STRTOD
-## @ovindex LIBOBJS
-## If the @code{strtod} function is not available, or does not work
-## correctly (like the one on SunOS 5.4), add @samp{strtod.o} to output
-## variable @code{LIBOBJS}.
-## @end defmac
-
-AC_DEFUN(AM_FUNC_STRTOD,
-[AC_CACHE_CHECK(for working strtod, am_cv_func_strtod,
-[AC_TRY_RUN([
-double strtod ();
-int
-main()
-{
- {
- /* Some versions of Linux strtod mis-parse strings with leading '+'. */
- char *string = " +69";
- char *term;
- double value;
- value = strtod (string, &term);
- if (value != 69 || term != (string + 4))
- exit (1);
- }
-
- {
- /* Under Solaris 2.4, strtod returns the wrong value for the
- terminating character under some conditions. */
char *string = "NaN";
char *term;
strtod (string, &term);
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
[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