dnl -*-fundamental-*- *@--GLOB-HEADER--@*
dnl
-dnl $Id: aclocal.glob,v 1.3 1999/07/17 10:27:44 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
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.
+dnl
+dnl Revision 1.8 1999/11/26 01:23:17 mdw
+dnl And support for MXD (not yet released).
+dnl
+dnl Revision 1.7 1999/11/11 20:03:58 mdw
+dnl Add support for mgLib too.
+dnl
+dnl Revision 1.6 1999/11/11 17:49:33 mdw
+dnl New macros for configuring clients of mLib and Catacomb.
+dnl
+dnl Revision 1.5 1999/07/27 18:27:37 mdw
+dnl Fix typo in header line for mdw_DECL_ENVIRON.
+dnl
+dnl Revision 1.4 1999/07/26 23:44:32 mdw
+dnl Reorder and tidy documentation.
+dnl
dnl Revision 1.3 1999/07/17 10:27:44 mdw
dnl More useful macros added.
dnl
dnl----- Common files distribution --------------------------- *@--NOTICE--@*
dnl
-dnl $Id: aclocal.glob,v 1.3 1999/07/17 10:27:44 mdw Exp $
+dnl $Id: aclocal.glob,v 1.10 2000/10/14 16:32:15 mdw Exp $
dnl --- *@-AC_PROG_CC_STDC-@* ---
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])
+AC_REQUIRE([AC_PROG_MAKE_SET])])
dnl --- *@-AM_PROG_INSTALL-@* ---
dnl
dnl----- Macros by Mark Wooding ------------------------------ *@--IGNORE--@*
-dnl --- *@-mdw_DECL_ENVIRON-@* ---
+dnl --- *@-mdw_REQUIRE-@* ---
dnl
dnl Author: Mark Wooding
dnl
-dnl Synopsis: mdw_DECL_ENVIRON
+dnl Synopsis: mdw_REQUIRE(MACRO, ARGS...)
dnl
-dnl Arguments: ---
+dnl Arguments: MACRO = name of a macro which should have been called
+dnl ARGS = arguments to pass
dnl
-dnl Use: If the global variable `environ' is declared anywhere
-dnl `obvious', then define the preprocessor symbol DECL_ENVIRON.
+dnl Use: Like `AC_REQUIRE', only it handles arguments.
-AC_DEFUN(mdw_DECL_ENVIRON,
-[AC_CHECK_HEADERS([unistd.h])
-AC_CACHE_CHECK([for declaration of \`environ'], sw_cv_environ,
-[AC_EGREP_CPP(environ,
-[#include <sys/types.h>
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif], [sw_cv_environ=yes], [sw_cv_environ=no])])
-if test $sw_cv_environ = yes; then
- AC_DEFINE(DECL_ENVIRON)
-fi])
+AC_DEFUN(mdw_REQUIRE,
+[ifdef([AC_PROVIDE_$1], ,
+[AC_DIVERT_PUSH(builtin(eval, AC_DIVERSION_CURRENT - 1))dnl
+indir($@)
+AC_DIVERT_POP()dnl
+])])
dnl --- *@-mdw_CURSES-@* ---
dnl
dnl
dnl Arguments: ---
dnl
-dnl Use: Attempts to find an implementation of `curses'. A `curses'
-dnl library (`ncurses' by preference) will be added to `LIBS'.
-dnl If a library could be found, the preprocessor symbol
-dnl HAVE_CURSES is defined, along with one of HAVE_NCURSES_H,
-dnl HAVE_NCURSES_NCURSES_H or HAVE_CURSES_H, suggesting which
-dnl header to include (in the obvious way).
+dnl Use: Searches for a `curses' library (one of `ncurses' or
+dnl `curses') using mdw_CHECK_MANYLIBS. If one is found, the
+dnl preprocessor macro HAVE_CURSES is defined, and a search is
+dnl made for a `curses' header file (one of <ncurses.h>,
+dnl <ncurses/ncurses.h> or <curses.h>) using AC_CHECK_HEADERS
+dnl and the appropriate preprocessor symbol is defined.
+dnl Finally, a check is made for the function `wresize' using
+dnl AC_CHECK_FUNCS.
AC_DEFUN(mdw_CURSES,
[mdw_CHECK_MANYLIBS(newwin, ncurses curses, AC_DEFINE(HAVE_CURSES))
dnl
dnl Arguments: ---
dnl
-dnl Use: Finds an appropriate type for `ssize_t' if there isn't a
-dnl sensible one to use already.
+dnl Use: Checks whether the Posix type `ssize_t' is defined. If not,
+dnl it defaults to `int'.
AC_DEFUN(mdw_TYPE_SSIZE_T,
-[AC_CACHE_CHECK(for ssize_t, sw_cv_ssize_t,
+[AC_REQUIRE([AC_HEADER_STDC])
+AC_CACHE_CHECK(for ssize_t, mdw_cv_ssize_t,
[AC_EGREP_CPP(ssize_t,
[#include <sys/types.h>
#if HAVE_UNISTD_H
#include <stdlib.h>
#include <stddef.h>
#endif],
-[sw_cv_ssize_t=yes], [sw_cv_ssize_t=no])])
-if test $sw_cv_ssize_t = no; then
+[mdw_cv_ssize_t=yes], [mdw_cv_ssize_t=no])])
+if test $mdw_cv_ssize_t = no; then
AC_DEFINE(ssize_t, int)
fi])
-dnl --- *@-mdw_REQUIRE-@* ---
+dnl --- *@-mdw_DECL_ENVIRON-@* ---
dnl
dnl Author: Mark Wooding
dnl
-dnl Synopsis: mdw_REQUIRE(MACRO, ARGS...)
+dnl Synopsis: mdw_DECL_ENVIRON
dnl
-dnl Arguments: MACRO = name of a macro which should have been called
-dnl ARGS = arguments to pass
+dnl Arguments: ---
dnl
-dnl Use: Like `AC_REQUIRE', only it handles arguments.
+dnl Use: Searches for a declaration of the global `environ' variable.
+dnl If one is found in one of the `usual' places, DECL_ENVIRON
+dnl is defined as a preprocessor symbol.
-AC_DEFUN(mdw_REQUIRE,
-[ifdef([AC_PROVIDED_$1], ,
-[AC_DIVERT_PUSH(builtin(eval, AC_DIVERSION_CURRENT - 1))dnl
-indir($@)
-AC_DIVERT_POP()dnl
-])])
+AC_DEFUN(mdw_DECL_ENVIRON,
+[AC_CACHE_CHECK([for declaration of \`environ'], mdw_cv_environ,
+[AC_EGREP_CPP(environ,
+[#include <sys/types.h>
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif], [mdw_cv_environ=yes], [mdw_cv_environ=no])])
+if test $mdw_cv_environ = yes; then
+ AC_DEFINE(DECL_ENVIRON)
+fi])
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
[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
CXXFLAGS="$CXXFLAGS ifelse([$3], [], [-fhandle-exceptions], [$3])"
fi])
+dnl *@-mdw_INIT_LIB-@*
+dnl
+dnl Author: Mark Wooding
+dnl
+dnl Synopsis: mdw_INIT_LIB(LIB, NAME, VERSION, [PACKAGE])
+dnl
+dnl Arguments: LIB = the name of the library (and the package)
+dnl NAME = a presentable version of the library's name
+dnl VERSION = version of the library
+dnl PACKAGE = package name to pass on to AM_INIT_AUTOMAKE
+dnl
+dnl Use: Sets up various useful variables. This macro calls
+dnl AM_INIT_AUTOMAKE, which might be considered useful. It also
+dnl provides variables for the use of `lib-config.in'.
+
+AC_DEFUN([mdw_INIT_LIB],
+[AM_INIT_AUTOMAKE(ifelse([$4], [], [$1], [$4]), [$3])
+LIBRARY="$1" AC_SUBST(LIBRARY)
+LIBNAME="$2" AC_SUBST(LIBNAME)])
+
+dnl *@-mdw_LIB_CONFIG-@*
+dnl
+dnl Author: Mark Wooding
+dnl
+dnl Synopsis: mdw_LIB_CONFIG(LIB, NAME, VERSION, IF-FOUND, IF-NOT-FOUND)
+dnl
+dnl Arguments: LIB = the name of the library (and its configuration program)
+dnl NAME = a presentable version of the library's name
+dnl VERSION = version of library required
+dnl IF-FOUND = what to do if found
+dnl IF-NOT-FOUND = what to do if not found
+dnl
+dnl Use: Configures a library client program, using a configuration
+dnl script provided by the library maintainer.
+dnl
+dnl The default version is 1.0.0pre0; the default action is to
+dnl add everything to the CFLAGS and LIBS variables, and complain
+dnl if the library couldn't be found.
+dnl
+dnl The variable LIB_VERSION contains the version number of
+dnl the library; LIB_CFLAGS is the C compiler flags required
+dnl and LIB_LIBS is the linker flags.
+
+AC_DEFUN([mdw_LIB_CONFIG],
+[pushdef([upname], translit([$1], [a-z], [A-Z]))dnl
+AC_MSG_CHECKING([for $2 library])
+if $1-config --check $3 >/dev/null 2>&1; then
+ upname[]_VERSION=`$1-config --version`
+ upname[]_CFLAGS=`$1-config --cflags`
+ upname[]_LIBS=`$1-config --libs`
+ AC_SUBST(upname[]_VERSION)
+ AC_SUBST(upname[]_CFLAGS)
+ AC_SUBST(upname[]_LIBS)
+ ifelse([$4], [],
+ [CFLAGS="$CFLAGS $upname[]_CFLAGS"
+ LIBS="$upname[]_LIBS $LIBS"],
+ $4)
+ AC_MSG_RESULT([$upname[]_VERSION])
+else
+ ifelse([$5], [],
+ AC_MSG_ERROR([$2 library not found or too old.]),
+ $5)
+ AC_MSG_RESULT([not found])
+fi])
+
+dnl *@-mdw_MLIB-@*
+dnl
+dnl Author: Mark Wooding
+dnl
+dnl Synopsis: mdw_MLIB(VERSION, IF-FOUND, IF-NOT-FOUND
+dnl
+dnl Arguments: VERSION = version of library required
+dnl IF-FOUND = what to do if found
+dnl IF-NOT-FOUND = what to do if not found
+dnl
+dnl Use: Configures an mLib client program.
+
+AC_DEFUN([mdw_MLIB], [mdw_LIB_CONFIG(mLib, mLib, $@)])
+
+dnl *@-mdw_MGLIB-@*
+dnl
+dnl Author: Mark Wooding
+dnl
+dnl Synopsis: mdw_MGLIB(VERSION, IF-FOUND, IF-NOT-FOUND
+dnl
+dnl Arguments: VERSION = version of library required
+dnl IF-FOUND = what to do if found
+dnl IF-NOT-FOUND = what to do if not found
+dnl
+dnl Use: Configures an mgLib client program.
+
+AC_DEFUN([mdw_MGLIB],
+[mdw_REQUIRE([mdw_MLIB], [1.6.0])
+mdw_LIB_CONFIG(mgLib, mgLib, $@)])
+
+dnl *@-mdw_CATACOMB-@*
+dnl
+dnl Author: Mark Wooding
+dnl
+dnl Synopsis: mdw_CATACOMB([VERSION], [IF-FOUND], [IF-NOT-FOUND])
+dnl
+dnl Arguments: VERSION = version of Catacomb required
+dnl IF-FOUND = what to do if found
+dnl IF-NOT-FOUND = what to do if not found
+dnl
+dnl Use: Configures the program as a Catacomb client.
+
+AC_DEFUN([mdw_CATACOMB],
+[mdw_REQUIRE([mdw_MLIB], [1.6.0])
+mdw_LIB_CONFIG(catacomb, Catacomb, $@)])
+
+dnl *@-mdw_PK-@*
+dnl
+dnl Author: Mark Wooding
+dnl
+dnl Synopsis: mdw_PK([VERSION], [IF-FOUND], [IF-NOT-FOUND])
+dnl
+dnl Arguments: VERSION = version of PK required
+dnl IF-FOUND = what to do if found
+dnl IF-NOT-FOUND = what to do if not found
+dnl
+dnl Use: Configures the program as a PK client.
+
+AC_DEFUN([mdw_PK],
+[mdw_REQUIRE([mdw_MLIB], [1.6.0])
+mdw_LIB_CONFIG(pk, PK, $@)])
+
dnl --- *@-mdw_OPT_NDEBUG-@* ---
dnl
dnl Author: Mark Wooding
~mdw / cfd / blobdiff